From 210278da53141587aec9f8d32e9d3092ca085722 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Wed, 11 Jun 2025 16:55:58 +0200 Subject: [PATCH] Make sure we always delete key files before running TAP tests This way it is more clear what the tests actually do. And addditionally make sure the files are named consistently. --- contrib/pg_tde/t/basic.pl | 2 ++ contrib/pg_tde/t/crash_recovery.pl | 5 ++--- .../pg_tde/t/expected/key_rotate_tablespace.out | 2 +- contrib/pg_tde/t/expected/replication.out | 2 +- contrib/pg_tde/t/expected/rotate_key.out | 16 ++++++++-------- contrib/pg_tde/t/expected/tde_heap.out | 2 +- contrib/pg_tde/t/expected/wal_encrypt.out | 2 +- contrib/pg_tde/t/key_rotate_tablespace.pl | 4 +++- contrib/pg_tde/t/multiple_extensions.pl | 2 ++ contrib/pg_tde/t/pg_waldump_basic.pl | 4 +++- contrib/pg_tde/t/pg_waldump_fullpage.pl | 4 +++- contrib/pg_tde/t/replication.pl | 4 +++- contrib/pg_tde/t/rotate_key.pl | 13 +++++++++---- contrib/pg_tde/t/tde_heap.pl | 4 +++- contrib/pg_tde/t/unlogged_tables.pl | 2 ++ contrib/pg_tde/t/wal_encrypt.pl | 4 +++- 16 files changed, 47 insertions(+), 25 deletions(-) diff --git a/contrib/pg_tde/t/basic.pl b/contrib/pg_tde/t/basic.pl index 567ff508934e1..8eea2d39d3d6c 100644 --- a/contrib/pg_tde/t/basic.pl +++ b/contrib/pg_tde/t/basic.pl @@ -9,6 +9,8 @@ PGTDE::setup_files_dir(basename($0)); +unlink('/tmp/pg_tde_test_001_basic.per'); + my $node = PostgreSQL::Test::Cluster->new('main'); $node->init; $node->append_conf('postgresql.conf', "shared_preload_libraries = 'pg_tde'"); diff --git a/contrib/pg_tde/t/crash_recovery.pl b/contrib/pg_tde/t/crash_recovery.pl index 1964e26c536bd..b4f75010ac3bd 100644 --- a/contrib/pg_tde/t/crash_recovery.pl +++ b/contrib/pg_tde/t/crash_recovery.pl @@ -7,11 +7,10 @@ use lib 't'; use pgtde; -# ensure we start with a clean key provider file -unlink('/tmp/crash_recovery.per'); - PGTDE::setup_files_dir(basename($0)); +unlink('/tmp/crash_recovery.per'); + my $node = PostgreSQL::Test::Cluster->new('main'); $node->init; $node->append_conf( diff --git a/contrib/pg_tde/t/expected/key_rotate_tablespace.out b/contrib/pg_tde/t/expected/key_rotate_tablespace.out index fdb057433b1df..17559d72d24b9 100644 --- a/contrib/pg_tde/t/expected/key_rotate_tablespace.out +++ b/contrib/pg_tde/t/expected/key_rotate_tablespace.out @@ -1,7 +1,7 @@ SET allow_in_place_tablespaces = true; CREATE TABLESPACE test_tblspace LOCATION ''; CREATE DATABASE tbc TABLESPACE = test_tblspace; CREATE EXTENSION IF NOT EXISTS pg_tde; -SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per'); +SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/key_rotate_tablespace.per'); pg_tde_add_database_key_provider_file --------------------------------------- diff --git a/contrib/pg_tde/t/expected/replication.out b/contrib/pg_tde/t/expected/replication.out index 744953c213dc3..0540349e2ac1e 100644 --- a/contrib/pg_tde/t/expected/replication.out +++ b/contrib/pg_tde/t/expected/replication.out @@ -1,6 +1,6 @@ -- At primary CREATE EXTENSION IF NOT EXISTS pg_tde; -SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per'); +SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/replication.per'); pg_tde_add_database_key_provider_file --------------------------------------- diff --git a/contrib/pg_tde/t/expected/rotate_key.out b/contrib/pg_tde/t/expected/rotate_key.out index 956708ed5981e..7020730ddbd22 100644 --- a/contrib/pg_tde/t/expected/rotate_key.out +++ b/contrib/pg_tde/t/expected/rotate_key.out @@ -1,33 +1,33 @@ CREATE EXTENSION IF NOT EXISTS pg_tde; -SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per'); +SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/rotate_key.per'); pg_tde_add_database_key_provider_file --------------------------------------- (1 row) -SELECT pg_tde_add_database_key_provider_file('file-2', '/tmp/pg_tde_test_keyring_2.per'); +SELECT pg_tde_add_database_key_provider_file('file-2', '/tmp/rotate_key_2.per'); pg_tde_add_database_key_provider_file --------------------------------------- (1 row) -SELECT pg_tde_add_global_key_provider_file('file-2', '/tmp/pg_tde_test_keyring_2g.per'); +SELECT pg_tde_add_global_key_provider_file('file-2', '/tmp/rotate_key_2g.per'); pg_tde_add_global_key_provider_file ------------------------------------- (1 row) -SELECT pg_tde_add_global_key_provider_file('file-3', '/tmp/pg_tde_test_keyring_3.per'); +SELECT pg_tde_add_global_key_provider_file('file-3', '/tmp/rotate_key_3.per'); pg_tde_add_global_key_provider_file ------------------------------------- (1 row) SELECT pg_tde_list_all_database_key_providers(); - pg_tde_list_all_database_key_providers ---------------------------------------------------------------------- - (1,file-vault,file,"{""path"" : ""/tmp/pg_tde_test_keyring.per""}") - (2,file-2,file,"{""path"" : ""/tmp/pg_tde_test_keyring_2.per""}") + pg_tde_list_all_database_key_providers +------------------------------------------------------------ + (1,file-vault,file,"{""path"" : ""/tmp/rotate_key.per""}") + (2,file-2,file,"{""path"" : ""/tmp/rotate_key_2.per""}") (2 rows) SELECT pg_tde_set_key_using_database_key_provider('test-db-key', 'file-vault'); diff --git a/contrib/pg_tde/t/expected/tde_heap.out b/contrib/pg_tde/t/expected/tde_heap.out index d8dca8b986a2f..f49a3586eb0aa 100644 --- a/contrib/pg_tde/t/expected/tde_heap.out +++ b/contrib/pg_tde/t/expected/tde_heap.out @@ -1,5 +1,5 @@ CREATE EXTENSION IF NOT EXISTS pg_tde; -SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per'); +SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/tde_heap.per'); pg_tde_add_database_key_provider_file --------------------------------------- diff --git a/contrib/pg_tde/t/expected/wal_encrypt.out b/contrib/pg_tde/t/expected/wal_encrypt.out index 3f89acc31a745..61c8c0ff43cc1 100644 --- a/contrib/pg_tde/t/expected/wal_encrypt.out +++ b/contrib/pg_tde/t/expected/wal_encrypt.out @@ -1,5 +1,5 @@ CREATE EXTENSION IF NOT EXISTS pg_tde; -SELECT pg_tde_add_global_key_provider_file('file-keyring-010', '/tmp/pg_tde_test_keyring010.per'); +SELECT pg_tde_add_global_key_provider_file('file-keyring-010', '/tmp/wal_encrypt.per'); pg_tde_add_global_key_provider_file ------------------------------------- diff --git a/contrib/pg_tde/t/key_rotate_tablespace.pl b/contrib/pg_tde/t/key_rotate_tablespace.pl index 310ecba3dbf22..5168d22527924 100644 --- a/contrib/pg_tde/t/key_rotate_tablespace.pl +++ b/contrib/pg_tde/t/key_rotate_tablespace.pl @@ -9,6 +9,8 @@ PGTDE::setup_files_dir(basename($0)); +unlink('/tmp/key_rotate_tablespace.per'); + my $node = PostgreSQL::Test::Cluster->new('main'); $node->init; $node->append_conf('postgresql.conf', "shared_preload_libraries = 'pg_tde'"); @@ -22,7 +24,7 @@ PGTDE::psql($node, 'tbc', 'CREATE EXTENSION IF NOT EXISTS pg_tde;'); PGTDE::psql($node, 'tbc', - "SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');" + "SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/key_rotate_tablespace.per');" ); PGTDE::psql($node, 'tbc', "SELECT pg_tde_set_key_using_database_key_provider('test-db-key', 'file-vault');" diff --git a/contrib/pg_tde/t/multiple_extensions.pl b/contrib/pg_tde/t/multiple_extensions.pl index 7750a9945d842..2137082ca973f 100644 --- a/contrib/pg_tde/t/multiple_extensions.pl +++ b/contrib/pg_tde/t/multiple_extensions.pl @@ -17,6 +17,8 @@ "pg_tde test case only for PPG server package install with extensions."; } +unlink('/tmp/keyring_data_file'); + open my $conf2, '>>', "/tmp/datafile-location"; print $conf2 "/tmp/keyring_data_file\n"; close $conf2; diff --git a/contrib/pg_tde/t/pg_waldump_basic.pl b/contrib/pg_tde/t/pg_waldump_basic.pl index 7b37b909dee41..7ec14eed121b6 100644 --- a/contrib/pg_tde/t/pg_waldump_basic.pl +++ b/contrib/pg_tde/t/pg_waldump_basic.pl @@ -7,6 +7,8 @@ use PostgreSQL::Test::Utils; use Test::More; +unlink('/tmp/pg_waldump_basic.per'); + my $node = PostgreSQL::Test::Cluster->new('main'); $node->init; $node->append_conf( @@ -28,7 +30,7 @@ $node->safe_psql('postgres', "CREATE EXTENSION IF NOT EXISTS pg_tde;"); $node->safe_psql('postgres', - "SELECT pg_tde_add_global_key_provider_file('file-keyring-wal', '/tmp/pg_tde_test_keyring-wal.per');" + "SELECT pg_tde_add_global_key_provider_file('file-keyring-wal', '/tmp/pg_waldump_basic.per');" ); $node->safe_psql('postgres', "SELECT pg_tde_set_server_key_using_global_key_provider('server-key', 'file-keyring-wal');" diff --git a/contrib/pg_tde/t/pg_waldump_fullpage.pl b/contrib/pg_tde/t/pg_waldump_fullpage.pl index 782d248f1b09d..3caf2cfbcf329 100644 --- a/contrib/pg_tde/t/pg_waldump_fullpage.pl +++ b/contrib/pg_tde/t/pg_waldump_fullpage.pl @@ -29,6 +29,8 @@ sub get_block_lsn return ($lsn_hi, $lsn_lo); } +unlink('/tmp/pg_waldump_fullpage.per'); + my $node = PostgreSQL::Test::Cluster->new('main'); $node->init; $node->append_conf( @@ -42,7 +44,7 @@ sub get_block_lsn $node->safe_psql('postgres', "CREATE EXTENSION IF NOT EXISTS pg_tde;"); $node->safe_psql('postgres', - "SELECT pg_tde_add_global_key_provider_file('file-keyring-wal', '/tmp/pg_tde_test_keyring-wal.per');" + "SELECT pg_tde_add_global_key_provider_file('file-keyring-wal', '/tmp/pg_waldump_fullpage.per');" ); $node->safe_psql('postgres', "SELECT pg_tde_set_server_key_using_global_key_provider('server-key', 'file-keyring-wal');" diff --git a/contrib/pg_tde/t/replication.pl b/contrib/pg_tde/t/replication.pl index bd64593858c73..21fbcdfbd1929 100644 --- a/contrib/pg_tde/t/replication.pl +++ b/contrib/pg_tde/t/replication.pl @@ -9,6 +9,8 @@ PGTDE::setup_files_dir(basename($0)); +unlink('/tmp/replication.per'); + my $primary = PostgreSQL::Test::Cluster->new('primary'); $primary->init(allows_streaming => 1); $primary->append_conf( @@ -28,7 +30,7 @@ PGTDE::psql($primary, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;'); PGTDE::psql($primary, 'postgres', - "SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');" + "SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/replication.per');" ); PGTDE::psql($primary, 'postgres', "SELECT pg_tde_set_key_using_database_key_provider('test-key', 'file-vault');" diff --git a/contrib/pg_tde/t/rotate_key.pl b/contrib/pg_tde/t/rotate_key.pl index c203513635cd9..b60c4b5836186 100644 --- a/contrib/pg_tde/t/rotate_key.pl +++ b/contrib/pg_tde/t/rotate_key.pl @@ -9,6 +9,11 @@ PGTDE::setup_files_dir(basename($0)); +unlink('/tmp/rotate_key.per'); +unlink('/tmp/rotate_key_2.per'); +unlink('/tmp/rotate_key_2g.per'); +unlink('/tmp/rotate_key_3.per'); + my $node = PostgreSQL::Test::Cluster->new('main'); $node->init; $node->append_conf('postgresql.conf', "shared_preload_libraries = 'pg_tde'"); @@ -17,16 +22,16 @@ PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;'); PGTDE::psql($node, 'postgres', - "SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');" + "SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/rotate_key.per');" ); PGTDE::psql($node, 'postgres', - "SELECT pg_tde_add_database_key_provider_file('file-2', '/tmp/pg_tde_test_keyring_2.per');" + "SELECT pg_tde_add_database_key_provider_file('file-2', '/tmp/rotate_key_2.per');" ); PGTDE::psql($node, 'postgres', - "SELECT pg_tde_add_global_key_provider_file('file-2', '/tmp/pg_tde_test_keyring_2g.per');" + "SELECT pg_tde_add_global_key_provider_file('file-2', '/tmp/rotate_key_2g.per');" ); PGTDE::psql($node, 'postgres', - "SELECT pg_tde_add_global_key_provider_file('file-3', '/tmp/pg_tde_test_keyring_3.per');" + "SELECT pg_tde_add_global_key_provider_file('file-3', '/tmp/rotate_key_3.per');" ); PGTDE::psql($node, 'postgres', diff --git a/contrib/pg_tde/t/tde_heap.pl b/contrib/pg_tde/t/tde_heap.pl index 8f3deeb2316ff..1983c1e1b2eca 100644 --- a/contrib/pg_tde/t/tde_heap.pl +++ b/contrib/pg_tde/t/tde_heap.pl @@ -9,6 +9,8 @@ PGTDE::setup_files_dir(basename($0)); +unlink('/tmp/tde_heap.per'); + my $node = PostgreSQL::Test::Cluster->new('main'); $node->init; $node->append_conf('postgresql.conf', "shared_preload_libraries = 'pg_tde'"); @@ -17,7 +19,7 @@ PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;'); PGTDE::psql($node, 'postgres', - "SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');" + "SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/tde_heap.per');" ); PGTDE::psql($node, 'postgres', "SELECT pg_tde_set_key_using_database_key_provider('test-db-key', 'file-vault');" diff --git a/contrib/pg_tde/t/unlogged_tables.pl b/contrib/pg_tde/t/unlogged_tables.pl index 7a5b1739a977e..3482d93e05ffd 100644 --- a/contrib/pg_tde/t/unlogged_tables.pl +++ b/contrib/pg_tde/t/unlogged_tables.pl @@ -9,6 +9,8 @@ PGTDE::setup_files_dir(basename($0)); +unlink('/tmp/unlogged_tables.per'); + my $node = PostgreSQL::Test::Cluster->new('main'); $node->init; $node->append_conf('postgresql.conf', "shared_preload_libraries = 'pg_tde'"); diff --git a/contrib/pg_tde/t/wal_encrypt.pl b/contrib/pg_tde/t/wal_encrypt.pl index 61ac3c8e46129..42ef87fe3682c 100644 --- a/contrib/pg_tde/t/wal_encrypt.pl +++ b/contrib/pg_tde/t/wal_encrypt.pl @@ -9,6 +9,8 @@ PGTDE::setup_files_dir(basename($0)); +unlink('/tmp/wal_encrypt.per'); + my $node = PostgreSQL::Test::Cluster->new('main'); $node->init; $node->append_conf('postgresql.conf', "shared_preload_libraries = 'pg_tde'"); @@ -20,7 +22,7 @@ PGTDE::psql($node, 'postgres', "CREATE EXTENSION IF NOT EXISTS pg_tde;"); PGTDE::psql($node, 'postgres', - "SELECT pg_tde_add_global_key_provider_file('file-keyring-010', '/tmp/pg_tde_test_keyring010.per');" + "SELECT pg_tde_add_global_key_provider_file('file-keyring-010', '/tmp/wal_encrypt.per');" ); PGTDE::psql($node, 'postgres', 'SELECT pg_tde_verify_server_key();');