PG-1457 Rename keys in tests

Author: artemgavrilov

contrib/pg_tde/t/010_wal_encrypt.pl

@@ -32,7 +32,7 @@
 $stdout = $node->safe_psql('postgres', "SELECT pg_tde_add_global_key_provider_file('file-keyring-010','/tmp/pg_tde_test_keyring010.per');", extra_params => ['-a']);
 PGTDE::append_to_file($stdout);
 
-$stdout = $node->safe_psql('postgres', "SELECT pg_tde_set_server_principal_key_global_provider('global-db-principal-key', 'file-keyring-010');", extra_params => ['-a']);
+$stdout = $node->safe_psql('postgres', "SELECT pg_tde_set_server_principal_key_global_provider('server-principal-key', 'file-keyring-010');", extra_params => ['-a']);
 PGTDE::append_to_file($stdout);
 
 # Restart the server, it should work with encryption now

contrib/pg_tde/t/expected/010_wal_encrypt.out

@@ -1,7 +1,7 @@
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_global_key_provider_file('file-keyring-010','/tmp/pg_tde_test_keyring010.per');
 -1
-SELECT pg_tde_set_server_principal_key_global_provider('global-db-principal-key', 'file-keyring-010');
+SELECT pg_tde_set_server_principal_key_global_provider('server-principal-key', 'file-keyring-010');
 t
 -- server restart with wal encryption
 SHOW pg_tde.wal_encrypt;

src/bin/pg_waldump/t/003_basic_encrypted.pl

@@ -28,7 +28,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');");;
-$node->safe_psql('postgres', "SELECT pg_tde_set_server_principal_key_global_provider('global-db-principal-key', 'file-keyring-wal');");
+$node->safe_psql('postgres', "SELECT pg_tde_set_server_principal_key_global_provider('server-principal-key', 'file-keyring-wal');");
 
 $node->append_conf(
 	'postgresql.conf', q{

src/bin/pg_waldump/t/004_save_fullpage_encrypted.pl

@@ -42,7 +42,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');");;
-$node->safe_psql('postgres', "SELECT pg_tde_set_server_principal_key_global_provider('global-db-principal-key', 'file-keyring-wal');");
+$node->safe_psql('postgres', "SELECT pg_tde_set_server_principal_key_global_provider('server-principal-key', 'file-keyring-wal');");
 
 $node->append_conf(
 	'postgresql.conf', q{