Remove key provider files in regress tests

To ensure the tests are always run from the same state we remove any key
provider files so that pg_tde_add_database/global_key_provider_file()
always creates a new file.

ci_scripts/setup-keyring-servers.sh

@@ -15,6 +15,7 @@ wget https://raw.githubusercontent.com/OpenKMIP/PyKMIP/refs/heads/master/example
 cd ..
 
 echo $SCRIPT_DIR
+rm -f /tmp/pykmip.db
 pykmip-server -f "$SCRIPT_DIR/../contrib/pg_tde/pykmip-server.conf" -l /tmp/kmip-server.log &
 
 CLUSTER_INFO=$(mktemp)

ci_scripts/tde_setup.sql

@@ -1,4 +1,5 @@
 CREATE SCHEMA IF NOT EXISTS tde;
 CREATE EXTENSION IF NOT EXISTS pg_tde SCHEMA tde;
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 SELECT tde.pg_tde_add_database_key_provider_file('reg_file-vault', '/tmp/pg_tde_test_keyring.per');
 SELECT tde.pg_tde_set_key_using_database_key_provider('test-db-key', 'reg_file-vault');

ci_scripts/tde_setup_global.sql

@@ -1,6 +1,7 @@
 CREATE SCHEMA tde;
 CREATE EXTENSION IF NOT EXISTS pg_tde SCHEMA tde;
 
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 SELECT tde.pg_tde_add_global_key_provider_file('reg_file-global', '/tmp/pg_tde_test_keyring.per');
 SELECT tde.pg_tde_set_server_key_using_global_key_provider('server-key', 'reg_file-global');
 ALTER SYSTEM SET pg_tde.wal_encrypt = on;

contrib/pg_tde/expected/access_control.out

@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('local-file-provider', '/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 

contrib/pg_tde/expected/alter_index.out

@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 

contrib/pg_tde/expected/cache_alloc.out

@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 -- Just checking there are no mem debug WARNINGs during the cache population
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');

contrib/pg_tde/expected/change_access_method.out

@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 

contrib/pg_tde/expected/create_database.out

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/template_provider_global.per'
+\! rm -f '/tmp/template_provider.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 CREATE DATABASE template_db;
 SELECT current_database() AS regress_database

contrib/pg_tde/expected/default_principal_key.out

@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_regression_default_key.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 CREATE EXTENSION IF NOT EXISTS pg_buffercache;
 SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_regression_default_key.per');

contrib/pg_tde/expected/delete_principal_key.out

@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_global_key_provider_file 

contrib/pg_tde/expected/insert_update_delete.out

@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 

contrib/pg_tde/expected/key_provider.out

@@ -1,3 +1,7 @@
+\! rm -f '/tmp/db-provider-file'
+\! rm -f '/tmp/global-provider-file-1'
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+\! rm -f '/tmp/pg_tde_test_keyring2.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT  * FROM pg_tde_key_info();
  key_name | provider_name | provider_id | key_creation_time 

contrib/pg_tde/expected/partition_table.out

@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_keyring.per'
 CREATE EXTENSION pg_tde;
 SELECT pg_tde_add_database_key_provider_file('database_keyring_provider','/tmp/pg_tde_keyring.per');
  pg_tde_add_database_key_provider_file 

contrib/pg_tde/expected/pg_tde_is_encrypted.out

@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 

contrib/pg_tde/expected/recreate_storage.out

@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 

contrib/pg_tde/expected/tablespace.out

@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 

contrib/pg_tde/expected/toast_decrypt.out

@@ -1,3 +1,4 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
  pg_tde_add_database_key_provider_file 

contrib/pg_tde/sql/access_control.sql

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('local-file-provider', '/tmp/pg_tde_test_keyring.per');

contrib/pg_tde/sql/alter_index.sql

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');

contrib/pg_tde/sql/cache_alloc.sql

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 -- Just checking there are no mem debug WARNINGs during the cache population
 
 CREATE EXTENSION IF NOT EXISTS pg_tde;

contrib/pg_tde/sql/change_access_method.sql

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');

contrib/pg_tde/sql/create_database.sql

@@ -1,3 +1,6 @@
+\! rm -f '/tmp/template_provider_global.per'
+\! rm -f '/tmp/template_provider.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 CREATE DATABASE template_db;

contrib/pg_tde/sql/default_principal_key.sql

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_regression_default_key.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 CREATE EXTENSION IF NOT EXISTS pg_buffercache;
 

contrib/pg_tde/sql/delete_principal_key.sql

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per');

contrib/pg_tde/sql/insert_update_delete.sql

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');

contrib/pg_tde/sql/key_provider.sql

@@ -1,3 +1,8 @@
+\! rm -f '/tmp/db-provider-file'
+\! rm -f '/tmp/global-provider-file-1'
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+\! rm -f '/tmp/pg_tde_test_keyring2.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT  * FROM pg_tde_key_info();

contrib/pg_tde/sql/partition_table.sql

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_keyring.per'
+
 CREATE EXTENSION pg_tde;
 SELECT pg_tde_add_database_key_provider_file('database_keyring_provider','/tmp/pg_tde_keyring.per');
 SELECT pg_tde_set_key_using_database_key_provider('table_key','database_keyring_provider');

contrib/pg_tde/sql/pg_tde_is_encrypted.sql

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');

contrib/pg_tde/sql/recreate_storage.sql

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');

contrib/pg_tde/sql/tablespace.sql

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');

contrib/pg_tde/sql/toast_decrypt.sql

@@ -1,3 +1,5 @@
+\! rm -f '/tmp/pg_tde_test_keyring.per'
+
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 
 SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');