8000 Merge branch 'TDE_REL_17_STABLE' into DOCS-create-replication.md · percona/postgres@be718a5 · GitHub
[go: up one dir, main page]
Skip to content

Commit be718a5

Browse files
AndriciucAndriciuc
authored
Merge branch 'TDE_REL_17_STABLE' into DOCS-create-replication.md
2 parents f704afa + 4173798 commit be718a5

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

‎contrib/pg_tde/pg_tde--1.0-rc.sql

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BEGIN ATOMIC
1717
-- JSON keys in the options must be matched to the keys in
1818
-- load_file_keyring_provider_options function.
1919
SELECT pg_tde_add_database_key_provider('file', provider_name,
20-
json_object('path' VALUE COALESCE(file_path, '')));
20+
json_object('path' VALUE file_path));
2121
END;
2222

2323
CREATE FUNCTION pg_tde_add_database_key_provider_file(provider_name TEXT, file_path JSON)
@@ -41,10 +41,10 @@ BEGIN ATOMIC
4141
-- JSON keys in the options must be matched to the keys in
4242
-- load_vaultV2_keyring_provider_options function.
4343
SELECT pg_tde_add_database_key_provider('vault-v2', provider_name,
44-
json_object('url' VALUE COALESCE(vault_url, ''),
45-
'tokenPath' VALUE COALESCE(vault_token_path, ''),
46-
'mountPath' VALUE COALESCE(vault_mount_path, ''),
47-
'caPath' VALUE COALESCE(vault_ca_path, '')));
44+
json_object('url' VALUE vault_url,
45+
'tokenPath' VALUE vault_token_path,
46+
'mountPath' VALUE vault_mount_path,
47+
'caPath' VALUE vault_ca_path));
4848
END;
4949

5050
CREATE FUNCTION pg_tde_add_database_key_provider_kmip(provider_name TEXT,
@@ -59,11 +59,11 @@ BEGIN ATOMIC
5959
-- JSON keys in the options must be matched to the keys in
6060
-- load_kmip_keyring_provider_options function.
6161
SELECT pg_tde_add_database_key_provider('kmip', provider_name,
62-
json_object('host' VALUE COALESCE(kmip_host, ''),
62+
json_object('host' VALUE kmip_host,
6363
'port' VALUE kmip_port,
64-
'caPath' VALUE COALESCE(kmip_ca_path, ''),
65-
'certPath' VALUE COALESCE(kmip_cert_path, ''),
66-
'keyPath' VALUE COALESCE(kmip_key_path, '')));
64+
'caPath' VALUE kmip_ca_path,
65+
'certPath' VALUE kmip_cert_path,
66+
'keyPath' VALUE kmip_key_path));
6767
END;
6868

6969
CREATE FUNCTION pg_tde_list_all_database_key_providers
@@ -100,7 +100,7 @@ BEGIN ATOMIC
100100
-- JSON keys in the options must be matched to the keys in
101101
-- load_file_keyring_provider_options function.
102102
SELECT pg_tde_add_global_key_provider('file', provider_name,
103-
json_object('path' VALUE COALESCE(file_path, '')));
103+
json_object('path' VALUE file_path));
104104
END;
105105

106106
CREATE FUNCTION pg_tde_add_global_key_provider_file(provider_name TEXT, file_path JSON)
@@ -124,10 +124,10 @@ BEGIN ATOMIC
124124
-- JSON keys in the options must be matched to the keys in
125125
-- load_vaultV2_keyring_provider_options function.
126126
SELECT pg_tde_add_global_key_provider('vault-v2', provider_name,
127-
json_object('url' VALUE COALESCE(vault_url, ''),
128-
'tokenPath' VALUE COALESCE(vault_token_path, ''),
129-
'mountPath' VALUE COALESCE(vault_mount_path, ''),
130-
'caPath' VALUE COALESCE(vault_ca_path, '')));
127+
json_object('url' VALUE vault_url,
128+
'tokenPath' VALUE vault_token_path,
129+
'mountPath' VALUE vault_mount_path,
130+
'caPath' VALUE vault_ca_path));
131131
END;
132132

133133
CREATE FUNCTION pg_tde_add_global_key_provider_kmip(provider_name TEXT,
@@ -142,11 +142,11 @@ BEGIN ATOMIC
142142
-- JSON keys in the options must be matched to the keys in
143143
-- load_kmip_keyring_provider_options function.
144144
SELECT pg_tde_add_global_key_provider('kmip', provider_name,
145-
json_object('host' VALUE COALESCE(kmip_host, ''),
145+
json_object('host' VALUE kmip_host,
146146
'port' VALUE kmip_port,
147-
'caPath' VALUE COALESCE(kmip_ca_path, ''),
148-
'certPath' VALUE COALESCE(kmip_cert_path, ''),
149-
'keyPath' VALUE COALESCE(kmip_key_path, '')));
147+
'caPath' VALUE kmip_ca_path,
148+
'certPath' VALUE kmip_cert_path,
149+
'keyPath' VALUE kmip_key_path));
150150
END;
151151

152152
-- Key Provider Management
@@ -163,7 +163,7 @@ BEGIN ATOMIC
163163
-- JSON keys in the options must be matched to the keys in
164164
-- load_file_keyring_provider_options function.
165165
SELECT pg_tde_change_database_key_provider('file', provider_name,
166-
json_object('path' VALUE COALESCE(file_path, '')));
166+
json_object('path' VALUE file_path));
167167
END;
168168

169169
CREATE FUNCTION pg_tde_change_database_key_provider_file(provider_name TEXT, file_path JSON)
@@ -187,10 +187,10 @@ BEGIN ATOMIC
187187
-- JSON keys in the options must be matched to the keys in
188188
-- load_vaultV2_keyring_provider_options function.
189189
SELECT pg_tde_change_database_key_provider('vault-v2', provider_name,
190-
json_object('url' VALUE COALESCE(vault_url, ''),
191-
'tokenPath' VALUE COALESCE(vault_token_path, ''),
192-
'mountPath' VALUE COALESCE(vault_mount_path, ''),
193-
'caPath' VALUE COALESCE(vault_ca_path, '')));
190+
json_object('url' VALUE vault_url,
191+
'tokenPath' VALUE vault_token_path,
192+
'mountPath' VALUE vault_mount_path,
193+
'caPath' VALUE vault_ca_path));
194194
END;
195195

196196
CREATE FUNCTION pg_tde_change_database_key_provider_kmip(provider_name TEXT,
@@ -205,11 +205,11 @@ BEGIN ATOMIC
205205
-- JSON keys in the options must be matched to the keys in
206206
-- load_kmip_keyring_provider_options function.
207207
SELECT pg_tde_change_database_key_provider('kmip', provider_name,
208-
json_object('host' VALUE COALESCE(kmip_host, ''),
208+
json_object('host' VALUE kmip_host,
209209
'port' VALUE kmip_port,
210-
'caPath' VALUE COALESCE(kmip_ca_path, ''),
211-
'certPath' VALUE COALESCE(kmip_cert_path, ''),
212-
'keyPath' VALUE COALESCE(kmip_key_path, '')));
210+
'caPath' VALUE kmip_ca_path,
211+
'certPath' VALUE kmip_cert_path,
212+
'keyPath' VALUE kmip_key_path));
213213
END;
214214

215215
-- Global Tablespace Key Provider Management
@@ -226,7 +226,7 @@ BEGIN ATOMIC
226226
-- JSON keys in the options must be matched to the keys in
227227
-- load_file_keyring_provider_options function.
228228
SELECT pg_tde_change_global_key_provider('file', provider_name,
229-
json_object('path' VALUE COALESCE(file_path, '')));
229+
json_object('path' VALUE file_path));
230230
END;
231231

232232
CREATE FUNCTION pg_tde_change_global_key_provider_file(provider_name TEXT, file_path JSON)
@@ -250,10 +250,10 @@ BEGIN ATOMIC
250250
-- JSON keys in the options must be matched to the keys in
251251
-- load_vaultV2_keyring_provider_options function.
252252
SELECT pg_tde_change_global_key_provider('vault-v2', provider_name,
253-
json_object('url' VALUE COALESCE(vault_url, ''),
254-
'tokenPath' VALUE COALESCE(vault_token_path, ''),
255-
'mountPath' VALUE COALESCE(vault_mount_path, ''),
256-
'caPath' VALUE COALESCE(vault_ca_path, '')));
253+
json_object('url' VALUE vault_url,
254+
'tokenPath' VALUE vault_token_path,
255+
'mountPath' VALUE vault_mount_path,
256+
'caPath' VALUE vault_ca_path));
257257
END;
258258

259259
CREATE FUNCTION pg_tde_change_global_key_provider_kmip(provider_name TEXT,
@@ -268,11 +268,11 @@ BEGIN ATOMIC
268268
-- JSON keys in the options must be matched to the keys in
269269
-- load_kmip_keyring_provider_options function.
270270
SELECT pg_tde_change_global_key_provider('kmip', provider_name,
271-
json_object('host' VALUE COALESCE(kmip_host, ''),
271+
json_object('host' VALUE kmip_host,
272272
'port' VALUE kmip_port,
273-
'caPath' VALUE COALESCE(kmip_ca_path, ''),
274-
'certPath' VALUE COALESCE(kmip_cert_path, ''),
275-
'keyPath' VALUE COALESCE(kmip_key_path, '')));
273+
'caPath' VALUE kmip_ca_path,
274+
'certPath' VALUE kmip_cert_path,
275+
'keyPath' VALUE kmip_key_path));
276276
END;
277277

278278
CREATE FUNCTION pg_tde_is_encrypted(relation REGCLASS)

0 commit comments

Comments
 (0)
0