Skip to content

Stop coalescing NULL to empty string in key provider functions #367

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

Open
wants to merge 1 commit into
base: TDE_REL_17_STABLE
Choose a base branch
from
Open

Stop coalescing NULL to empty string in key provider functions #367

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
72 changes: 36 additions & 36 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 @@ -16,7 +16,7 @@ BEGIN ATOMIC
-- JSON keys in the options must be matched to the keys in
-- load_file_keyring_provider_options function.
SELECT pg_tde_add_database_key_provider('file', provider_name,
json_object('path' VALUE COALESCE(file_path, '')));
json_object('path' VALUE file_path));
END;

CREATE FUNCTION pg_tde_add_database_key_provider_file(provider_name TEXT, file_path JSON)
Expand All @@ -40,10 +40,10 @@ BEGIN ATOMIC
-- JSON keys in the options must be matched to the keys in
-- load_vaultV2_keyring_provider_options function.
SELECT pg_tde_add_database_key_provider('vault-v2', provider_name,
json_object('url' VALUE COALESCE(vault_url, ''),
'token' VALUE COALESCE(vault_token, ''),
'mountPath' VALUE COALESCE(vault_mount_path, ''),
'caPath' VALUE COALESCE(vault_ca_path, '')));
json_object('url' VALUE vault_url,
'token' VALUE vault_token,
'mountPath' VALUE vault_mount_path,
'caPath' VALUE vault_ca_path));
END;

CREATE FUNCTION pg_tde_add_database_key_provider_vault_v2(provider_name TEXT,
Expand Down Expand Up @@ -75,11 +75,11 @@ BEGIN ATOMIC
-- JSON keys in the options must be matched to the keys in
-- load_kmip_keyring_provider_options function.
SELECT pg_tde_add_database_key_provider('kmip', provider_name,
json_object('host' VALUE COALESCE(kmip_host, ''),
json_object('host' VALUE kmip_host,
'port' VALUE kmip_port,
'caPath' VALUE COALESCE(kmip_ca_path, ''),
'certPath' VALUE COALESCE(kmip_cert_path, ''),
'keyPath' VALUE COALESCE(kmip_key_path, '')));
'caPath' VALUE kmip_ca_path,
'certPath' VALUE kmip_cert_path,
'keyPath' VALUE kmip_key_path));
END;

CREATE FUNCTION pg_tde_add_database_key_provider_kmip(provider_name TEXT,
Expand Down Expand Up @@ -132,7 +132,7 @@ BEGIN ATOMIC
-- JSON keys in the options must be matched to the keys in
-- load_file_keyring_provider_options function.
SELECT pg_tde_add_global_key_provider('file', provider_name,
json_object('path' VALUE COALESCE(file_path, '')));
json_object('path' VALUE file_path));
END;

CREATE FUNCTION pg_tde_add_global_key_provider_file(provider_name TEXT, file_path JSON)
Expand All @@ -156,10 +156,10 @@ BEGIN ATOMIC
-- JSON keys in the options must be matched to the keys in
-- load_vaultV2_keyring_provider_options function.
SELECT pg_tde_add_global_key_provider('vault-v2', provider_name,
json_object('url' VALUE COALESCE(vault_url, ''),
'token' VALUE COALESCE(vault_token, ''),
'mountPath' VALUE COALESCE(vault_mount_path, ''),
'caPath' VALUE COALESCE(vault_ca_path, '')));
json_object('url' VALUE vault_url,
'token' VALUE vault_token,
'mountPath' VALUE vault_mount_path,
'caPath' VALUE vault_ca_path));
END;

CREATE FUNCTION pg_tde_add_global_key_provider_vault_v2(provider_name TEXT,
Expand Down Expand Up @@ -191,11 +191,11 @@ BEGIN ATOMIC
-- JSON keys in the options must be matched to the keys in
-- load_kmip_keyring_provider_options function.
SELECT pg_tde_add_global_key_provider('kmip', provider_name,
json_object('host' VALUE COALESCE(kmip_host, ''),
json_object('host' VALUE kmip_host,
'port' VALUE kmip_port,
'caPath' VALUE COALESCE(kmip_ca_path, ''),
'certPath' VALUE COALESCE(kmip_cert_path, ''),
'keyPath' VALUE COALESCE(kmip_key_path, '')));
'caPath' VALUE kmip_ca_path,
'certPath' VALUE kmip_cert_path,
'keyPath' VALUE kmip_key_path));
END;

CREATE FUNCTION pg_tde_add_global_key_provider_kmip(provider_name TEXT,
Expand Down Expand Up @@ -230,7 +230,7 @@ BEGIN ATOMIC
-- JSON keys in the options must be matched to the keys in
-- load_file_keyring_provider_options function.
SELECT pg_tde_change_database_key_provider('file', provider_name,
json_object('path' VALUE COALESCE(file_path, '')));
json_object('path' VALUE file_path));
END;

CREATE FUNCTION pg_tde_change_database_key_provider_file(provider_name TEXT, file_path JSON)
Expand All @@ -254,10 +254,10 @@ BEGIN ATOMIC
-- JSON keys in the options must be matched to the keys in
-- load_vaultV2_keyring_provider_options function.
SELECT pg_tde_change_database_key_provider('vault-v2', provider_name,
json_object('url' VALUE COALESCE(vault_url, ''),
'token' VALUE COALESCE(vault_token, ''),
'mountPath' VALUE COALESCE(vault_mount_path, ''),
'caPath' VALUE COALESCE(vault_ca_path, '')));
json_object('url' VALUE vault_url,
'token' VALUE vault_token,
'mountPath' VALUE vault_mount_path,
'caPath' VALUE vault_ca_path));
END;

CREATE FUNCTION pg_tde_change_database_key_provider_vault_v2(provider_name TEXT,
Expand Down Expand Up @@ -289,11 +289,11 @@ BEGIN ATOMIC
-- JSON keys in the options must be matched to the keys in
-- load_kmip_keyring_provider_options function.
SELECT pg_tde_change_database_key_provider('kmip', provider_name,
json_object('host' VALUE COALESCE(kmip_host, ''),
json_object('host' VALUE kmip_host,
'port' VALUE kmip_port,
'caPath' VALUE COALESCE(kmip_ca_path, ''),
'certPath' VALUE COALESCE(kmip_cert_path, ''),
'keyPath' VALUE COALESCE(kmip_key_path, '')));
'caPath' VALUE kmip_ca_path,
'certPath' VALUE kmip_cert_path,
'keyPath' VALUE kmip_key_path));
END;

CREATE FUNCTION pg_tde_change_database_key_provider_kmip(provider_name TEXT,
Expand Down Expand Up @@ -328,7 +328,7 @@ BEGIN ATOMIC
-- JSON keys in the options must be matched to the keys in
-- load_file_keyring_provider_options function.
SELECT pg_tde_change_global_key_provider('file', provider_name,
json_object('path' VALUE COALESCE(file_path, '')));
json_object('path' VALUE file_path));
END;

CREATE FUNCTION pg_tde_change_global_key_provider_file(provider_name TEXT, file_path JSON)
Expand All @@ -352,10 +352,10 @@ BEGIN ATOMIC
-- JSON keys in the options must be matched to the keys in
-- load_vaultV2_keyring_provider_options function.
SELECT pg_tde_change_global_key_provider('vault-v2', provider_name,
json_object('url' VALUE COALESCE(vault_url, ''),
'token' VALUE COALESCE(vault_token, ''),
'mountPath' VALUE COALESCE(vault_mount_path, ''),
'caPath' VALUE COALESCE(vault_ca_path, '')));
json_object('url' VALUE vault_url,
'token' VALUE vault_token,
'mountPath' VALUE vault_mount_path,
'caPath' VALUE vault_ca_path));
END;

CREATE FUNCTION pg_tde_change_global_key_provider_vault_v2(provider_name TEXT,
Expand Down Expand Up @@ -387,11 +387,11 @@ BEGIN ATOMIC
-- JSON keys in the options must be matched to the keys in
-- load_kmip_keyring_provider_options function.
SELECT pg_tde_change_global_key_provider('kmip', provider_name,
json_object('host' VALUE COALESCE(kmip_host, ''),
json_object('host' VALUE kmip_host,
'port' VALUE kmip_port,
'caPath' VALUE COALESCE(kmip_ca_path, ''),
'certPath' VALUE COALESCE(kmip_cert_path, ''),
'keyPath' VALUE COALESCE(kmip_key_path, '')));
'caPath' VALUE kmip_ca_path,
'certPath' VALUE kmip_cert_path,
'keyPath' VALUE kmip_key_path));
END;

CREATE FUNCTION pg_tde_change_global_key_provider_kmip(provider_name TEXT,
Expand Down