Skip to content

Remove add/change file provider with json fragment #405

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
Jun 10, 2025
Merged

Remove add/change file provider with json fragment #405

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
4 changes: 2 additions & 2 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 @@ -5,7 +5,7 @@ SELECT * FROM pg_tde_key_info();
| | |
(1 row)

SELECT pg_tde_add_database_key_provider_file('incorrect-file-provider', json_object('foo' VALUE '/tmp/pg_tde_test_keyring.per'));
SELECT pg_tde_add_database_key_provider('file', 'incorrect-file-provider', '{"path": {"foo": "/tmp/pg_tde_test_keyring.per"}}');
ERROR: key provider value cannot be an object
SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file
Expand Down Expand Up @@ -51,7 +51,7 @@ SELECT * FROM pg_tde_list_all_database_key_providers();
2 | file-provider2 | file | {"path" : "/tmp/pg_tde_test_keyring2.per"}
(2 rows)

SELECT pg_tde_change_database_key_provider_file('file-provider', json_object('foo' VALUE '/tmp/pg_tde_test_keyring.per'));
SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"foo": "/tmp/pg_tde_test_keyring.per"}}');
ERROR: key provider value cannot be an object
SELECT * FROM pg_tde_list_all_database_key_providers();
id | provider_name | provider_type | options
Expand Down
29 changes: 0 additions & 29 deletions contrib/pg_tde/pg_tde--1.0-rc.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ BEGIN ATOMIC
json_object('path' VALUE file_path));
END;

CREATE FUNCTION pg_tde_add_database_key_provider_file(provider_name TEXT, file_path JSON)
RETURNS VOID
LANGUAGE SQL
BEGIN ATOMIC
SELECT pg_tde_add_database_key_provider('file', provider_name,
json_object('path' VALUE file_path));
END;

CREATE FUNCTION pg_tde_add_database_key_provider_vault_v2(provider_name TEXT,
vault_token_path TEXT,
Expand Down Expand Up @@ -93,13 +86,6 @@ BEGIN ATOMIC
json_object('path' VALUE file_path));
END;

CREATE FUNCTION pg_tde_add_global_key_provider_file(provider_name TEXT, file_path JSON)
RETURNS VOID
LANGUAGE SQL
BEGIN ATOMIC
SELECT pg_tde_add_global_key_provider('file', provider_name,
json_object('path' VALUE file_path));
END;

CREATE FUNCTION pg_tde_add_global_key_provider_vault_v2(provider_name TEXT,
vault_token_path TEXT,
Expand Down Expand Up @@ -148,14 +134,6 @@ BEGIN ATOMIC
json_object('path' VALUE file_path));
END;

CREATE FUNCTION pg_tde_change_database_key_provider_file(provider_name TEXT, file_path JSON)
RETURNS VOID
LANGUAGE SQL
BEGIN ATOMIC
SELECT pg_tde_change_database_key_provider('file', provider_name,
json_object('path' VALUE file_path));
END;

CREATE FUNCTION pg_tde_change_database_key_provider_vault_v2(provider_name TEXT,
vault_token_path TEXT,
vault_url TEXT,
Expand Down Expand Up @@ -203,13 +181,6 @@ BEGIN ATOMIC
json_object('path' VALUE file_path));
END;

CREATE FUNCTION pg_tde_change_global_key_provider_file(provider_name TEXT, file_path JSON)
RETURNS VOID
LANGUAGE SQL
BEGIN ATOMIC
SELECT pg_tde_change_global_key_provider('file', provider_name,
json_object('path' VALUE file_path));
END;

CREATE FUNCTION pg_tde_change_global_key_provider_vault_v2(provider_name TEXT,
vault_token_path TEXT,
Expand Down
4 changes: 2 additions & 2 deletions contrib/pg_tde/sql/key_provider.sql
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 * FROM pg_tde_key_info();

SELECT pg_tde_add_database_key_provider_file('incorrect-file-provider', json_object('foo' VALUE '/tmp/pg_tde_test_keyring.per'));
SELECT pg_tde_add_database_key_provider('file', 'incorrect-file-provider', '{"path": {"foo": "/tmp/pg_tde_test_keyring.per"}}');
SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per');
SELECT pg_tde_add_database_key_provider_file('file-provider2','/tmp/pg_tde_test_keyring2.per');
SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring_dup.per');
Expand All @@ -15,7 +15,7 @@ SELECT pg_tde_verify_key();
SELECT pg_tde_change_database_key_provider_file('not-existent-provider','/tmp/pg_tde_test_keyring.per');
SELECT * FROM pg_tde_list_all_database_key_providers();

SELECT pg_tde_change_database_key_provider_file('file-provider', json_object('foo' VALUE '/tmp/pg_tde_test_keyring.per'));
SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"foo": "/tmp/pg_tde_test_keyring.per"}}');
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');
Expand Down