Skip to content

Commit 90a6b2a

Browse files
committed
Update TAP tests for latest set_key change functionality
1 parent 722e61f commit 90a6b2a

File tree

68 files changed

+266
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+266
-2
lines changed

postgresql/t/050_tde_parallel_concurrency_test.pl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,14 @@ sub setup_encryption {
9191
$node->safe_psql($db_name, 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
9292
$node->safe_psql($db_name,
9393
"SELECT pg_tde_add_global_key_provider_file('global_key_provider', '/tmp/global_keyring.file');");
94+
$node->safe_psql($db_name,
95+
"SELECT pg_tde_create_key_using_global_key_provider('global_key', 'global_key_provider');");
9496
$node->safe_psql($db_name,
9597
"SELECT pg_tde_set_server_key_using_global_key_provider('global_key', 'global_key_provider');");
9698
$node->safe_psql($db_name,
9799
"SELECT pg_tde_add_database_key_provider_file('local_key_provider', '/tmp/db_keyring.fil');");
100+
$node->safe_psql($db_name,
101+
"SELECT pg_tde_create_key_using_database_key_provider('local_key', 'local_key_provider');");
98102
$node->safe_psql($db_name,
99103
"SELECT pg_tde_set_key_using_database_key_provider('local_key', 'local_key_provider');");
100104
}

postgresql/t/051_tde_stream_replication.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@
6161
$node_primary->safe_psql('postgres',
6262
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"
6363
);
64+
$node_primary->safe_psql('postgres',
65+
"SELECT pg_tde_create_key_using_database_key_provider('test-key', 'file-vault');"
66+
);
6467
$node_primary->safe_psql('postgres',
6568
"SELECT pg_tde_set_key_using_database_key_provider('test-key', 'file-vault');"
6669
);

postgresql/t/052_tde_archiving.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
$node_primary->safe_psql('postgres',
2727
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"
2828
);
29+
$node_primary->safe_psql('postgres',
30+
"SELECT pg_tde_create_key_using_database_key_provider('test-key', 'file-vault');"
31+
);
2932
$node_primary->safe_psql('postgres',
3033
"SELECT pg_tde_set_key_using_database_key_provider('test-key', 'file-vault');"
3134
);

postgresql/t/053_tde_recovery_targets.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ sub test_recovery_standby
6969
$node_primary->safe_psql('postgres',
7070
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"
7171
);
72+
$node_primary->safe_psql('postgres',
73+
"SELECT pg_tde_create_key_using_database_key_provider('test-key', 'file-vault');"
74+
);
7275
$node_primary->safe_psql('postgres',
7376
"SELECT pg_tde_set_key_using_database_key_provider('test-key', 'file-vault');"
7477
);

postgresql/t/054_tde_timeline_switch.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
$node_primary->safe_psql('postgres',
2424
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"
2525
);
26+
$node_primary->safe_psql('postgres',
27+
"SELECT pg_tde_create_key_using_database_key_provider('test-key', 'file-vault');"
28+
);
2629
$node_primary->safe_psql('postgres',
2730
"SELECT pg_tde_set_key_using_database_key_provider('test-key', 'file-vault');"
2831
);

postgresql/t/055_tde_replay_delay.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
$node_primary->safe_psql('postgres',
2222
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"
2323
);
24+
$node_primary->safe_psql('postgres',
25+
"SELECT pg_tde_create_key_using_database_key_provider('test-key', 'file-vault');"
26+
);
2427
$node_primary->safe_psql('postgres',
2528
"SELECT pg_tde_set_key_using_database_key_provider('test-key', 'file-vault');"
2629
);

postgresql/t/056_tde_logical_decoding.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
$node_primary->safe_psql('postgres',
3131
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"
3232
);
33+
$node_primary->safe_psql('postgres',
34+
"SELECT pg_tde_create_key_using_database_key_provider('test-key', 'file-vault');"
35+
);
3336
$node_primary->safe_psql('postgres',
3437
"SELECT pg_tde_set_key_using_database_key_provider('test-key', 'file-vault');"
3538
);

postgresql/t/057_tde_sync_rep.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ sub start_standby_and_wait
6363
$node_primary->safe_psql('postgres',
6464
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"
6565
);
66+
$node_primary->safe_psql('postgres',
67+
"SELECT pg_tde_create_key_using_database_key_provider('test-key', 'file-vault');"
68+
);
6669
$node_primary->safe_psql('postgres',
6770
"SELECT pg_tde_set_key_using_database_key_provider('test-key', 'file-vault');"
6871
);

postgresql/t/058_tde_fsm_truncation.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
$node_primary->safe_psql('postgres',
3232
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"
3333
);
34+
$node_primary->safe_psql('postgres',
35+
"SELECT pg_tde_create_key_using_database_key_provider('test-key', 'file-vault');"
36+
);
3437
$node_primary->safe_psql('postgres',
3538
"SELECT pg_tde_set_key_using_database_key_provider('test-key', 'file-vault');"
3639
);

postgresql/t/059_tde_twophase.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ sub configure_and_reload
4747
$node_london->safe_psql('postgres',
4848
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"
4949
);
50+
$node_london->safe_psql('postgres',
51+
"SELECT pg_tde_create_key_using_database_key_provider('test-key', 'file-vault');"
52+
);
5053
$node_london->safe_psql('postgres',
5154
"SELECT pg_tde_set_key_using_database_key_provider('test-key', 'file-vault');"
5255
);

0 commit comments

Comments
 (0)