Skip to content

Commit c96f234

Browse files
authored
Revert "chore: enable Vault (#598)" (#607)
This reverts commit a157038.
1 parent a157038 commit c96f234

File tree

6 files changed

+6
-74
lines changed

6 files changed

+6
-74
lines changed

Diff for: ansible/tasks/setup-extensions.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
- name: Install auto_explain
6565
import_tasks: tasks/postgres-extensions/21-auto_explain.yml
6666

67-
- name: Install vault
68-
import_tasks: tasks/postgres-extensions/23-vault.yml
67+
# - name: Install vault
68+
# import_tasks: tasks/postgres-extensions/23-vault.yml
6969

7070
- name: Install PGroonga
7171
import_tasks: tasks/postgres-extensions/24-pgroonga.yml

Diff for: common.vars.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
postgres-version = "15.1.0.65"
1+
postgres-version = "15.1.0.65-disable.vault"

Diff for: ebssurrogate/files/unit-tests/unit-test-01.sql

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ SELECT extensions_are(
1212
'pg_graphql',
1313
'pgcrypto',
1414
'pgjwt',
15-
'uuid-ossp',
16-
'supabase_vault'
15+
'uuid-ossp'
1716
]
1817
);
1918

Diff for: migrations/db/migrations/20221207154255_create_pgsodium_and_vault.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ grant execute on function pgsodium.crypto_aead_det_decrypt(bytea, bytea, uuid, b
1010
grant execute on function pgsodium.crypto_aead_det_encrypt(bytea, bytea, uuid, bytea) to service_role;
1111
grant execute on function pgsodium.crypto_aead_det_keygen to service_role;
1212

13-
create extension if not exists supabase_vault;
13+
-- create extension if not exists supabase_vault;
1414

1515
-- migrate:down

Diff for: migrations/schema.sql

-67
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,6 @@ CREATE SCHEMA realtime;
7979
CREATE SCHEMA storage;
8080

8181

82-
--
83-
-- Name: vault; Type: SCHEMA; Schema: -; Owner: -
84-
--
85-
86-
CREATE SCHEMA vault;
87-
88-
8982
--
9083
-- Name: pg_graphql; Type: EXTENSION; Schema: -; Owner: -
9184
--
@@ -142,20 +135,6 @@ CREATE EXTENSION IF NOT EXISTS pgjwt WITH SCHEMA extensions;
142135
COMMENT ON EXTENSION pgjwt IS 'JSON Web Token API for Postgresql';
143136

144137

145-
--
146-
-- Name: supabase_vault; Type: EXTENSION; Schema: -; Owner: -
147-
--
148-
149-
CREATE EXTENSION IF NOT EXISTS supabase_vault WITH SCHEMA vault;
150-
151-
152-
--
153-
-- Name: EXTENSION supabase_vault; Type: COMMENT; Schema: -; Owner: -
154-
--
155-
156-
COMMENT ON EXTENSION supabase_vault IS 'Supabase Vault Extension';
157-
158-
159138
--
160139
-- Name: uuid-ossp; Type: EXTENSION; Schema: -; Owner: -
161140
--
@@ -573,28 +552,6 @@ END
573552
$$;
574553

575554

576-
--
577-
-- Name: secrets_encrypt_secret_secret(); Type: FUNCTION; Schema: vault; Owner: -
578-
--
579-
580-
CREATE FUNCTION vault.secrets_encrypt_secret_secret() RETURNS trigger
581-
LANGUAGE plpgsql
582-
AS $$
583-
BEGIN
584-
new.secret = CASE WHEN new.secret IS NULL THEN NULL ELSE
585-
CASE WHEN new.key_id IS NULL THEN NULL ELSE pg_catalog.encode(
586-
pgsodium.crypto_aead_det_encrypt(
587-
pg_catalog.convert_to(new.secret, 'utf8'),
588-
pg_catalog.convert_to((new.id::text || new.description::text || new.created_at::text || new.updated_at::text)::text, 'utf8'),
589-
new.key_id::uuid,
590-
new.nonce
591-
),
592-
'base64') END END;
593-
RETURN new;
594-
END;
595-
$$;
596-
597-
598555
SET default_tablespace = '';
599556

600557
SET default_table_access_method = heap;
@@ -781,30 +738,6 @@ CREATE TABLE storage.objects (
781738
);
782739

783740

784-
--
785-
-- Name: decrypted_secrets; Type: VIEW; Schema: vault; Owner: -
786-
--
787-
788-
CREATE VIEW vault.decrypted_secrets AS
789-
SELECT secrets.id,
790-
secrets.name,
791-
secrets.description,
792-
secrets.secret,
793-
CASE
794-
WHEN (secrets.secret IS NULL) THEN NULL::text
795-
ELSE
796-
CASE
797-
WHEN (secrets.key_id IS NULL) THEN NULL::text
798-
ELSE convert_from(pgsodium.crypto_aead_det_decrypt(decode(secrets.secret, 'base64'::text), convert_to(((((secrets.id)::text || secrets.description) || (secrets.created_at)::text) || (secrets.updated_at)::text), 'utf8'::name), secrets.key_id, secrets.nonce), 'utf8'::name)
799-
END
800-
END AS decrypted_secret,
801-
secrets.key_id,
802-
secrets.nonce,
803-
secrets.created_at,
804-
secrets.updated_at
805-
FROM vault.secrets;
806-
807-
808741
--
809742
-- Name: refresh_tokens id; Type: DEFAULT; Schema: auth; Owner: -
810743
--

Diff for: migrations/tests/extensions/test.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
\ir 20-pg_stat_monitor.sql
2222
\ir 21-auto_explain.sql
2323
\ir 22-pg_jsonschema.sql
24-
\ir 23-vault.sql
24+
-- \ir 23-vault.sql
2525
\ir 24-pgroonga.sql
2626
\ir 25-wrappers.sql
2727
\ir 26-hypopg.sql

0 commit comments

Comments
 (0)