Skip to content

Commit 123b702

Browse files
committed
tmp
1 parent aac2a4b commit 123b702

File tree

1 file changed

+38
-37
lines changed
  • ansible/files/admin_api_scripts/pg_upgrade_scripts

1 file changed

+38
-37
lines changed

ansible/files/admin_api_scripts/pg_upgrade_scripts/complete.sh

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -152,43 +152,44 @@ EOF
152152
run_sql -c "update pg_extension set extowner = 'postgres'::regrole where extname = 'pgmq';"
153153
fi
154154

155-
# # If upgrading to pgsodium-less Vault, Wrappers need to be updated so that
156-
# # foreign servers use `vault.secrets.id` instead of `vault.secrets.key_id`
157-
# UPDATE_WRAPPERS_SERVER_OPTIONS_QUERY=$(cat <<EOF
158-
# DO \$\$
159-
# DECLARE
160-
# server_rec RECORD;
161-
# option_rec RECORD;
162-
# vault_secrets RECORD;
163-
# BEGIN
164-
# IF EXISTS (SELECT FROM pg_available_extension_versions WHERE name = 'wrappers' AND version = '0.4.6')
165-
# AND EXISTS (SELECT FROM pg_extension WHERE extname = 'wrappers')
166-
# THEN
167-
# FOR server_rec IN
168-
# SELECT srvname, srvoptions
169-
# FROM pg_foreign_server
170-
# LOOP
171-
# FOR option_rec IN
172-
# SELECT split_part(srvoption, '=', 1) AS option_name, split_part(srvoption, '=', 2) AS option_value
173-
# FROM UNNEST(server_rec.srvoptions) AS srvoption
174-
# LOOP
175-
# IF EXISTS (SELECT FROM vault.secrets WHERE option_rec.option_value IN (id::text, key_id::text)) THEN
176-
# EXECUTE format(
177-
# 'ALTER SERVER %I OPTIONS (SET %I %L)',
178-
# server_rec.srvname,
179-
# option_rec.option_name,
180-
# (SELECT id FROM vault.secrets WHERE option_rec.option_value IN (id::text, key_id::text))
181-
# );
182-
# END IF;
183-
# END LOOP;
184-
# END LOOP;
185-
# END IF;
186-
# CREATE SCHEMA sentinel;
187-
# END;
188-
# \$\$;
189-
# EOF
190-
# )
191-
# run_sql -c "$UPDATE_WRAPPERS_SERVER_OPTIONS_QUERY"
155+
# If upgrading to pgsodium-less Vault, Wrappers need to be updated so that
156+
# foreign servers use `vault.secrets.id` instead of `vault.secrets.key_id`
157+
UPDATE_WRAPPERS_SERVER_OPTIONS_QUERY=$(cat <<EOF
158+
DO \$\$
159+
DECLARE
160+
server_rec RECORD;
161+
option_rec RECORD;
162+
vault_secrets RECORD;
163+
BEGIN
164+
IF EXISTS (SELECT FROM pg_available_extension_versions WHERE name = 'wrappers' AND version = '0.4.6')
165+
AND EXISTS (SELECT FROM pg_extension WHERE extname = 'wrappers')
166+
THEN
167+
FOR server_rec IN
168+
SELECT srvname, srvoptions
169+
FROM pg_foreign_server
170+
LOOP
171+
FOR option_rec IN
172+
SELECT split_part(srvoption, '=', 1) AS option_name, split_part(srvoption, '=', 2) AS option_value
173+
FROM UNNEST(server_rec.srvoptions) AS srvoption
174+
LOOP
175+
IF EXISTS (SELECT FROM vault.secrets WHERE option_rec.option_value IN (id::text, key_id::text)) THEN
176+
RAISE WARNING '%', format(
177+
'ALTER SERVER %I OPTIONS (SET %I %L)',
178+
server_rec.srvname,
179+
option_rec.option_name,
180+
(SELECT id FROM vault.secrets WHERE option_rec.option_value IN (id::text, key_id::text))
181+
);
182+
END IF;
183+
END LOOP;
184+
END LOOP;
185+
END IF;
186+
CREATE SCHEMA sentinel;
187+
END;
188+
\$\$;
189+
EOF
190+
)
191+
run_sql -c "$UPDATE_WRAPPERS_SERVER_OPTIONS_QUERY"
192+
run_sql -c "select * from vault.secrets"
192193

193194
# # Patch to handle upgrading to pgsodium-less Vault
194195
# REENCRYPT_VAULT_SECRETS_QUERY=$(cat <<EOF

0 commit comments

Comments
 (0)