Remove add/change file provider with json fragment

These seem to have been overlooked in
75aad06e56 when similar functions for
kmip and vault were removed.
pull/238/head
Anders Åstrand 3 months ago committed by AndersAstrand
parent 27d05ddb6e
commit 9a78833f10
  1. 4
      contrib/pg_tde/expected/key_provider.out
  2. 29
      contrib/pg_tde/pg_tde--1.0-rc.sql
  3. 4
      contrib/pg_tde/sql/key_provider.sql

@ -5,7 +5,7 @@ SELECT * FROM pg_tde_key_info();
| | | | | |
(1 row) (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 ERROR: key provider value cannot be an object
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-provider','/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file pg_tde_add_database_key_provider_file
@ -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 | file-provider2 | file | {"path" : "/tmp/pg_tde_test_keyring2.per"}
(2 rows) (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 ERROR: key provider value cannot be an object
SELECT * FROM pg_tde_list_all_database_key_providers(); SELECT * FROM pg_tde_list_all_database_key_providers();
id | provider_name | provider_type | options id | provider_name | provider_type | options

@ -18,13 +18,6 @@ BEGIN ATOMIC
json_object('path' VALUE file_path)); json_object('path' VALUE file_path));
END; 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, CREATE FUNCTION pg_tde_add_database_key_provider_vault_v2(provider_name TEXT,
vault_token_path TEXT, vault_token_path TEXT,
@ -93,13 +86,6 @@ BEGIN ATOMIC
json_object('path' VALUE file_path)); json_object('path' VALUE file_path));
END; 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, CREATE FUNCTION pg_tde_add_global_key_provider_vault_v2(provider_name TEXT,
vault_token_path TEXT, vault_token_path TEXT,
@ -148,14 +134,6 @@ BEGIN ATOMIC
json_object('path' VALUE file_path)); json_object('path' VALUE file_path));
END; 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, CREATE FUNCTION pg_tde_change_database_key_provider_vault_v2(provider_name TEXT,
vault_token_path TEXT, vault_token_path TEXT,
vault_url TEXT, vault_url TEXT,
@ -203,13 +181,6 @@ BEGIN ATOMIC
json_object('path' VALUE file_path)); json_object('path' VALUE file_path));
END; 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, CREATE FUNCTION pg_tde_change_global_key_provider_vault_v2(provider_name TEXT,
vault_token_path TEXT, vault_token_path TEXT,

@ -2,7 +2,7 @@ CREATE EXTENSION IF NOT EXISTS pg_tde;
SELECT * FROM pg_tde_key_info(); 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-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-provider2','/tmp/pg_tde_test_keyring2.per');
SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring_dup.per'); SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring_dup.per');
@ -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 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 * 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 * FROM pg_tde_list_all_database_key_providers();
SELECT pg_tde_add_global_key_provider_file('file-keyring','/tmp/pg_tde_test_keyring.per'); SELECT pg_tde_add_global_key_provider_file('file-keyring','/tmp/pg_tde_test_keyring.per');

Loading…
Cancel
Save