Skip to content

[PG-1635] Return void from add/change key provider functions #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2025
Merged

[PG-1635] Return void from add/change key provider functions #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/access_control.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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
---------------------------------------
1

(1 row)

CREATE USER regress_pg_tde_access_control;
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/alter_index.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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
---------------------------------------
1

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/cache_alloc.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ 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
---------------------------------------
1

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/change_access_method.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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
---------------------------------------
1

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('test-db-key', 'file-vault');
Expand Down
4 changes: 2 additions & 2 deletions contrib/pg_tde/expected/create_database.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/template_provider.per');
pg_tde_add_database_key_provider_file
---------------------------------------
1

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('test-db-key', 'file-vault');
Expand All @@ -26,7 +26,7 @@ INSERT INTO test_plain (x) VALUES (30), (40);
SELECT pg_tde_add_global_key_provider_file('global-file-vault','/tmp/template_provider_global.per');
pg_tde_add_global_key_provider_file
-------------------------------------
-6

(1 row)

SELECT pg_tde_set_default_key_using_global_key_provider('default-key', 'global-file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/default_principal_key.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ CREATE EXTENSION IF NOT EXISTS pg_buffercache;
SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_regression_default_key.per');
pg_tde_add_global_key_provider_file
-------------------------------------
-5

(1 row)

-- Should fail: no default principal key for the server yet
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/insert_update_delete.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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
---------------------------------------
1

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
14 changes: 7 additions & 7 deletions contrib/pg_tde/expected/key_provider.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SELECT * FROM pg_tde_list_all_database_key_providers();
SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file
---------------------------------------
1

(1 row)

SELECT * FROM pg_tde_list_all_database_key_providers();
Expand All @@ -24,7 +24,7 @@ SELECT * FROM pg_tde_list_all_database_key_providers();
SELECT pg_tde_add_database_key_provider_file('file-provider2','/tmp/pg_tde_test_keyring2.per');
pg_tde_add_database_key_provider_file
---------------------------------------
2

(1 row)

SELECT * FROM pg_tde_list_all_database_key_providers();
Expand Down Expand Up @@ -69,13 +69,13 @@ SELECT * FROM pg_tde_list_all_database_key_providers();
SELECT pg_tde_add_global_key_provider_file('file-keyring','/tmp/pg_tde_test_keyring.per');
pg_tde_add_global_key_provider_file
-------------------------------------
-1

(1 row)

SELECT pg_tde_add_global_key_provider_file('file-keyring2','/tmp/pg_tde_test_keyring2.per');
pg_tde_add_global_key_provider_file
-------------------------------------
-2

(1 row)

SELECT id, provider_name FROM pg_tde_list_all_global_key_providers();
Expand Down Expand Up @@ -271,7 +271,7 @@ ERROR: unexpected boolean in field "path"
SELECT pg_tde_add_global_key_provider_file('global-provider', '/tmp/global-provider-file-1');
pg_tde_add_global_key_provider_file
-------------------------------------
-3

(1 row)

SELECT pg_tde_set_server_key_using_global_key_provider('server-key', 'global-provider');
Expand All @@ -286,7 +286,7 @@ ERROR: could not fetch key "server-key" used as server key from modified key pr
SELECT pg_tde_add_global_key_provider_file('global-provider2', '/tmp/global-provider-file-1');
pg_tde_add_global_key_provider_file
-------------------------------------
-4

(1 row)

SELECT current_database() AS regress_database
Expand All @@ -310,7 +310,7 @@ CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('db-provider', '/tmp/db-provider-file');
pg_tde_add_database_key_provider_file
---------------------------------------
1

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('database-key', 'db-provider');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/kmip_test.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_kmip('kmip-prov','127.0.0.1', 5696, '/tmp/server_certificate.pem', '/tmp/client_certificate_jane_doe.pem', '/tmp/client_key_jane_doe.pem');
pg_tde_add_database_key_provider_kmip
---------------------------------------
1

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('kmip-key','kmip-prov');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/partition_table.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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
---------------------------------------
1

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('table_key','database_keyring_provider');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/pg_tde_is_encrypted.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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
---------------------------------------
1

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/recreate_storage.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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
---------------------------------------
1

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/relocate.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CREATE EXTENSION pg_tde SCHEMA other;
SELECT other.pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file
---------------------------------------
1

(1 row)

SELECT other.pg_tde_grant_key_viewer_to_role('public');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/tablespace.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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
---------------------------------------
1

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/toast_decrypt.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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
---------------------------------------
1

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
4 changes: 2 additions & 2 deletions contrib/pg_tde/expected/vault_v2_test.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ CREATE EXTENSION IF NOT EXISTS pg_tde;
SELECT pg_tde_add_database_key_provider_vault_v2('vault-incorrect',:'root_token','http://127.0.0.1:8200','DUMMY-TOKEN',NULL);
pg_tde_add_database_key_provider_vault_v2
-------------------------------------------
1

(1 row)

-- FAILS
Expand All @@ -19,7 +19,7 @@ HINT: create one using pg_tde_set_key before using encrypted tables
SELECT pg_tde_add_database_key_provider_vault_v2('vault-v2',:'root_token','http://127.0.0.1:8200','secret',NULL);
pg_tde_add_database_key_provider_vault_v2
-------------------------------------------
2

(1 row)

SELECT pg_tde_set_key_using_database_key_provider('vault-v2-key','vault-v2');
Expand Down
Loading