diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 75f468f4..5fc38019 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -45,12 +45,12 @@ jobs: run: | sudo mkdir -p /run/secrets for role in grafana postgraphile reccoom vibetype zammad; do - echo "$role" | sudo tee "/run/secrets/postgres_role_service_${role}_username" > /dev/null - echo "placeholder" | sudo tee "/run/secrets/postgres_role_service_${role}_password" > /dev/null + echo "$role" | sudo tee "/run/secrets/postgres-role-service-${role}-username" > /dev/null + echo "placeholder" | sudo tee "/run/secrets/postgres-role-service-${role}-password" > /dev/null done - name: Install Sqitch - run: sudo apt-get update && sudo apt-get install --no-install-recommends -y jq=1.7.1-3ubuntu0.24.04.1 sqitch=1.4.1-1 + run: sudo apt-get update && sudo apt-get install --no-install-recommends -y jq=1.7.1-3ubuntu0.24.04.2 sqitch=1.4.1-1 - name: Deploy base migrations run: sqitch --chdir base/src deploy --target db:pg://ci:postgres@localhost/ci_database diff --git a/Dockerfile b/Dockerfile index a3b73b34..200575ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ COPY ./src ./ FROM postgis/postgis:18-3.6 AS postgres-base ENV POSTGRES_DB=ci_database -ENV POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password +ENV POSTGRES_PASSWORD_FILE=/run/secrets/postgres-password ENV POSTGRES_USER=ci WORKDIR /srv/app @@ -37,18 +37,18 @@ RUN apt-get update \ jq \ sqitch=1.5.2-1 \ && mkdir -p /run/secrets \ - && echo "grafana" > /run/secrets/postgres_role_service_grafana_username \ - && echo "postgres" > /run/secrets/postgres_password \ - && echo "postgraphile" > /run/secrets/postgres_role_service_postgraphile_username \ - && echo "reccoom" > /run/secrets/postgres_role_service_reccoom_username \ - && echo "vibetype" > /run/secrets/postgres_role_service_vibetype_username \ - && echo "zammad" > /run/secrets/postgres_role_service_zammad_username \ + && echo "grafana" > /run/secrets/postgres-role-service-grafana-username \ + && echo "postgres" > /run/secrets/postgres-password \ + && echo "postgraphile" > /run/secrets/postgres-role-service-postgraphile-username \ + && echo "reccoom" > /run/secrets/postgres-role-service-reccoom-username \ + && echo "vibetype" > /run/secrets/postgres-role-service-vibetype-username \ + && echo "zammad" > /run/secrets/postgres-role-service-zammad-username \ && echo "placeholder" | tee \ - /run/secrets/postgres_role_service_grafana_password \ - /run/secrets/postgres_role_service_postgraphile_password \ - /run/secrets/postgres_role_service_reccoom_password \ - /run/secrets/postgres_role_service_vibetype_password \ - /run/secrets/postgres_role_service_zammad_password \ + /run/secrets/postgres-role-service-grafana-password \ + /run/secrets/postgres-role-service-postgraphile-password \ + /run/secrets/postgres-role-service-reccoom-password \ + /run/secrets/postgres-role-service-vibetype-password \ + /run/secrets/postgres-role-service-zammad-password \ /dev/null COPY ./src ./src diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..7aff0e85 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +.PHONY: init + +init: + @if [ -d node_modules ]; then echo "Already initialized."; else pnpm install; fi \ No newline at end of file diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 7a7fb2ff..f990b0c7 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -SQITCH_TARGET="$(cat /run/secrets/sqitch_target)" +SQITCH_TARGET="$(cat /run/secrets/sqitch-target)" export SQITCH_TARGET exec /bin/sh -c "$*" diff --git a/src/deploy/database_grafana.sql b/src/deploy/database_grafana.sql index a9f37819..f1f25cb8 100644 --- a/src/deploy/database_grafana.sql +++ b/src/deploy/database_grafana.sql @@ -1,4 +1,4 @@ -\set role_service_grafana_username `cat /run/secrets/postgres_role_service_grafana_username` +\set role_service_grafana_username `cat /run/secrets/postgres-role-service-grafana-username` SELECT 'CREATE DATABASE grafana OWNER "' || :'role_service_grafana_username' || '";' WHERE NOT EXISTS ( diff --git a/src/deploy/database_zammad.sql b/src/deploy/database_zammad.sql index 94bcbf58..b993f2ab 100644 --- a/src/deploy/database_zammad.sql +++ b/src/deploy/database_zammad.sql @@ -1,4 +1,4 @@ -\set role_service_zammad_username `cat /run/secrets/postgres_role_service_zammad_username` +\set role_service_zammad_username `cat /run/secrets/postgres-role-service-zammad-username` SELECT 'CREATE DATABASE zammad OWNER "' || :'role_service_zammad_username' || '";' WHERE NOT EXISTS ( diff --git a/src/deploy/function_invoker_account_id.sql b/src/deploy/function_invoker_account_id.sql index 6b070ee5..8ca7b813 100644 --- a/src/deploy/function_invoker_account_id.sql +++ b/src/deploy/function_invoker_account_id.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` CREATE FUNCTION vibetype.invoker_account_id() RETURNS uuid LANGUAGE sql STABLE STRICT diff --git a/src/deploy/role_account.sql b/src/deploy/role_account.sql index e28d80de..fb6d6c80 100644 --- a/src/deploy/role_account.sql +++ b/src/deploy/role_account.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_postgraphile_username `cat /run/secrets/postgres_role_service_postgraphile_username` +\set role_service_postgraphile_username `cat /run/secrets/postgres-role-service-postgraphile-username` DROP ROLE IF EXISTS vibetype_account; CREATE ROLE vibetype_account; diff --git a/src/deploy/role_anonymous.sql b/src/deploy/role_anonymous.sql index 5a5cc277..627bce8f 100644 --- a/src/deploy/role_anonymous.sql +++ b/src/deploy/role_anonymous.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_postgraphile_username `cat /run/secrets/postgres_role_service_postgraphile_username` +\set role_service_postgraphile_username `cat /run/secrets/postgres-role-service-postgraphile-username` DROP ROLE IF EXISTS vibetype_anonymous; CREATE ROLE vibetype_anonymous; diff --git a/src/deploy/role_grafana.sql b/src/deploy/role_grafana.sql index 31715e63..9cda19e6 100644 --- a/src/deploy/role_grafana.sql +++ b/src/deploy/role_grafana.sql @@ -1,7 +1,7 @@ BEGIN; -\set role_service_grafana_password `cat /run/secrets/postgres_role_service_grafana_password` -\set role_service_grafana_username `cat /run/secrets/postgres_role_service_grafana_username` +\set role_service_grafana_password `cat /run/secrets/postgres-role-service-grafana-password` +\set role_service_grafana_username `cat /run/secrets/postgres-role-service-grafana-username` DROP ROLE IF EXISTS :role_service_grafana_username; CREATE ROLE :role_service_grafana_username LOGIN PASSWORD :'role_service_grafana_password'; diff --git a/src/deploy/role_postgraphile.sql b/src/deploy/role_postgraphile.sql index 30719f37..73874b2a 100644 --- a/src/deploy/role_postgraphile.sql +++ b/src/deploy/role_postgraphile.sql @@ -1,7 +1,7 @@ BEGIN; -\set role_service_postgraphile_password `cat /run/secrets/postgres_role_service_postgraphile_password` -\set role_service_postgraphile_username `cat /run/secrets/postgres_role_service_postgraphile_username` +\set role_service_postgraphile_password `cat /run/secrets/postgres-role-service-postgraphile-password` +\set role_service_postgraphile_username `cat /run/secrets/postgres-role-service-postgraphile-username` DROP ROLE IF EXISTS :role_service_postgraphile_username; CREATE ROLE :role_service_postgraphile_username LOGIN PASSWORD :'role_service_postgraphile_password'; diff --git a/src/deploy/role_reccoom.sql b/src/deploy/role_reccoom.sql index 9bef1db0..966ec3f3 100644 --- a/src/deploy/role_reccoom.sql +++ b/src/deploy/role_reccoom.sql @@ -1,7 +1,7 @@ BEGIN; -\set role_service_reccoom_password `cat /run/secrets/postgres_role_service_reccoom_password` -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_password `cat /run/secrets/postgres-role-service-reccoom-password` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` DROP ROLE IF EXISTS :role_service_reccoom_username; CREATE ROLE :role_service_reccoom_username LOGIN PASSWORD :'role_service_reccoom_password' BYPASSRLS; diff --git a/src/deploy/role_vibetype.sql b/src/deploy/role_vibetype.sql index 3d62c62c..4bb4e686 100644 --- a/src/deploy/role_vibetype.sql +++ b/src/deploy/role_vibetype.sql @@ -1,8 +1,8 @@ BEGIN; -\set role_service_vibetype_password `cat /run/secrets/postgres_role_service_vibetype_password` -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` -\set role_service_postgraphile_username `cat /run/secrets/postgres_role_service_postgraphile_username` +\set role_service_vibetype_password `cat /run/secrets/postgres-role-service-vibetype-password` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` +\set role_service_postgraphile_username `cat /run/secrets/postgres-role-service-postgraphile-username` DROP ROLE IF EXISTS :role_service_vibetype_username; CREATE ROLE :role_service_vibetype_username LOGIN PASSWORD :'role_service_vibetype_password'; diff --git a/src/deploy/role_zammad.sql b/src/deploy/role_zammad.sql index 60e66807..8e8b4772 100644 --- a/src/deploy/role_zammad.sql +++ b/src/deploy/role_zammad.sql @@ -1,7 +1,7 @@ BEGIN; -\set role_service_zammad_password `cat /run/secrets/postgres_role_service_zammad_password` -\set role_service_zammad_username `cat /run/secrets/postgres_role_service_zammad_username` +\set role_service_zammad_password `cat /run/secrets/postgres-role-service-zammad-password` +\set role_service_zammad_username `cat /run/secrets/postgres-role-service-zammad-username` DROP ROLE IF EXISTS :role_service_zammad_username; CREATE ROLE :role_service_zammad_username LOGIN PASSWORD :'role_service_zammad_password'; diff --git a/src/deploy/schema_private.sql b/src/deploy/schema_private.sql index d044bd43..0ce74dae 100644 --- a/src/deploy/schema_private.sql +++ b/src/deploy/schema_private.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_grafana_username `cat /run/secrets/postgres_role_service_grafana_username` +\set role_service_grafana_username `cat /run/secrets/postgres-role-service-grafana-username` CREATE SCHEMA vibetype_private; diff --git a/src/deploy/schema_public.sql b/src/deploy/schema_public.sql index e7ad494a..d22b3a30 100644 --- a/src/deploy/schema_public.sql +++ b/src/deploy/schema_public.sql @@ -1,7 +1,7 @@ BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` CREATE SCHEMA vibetype; diff --git a/src/deploy/table_account_block.sql b/src/deploy/table_account_block.sql index cff02b7d..4da351bc 100644 --- a/src/deploy/table_account_block.sql +++ b/src/deploy/table_account_block.sql @@ -21,7 +21,7 @@ COMMENT ON COLUMN vibetype.account_block.blocked_account_id IS 'The account id o COMMENT ON COLUMN vibetype.account_block.created_at IS E'@behavior -insert\nTimestamp of when the account block was created.'; COMMENT ON COLUMN vibetype.account_block.created_by IS 'The account id of the user who created the account block.'; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` GRANT INSERT, SELECT, DELETE ON TABLE vibetype.account_block TO vibetype_account; GRANT SELECT ON TABLE vibetype.account_block TO vibetype_anonymous; diff --git a/src/deploy/table_account_private.sql b/src/deploy/table_account_private.sql index b969a571..6d27cf77 100644 --- a/src/deploy/table_account_private.sql +++ b/src/deploy/table_account_private.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_grafana_username `cat /run/secrets/postgres_role_service_grafana_username` +\set role_service_grafana_username `cat /run/secrets/postgres-role-service-grafana-username` CREATE TABLE vibetype_private.account ( id UUID PRIMARY KEY DEFAULT gen_random_uuid(), diff --git a/src/deploy/table_achievement_code.sql b/src/deploy/table_achievement_code.sql index 33fe29c0..ef1b8c76 100644 --- a/src/deploy/table_achievement_code.sql +++ b/src/deploy/table_achievement_code.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` CREATE TABLE vibetype_private.achievement_code ( id UUID PRIMARY KEY DEFAULT gen_random_uuid(), diff --git a/src/deploy/table_device.sql b/src/deploy/table_device.sql index 6468a45b..f744c04f 100644 --- a/src/deploy/table_device.sql +++ b/src/deploy/table_device.sql @@ -56,7 +56,7 @@ CREATE TRIGGER update_fcm FOR EACH ROW EXECUTE FUNCTION vibetype.trigger_device_update_fcm_token(); -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` GRANT INSERT, SELECT, UPDATE, DELETE ON TABLE vibetype.device TO vibetype_account; GRANT SELECT ON TABLE vibetype.device TO :role_service_vibetype_username; diff --git a/src/deploy/table_event_category.sql b/src/deploy/table_event_category.sql index 3459c5c2..9bce41ee 100644 --- a/src/deploy/table_event_category.sql +++ b/src/deploy/table_event_category.sql @@ -11,7 +11,7 @@ COMMENT ON TABLE vibetype.event_category IS E'@behavior -insert -update -delete\ COMMENT ON COLUMN vibetype.event_category.id IS 'The id of the event category.'; COMMENT ON COLUMN vibetype.event_category.name IS 'A category name.'; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` GRANT SELECT ON TABLE vibetype.event_category TO vibetype_anonymous; GRANT SELECT ON TABLE vibetype.event_category TO vibetype_account; diff --git a/src/deploy/table_event_category_mapping.sql b/src/deploy/table_event_category_mapping.sql index a32ca0e0..35568d0d 100644 --- a/src/deploy/table_event_category_mapping.sql +++ b/src/deploy/table_event_category_mapping.sql @@ -14,7 +14,7 @@ COMMENT ON TABLE vibetype.event_category_mapping IS 'Mapping events to categorie COMMENT ON COLUMN vibetype.event_category_mapping.event_id IS 'An event id.'; COMMENT ON COLUMN vibetype.event_category_mapping.category_id IS 'A category id.'; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` GRANT SELECT ON TABLE vibetype.event_category_mapping TO vibetype_anonymous; GRANT SELECT, INSERT, DELETE ON TABLE vibetype.event_category_mapping TO vibetype_account; diff --git a/src/deploy/table_event_format.sql b/src/deploy/table_event_format.sql index ce724d0a..fd3702b8 100644 --- a/src/deploy/table_event_format.sql +++ b/src/deploy/table_event_format.sql @@ -11,7 +11,7 @@ COMMENT ON TABLE vibetype.event_format IS E'@behavior -insert -update -delete\nE COMMENT ON COLUMN vibetype.event_format.id IS 'The id of the event format.'; COMMENT ON COLUMN vibetype.event_format.name IS 'The name of the event format.'; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` GRANT SELECT ON TABLE vibetype.event_format TO vibetype_anonymous; GRANT SELECT ON TABLE vibetype.event_format TO vibetype_account; diff --git a/src/deploy/table_event_format_mapping.sql b/src/deploy/table_event_format_mapping.sql index 5f4c1645..fa51dd20 100644 --- a/src/deploy/table_event_format_mapping.sql +++ b/src/deploy/table_event_format_mapping.sql @@ -14,7 +14,7 @@ COMMENT ON TABLE vibetype.event_format_mapping IS 'Mapping events to formats (M: COMMENT ON COLUMN vibetype.event_format_mapping.event_id IS 'An event id.'; COMMENT ON COLUMN vibetype.event_format_mapping.format_id IS 'A format id.'; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` GRANT SELECT ON TABLE vibetype.event_format_mapping TO vibetype_anonymous; GRANT SELECT, INSERT, DELETE ON TABLE vibetype.event_format_mapping TO vibetype_account; diff --git a/src/deploy/table_event_policy.sql b/src/deploy/table_event_policy.sql index 3de4ff87..0aac1334 100644 --- a/src/deploy/table_event_policy.sql +++ b/src/deploy/table_event_policy.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` GRANT SELECT ON TABLE vibetype.event TO vibetype_anonymous; GRANT INSERT, SELECT, UPDATE, DELETE ON TABLE vibetype.event TO vibetype_account; diff --git a/src/deploy/table_notification.sql b/src/deploy/table_notification.sql index beac4e7d..e86f771b 100644 --- a/src/deploy/table_notification.sql +++ b/src/deploy/table_notification.sql @@ -17,7 +17,7 @@ COMMENT ON COLUMN vibetype_private.notification.is_acknowledged IS 'Whether the COMMENT ON COLUMN vibetype_private.notification.payload IS 'The notification''s payload.'; COMMENT ON COLUMN vibetype_private.notification.created_at IS 'The timestamp of the notification''s creation.'; -\set role_service_grafana_username `cat /run/secrets/postgres_role_service_grafana_username` +\set role_service_grafana_username `cat /run/secrets/postgres-role-service-grafana-username` GRANT SELECT ON TABLE vibetype_private.notification TO :role_service_grafana_username; COMMIT; diff --git a/src/deploy/table_preference_event_category.sql b/src/deploy/table_preference_event_category.sql index 32aee6ad..9361318b 100644 --- a/src/deploy/table_preference_event_category.sql +++ b/src/deploy/table_preference_event_category.sql @@ -18,7 +18,7 @@ COMMENT ON TABLE vibetype.preference_event_category IS 'Event categories a user COMMENT ON COLUMN vibetype.preference_event_category.account_id IS 'A user account id.'; COMMENT ON COLUMN vibetype.preference_event_category.category_id IS 'An event category id.'; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` GRANT SELECT, INSERT, DELETE ON TABLE vibetype.preference_event_category TO vibetype_account; GRANT SELECT ON TABLE vibetype.preference_event_category TO :role_service_reccoom_username; diff --git a/src/deploy/table_preference_event_format.sql b/src/deploy/table_preference_event_format.sql index e5c7f09f..b6ad5110 100644 --- a/src/deploy/table_preference_event_format.sql +++ b/src/deploy/table_preference_event_format.sql @@ -19,7 +19,7 @@ COMMENT ON COLUMN vibetype.preference_event_format.account_id IS 'A user account COMMENT ON COLUMN vibetype.preference_event_format.format_id IS 'The id of an event format.'; COMMENT ON COLUMN vibetype.preference_event_format.created_at IS 'The timestammp when the record was created..'; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` GRANT SELECT, INSERT, DELETE ON TABLE vibetype.preference_event_format TO vibetype_account; GRANT SELECT ON TABLE vibetype.preference_event_format TO :role_service_reccoom_username; diff --git a/src/deploy/table_profile_picture.sql b/src/deploy/table_profile_picture.sql index 25355e6c..982e70a3 100644 --- a/src/deploy/table_profile_picture.sql +++ b/src/deploy/table_profile_picture.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` CREATE TABLE vibetype.profile_picture ( id UUID PRIMARY KEY DEFAULT gen_random_uuid(), diff --git a/src/deploy/table_upload_policy.sql b/src/deploy/table_upload_policy.sql index 0b37b1f0..aa324d5e 100644 --- a/src/deploy/table_upload_policy.sql +++ b/src/deploy/table_upload_policy.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` GRANT SELECT ON TABLE vibetype.upload TO vibetype_anonymous; GRANT INSERT, SELECT, UPDATE, DELETE ON TABLE vibetype.upload TO vibetype_account; diff --git a/src/revert/role_grafana.sql b/src/revert/role_grafana.sql index 07f63f0e..467bd923 100644 --- a/src/revert/role_grafana.sql +++ b/src/revert/role_grafana.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_grafana_username `cat /run/secrets/postgres_role_service_grafana_username` +\set role_service_grafana_username `cat /run/secrets/postgres-role-service-grafana-username` DROP ROLE :role_service_grafana_username; diff --git a/src/revert/role_postgraphile.sql b/src/revert/role_postgraphile.sql index 4fa93aec..6269981e 100644 --- a/src/revert/role_postgraphile.sql +++ b/src/revert/role_postgraphile.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_postgraphile_username `cat /run/secrets/postgres_role_service_postgraphile_username` +\set role_service_postgraphile_username `cat /run/secrets/postgres-role-service-postgraphile-username` DROP ROLE :role_service_postgraphile_username; diff --git a/src/revert/role_reccoom.sql b/src/revert/role_reccoom.sql index 5e6387c5..0bc76c02 100644 --- a/src/revert/role_reccoom.sql +++ b/src/revert/role_reccoom.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` DROP ROLE :role_service_reccoom_username; diff --git a/src/revert/role_vibetype.sql b/src/revert/role_vibetype.sql index 924f2fbe..f4a53596 100644 --- a/src/revert/role_vibetype.sql +++ b/src/revert/role_vibetype.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` DROP ROLE :role_service_vibetype_username; diff --git a/src/revert/role_zammad.sql b/src/revert/role_zammad.sql index ca6670c0..af5c95d9 100644 --- a/src/revert/role_zammad.sql +++ b/src/revert/role_zammad.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_zammad_username `cat /run/secrets/postgres_role_service_zammad_username` +\set role_service_zammad_username `cat /run/secrets/postgres-role-service-zammad-username` DROP ROLE :role_service_zammad_username; diff --git a/src/revert/table_event_policy.sql b/src/revert/table_event_policy.sql index 2534db5f..211baccc 100644 --- a/src/revert/table_event_policy.sql +++ b/src/revert/table_event_policy.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` DROP POLICY event_select ON vibetype.event; DROP FUNCTION vibetype_private.events_with_claimed_attendance(); diff --git a/src/sqitch b/src/sqitch index 55f97b3b..993436b4 100755 --- a/src/sqitch +++ b/src/sqitch @@ -79,14 +79,14 @@ function docker_sudo() { docker_sudo run --rm --network host \ --mount "type=bind,src=$THIS,dst=/repo" \ --mount "type=bind,src=$HOME,dst=$homedst" \ - --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role_service_grafana_password.secret,dst=/run/secrets/postgres_role_service_grafana_password" \ - --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role_service_grafana_username.secret,dst=/run/secrets/postgres_role_service_grafana_username" \ - --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role_service_postgraphile_password.secret,dst=/run/secrets/postgres_role_service_postgraphile_password" \ - --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role_service_postgraphile_username.secret,dst=/run/secrets/postgres_role_service_postgraphile_username" \ - --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role_service_reccoom_password.secret,dst=/run/secrets/postgres_role_service_reccoom_password" \ - --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role_service_reccoom_username.secret,dst=/run/secrets/postgres_role_service_reccoom_username" \ - --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role_service_vibetype_password.secret,dst=/run/secrets/postgres_role_service_vibetype_password" \ - --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role_service_vibetype_username.secret,dst=/run/secrets/postgres_role_service_vibetype_username" \ - --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role_service_zammad_password.secret,dst=/run/secrets/postgres_role_service_zammad_password" \ - --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role_service_zammad_username.secret,dst=/run/secrets/postgres_role_service_zammad_username" \ + --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role-service-grafana-password.secret,dst=/run/secrets/postgres-role-service-grafana-password" \ + --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role-service-grafana-username.secret,dst=/run/secrets/postgres-role-service-grafana-username" \ + --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role-service-postgraphile-password.secret,dst=/run/secrets/postgres-role-service-postgraphile-password" \ + --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role-service-postgraphile-username.secret,dst=/run/secrets/postgres-role-service-postgraphile-username" \ + --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role-service-reccoom-password.secret,dst=/run/secrets/postgres-role-service-reccoom-password" \ + --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role-service-reccoom-username.secret,dst=/run/secrets/postgres-role-service-reccoom-username" \ + --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role-service-vibetype-password.secret,dst=/run/secrets/postgres-role-service-vibetype-password" \ + --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role-service-vibetype-username.secret,dst=/run/secrets/postgres-role-service-vibetype-username" \ + --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role-service-zammad-password.secret,dst=/run/secrets/postgres-role-service-zammad-password" \ + --mount "type=bind,src=$THIS/../../stack/src/development/secrets/postgres/role-service-zammad-username.secret,dst=/run/secrets/postgres-role-service-zammad-username" \ "${passopt[@]}" "$SQITCH_IMAGE" "$@" diff --git a/src/verify/function_invoker_account_id.sql b/src/verify/function_invoker_account_id.sql index 6736801c..9857deec 100644 --- a/src/verify/function_invoker_account_id.sql +++ b/src/verify/function_invoker_account_id.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/role_account.sql b/src/verify/role_account.sql index 9ced6791..8b0a4c7e 100644 --- a/src/verify/role_account.sql +++ b/src/verify/role_account.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_postgraphile_username `cat /run/secrets/postgres_role_service_postgraphile_username` +\set role_service_postgraphile_username `cat /run/secrets/postgres-role-service-postgraphile-username` SET local role.vibetype_postgraphile_username TO :'role_service_postgraphile_username'; DO $$ diff --git a/src/verify/role_anonymous.sql b/src/verify/role_anonymous.sql index 337a7371..ad6b1a20 100644 --- a/src/verify/role_anonymous.sql +++ b/src/verify/role_anonymous.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_postgraphile_username `cat /run/secrets/postgres_role_service_postgraphile_username` +\set role_service_postgraphile_username `cat /run/secrets/postgres-role-service-postgraphile-username` SET local role.vibetype_postgraphile_username TO :'role_service_postgraphile_username'; DO $$ diff --git a/src/verify/role_grafana.sql b/src/verify/role_grafana.sql index 56f26b29..62beee8c 100644 --- a/src/verify/role_grafana.sql +++ b/src/verify/role_grafana.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_grafana_username `cat /run/secrets/postgres_role_service_grafana_username` +\set role_service_grafana_username `cat /run/secrets/postgres-role-service-grafana-username` SET LOCAL role.service_grafana_username TO :'role_service_grafana_username'; diff --git a/src/verify/role_postgraphile.sql b/src/verify/role_postgraphile.sql index 91399237..7f4e7679 100644 --- a/src/verify/role_postgraphile.sql +++ b/src/verify/role_postgraphile.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_postgraphile_username `cat /run/secrets/postgres_role_service_postgraphile_username` +\set role_service_postgraphile_username `cat /run/secrets/postgres-role-service-postgraphile-username` SET local role.vibetype_postgraphile_username TO :'role_service_postgraphile_username'; DO $$ diff --git a/src/verify/role_reccoom.sql b/src/verify/role_reccoom.sql index 89d72602..ea5b0c11 100644 --- a/src/verify/role_reccoom.sql +++ b/src/verify/role_reccoom.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` SET LOCAL role.service_reccoom_username TO :'role_service_reccoom_username'; diff --git a/src/verify/role_vibetype.sql b/src/verify/role_vibetype.sql index e8a86d86..a8ba9065 100644 --- a/src/verify/role_vibetype.sql +++ b/src/verify/role_vibetype.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/role_zammad.sql b/src/verify/role_zammad.sql index 3955e8ac..f94019b2 100644 --- a/src/verify/role_zammad.sql +++ b/src/verify/role_zammad.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_zammad_username `cat /run/secrets/postgres_role_service_zammad_username` +\set role_service_zammad_username `cat /run/secrets/postgres-role-service-zammad-username` SET LOCAL role.service_zammad_username TO :'role_service_zammad_username'; diff --git a/src/verify/schema_public.sql b/src/verify/schema_public.sql index a88ee33b..1adf6704 100644 --- a/src/verify/schema_public.sql +++ b/src/verify/schema_public.sql @@ -1,8 +1,8 @@ BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` SET local role.reccoom_username TO :'role_service_reccoom_username'; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_account_block.sql b/src/verify/table_account_block.sql index ea2f26cd..3b96d0a6 100644 --- a/src/verify/table_account_block.sql +++ b/src/verify/table_account_block.sql @@ -10,9 +10,9 @@ ROLLBACK; BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` SET local role.reccoom_username TO :'role_service_reccoom_username'; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_account_private.sql b/src/verify/table_account_private.sql index 61d4c8ee..dc831bfe 100644 --- a/src/verify/table_account_private.sql +++ b/src/verify/table_account_private.sql @@ -15,7 +15,7 @@ SELECT id, FROM vibetype_private.account WHERE FALSE; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_account_public_policy.sql b/src/verify/table_account_public_policy.sql index d6e9c388..03817dd6 100644 --- a/src/verify/table_account_public_policy.sql +++ b/src/verify/table_account_public_policy.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_achievement.sql b/src/verify/table_achievement.sql index f5962e06..f0d1e472 100644 --- a/src/verify/table_achievement.sql +++ b/src/verify/table_achievement.sql @@ -6,7 +6,7 @@ SELECT id, level FROM vibetype.achievement WHERE FALSE; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_achievement_code.sql b/src/verify/table_achievement_code.sql index 1bc3ea83..d25a9438 100644 --- a/src/verify/table_achievement_code.sql +++ b/src/verify/table_achievement_code.sql @@ -5,7 +5,7 @@ SELECT id, achievement FROM vibetype_private.achievement_code WHERE FALSE; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_address_policy.sql b/src/verify/table_address_policy.sql index cdf13553..44bda858 100644 --- a/src/verify/table_address_policy.sql +++ b/src/verify/table_address_policy.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_contact_policy.sql b/src/verify/table_contact_policy.sql index 0f8b184d..45fad4da 100644 --- a/src/verify/table_contact_policy.sql +++ b/src/verify/table_contact_policy.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_device.sql b/src/verify/table_device.sql index e3a6a646..e7fc9141 100644 --- a/src/verify/table_device.sql +++ b/src/verify/table_device.sql @@ -13,7 +13,7 @@ ROLLBACK; BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_event_category.sql b/src/verify/table_event_category.sql index bd0ecdbd..b75eda7b 100644 --- a/src/verify/table_event_category.sql +++ b/src/verify/table_event_category.sql @@ -7,9 +7,9 @@ ROLLBACK; BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` SET local role.reccoom_username TO :'role_service_reccoom_username'; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_event_category_mapping.sql b/src/verify/table_event_category_mapping.sql index 2b750f19..a9644445 100644 --- a/src/verify/table_event_category_mapping.sql +++ b/src/verify/table_event_category_mapping.sql @@ -8,9 +8,9 @@ ROLLBACK; BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` SET local role.reccoom_username TO :'role_service_reccoom_username'; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_event_favorite.sql b/src/verify/table_event_favorite.sql index 2cafc18b..e8c17a49 100644 --- a/src/verify/table_event_favorite.sql +++ b/src/verify/table_event_favorite.sql @@ -10,7 +10,7 @@ ROLLBACK; BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_event_format.sql b/src/verify/table_event_format.sql index c745c188..9a6f8130 100644 --- a/src/verify/table_event_format.sql +++ b/src/verify/table_event_format.sql @@ -1,8 +1,8 @@ BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` SET local role.reccoom_username TO :'role_service_reccoom_username'; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_event_format_mapping.sql b/src/verify/table_event_format_mapping.sql index 5083b423..dea93b76 100644 --- a/src/verify/table_event_format_mapping.sql +++ b/src/verify/table_event_format_mapping.sql @@ -1,8 +1,8 @@ BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` SET local role.reccoom_username TO :'role_service_reccoom_username'; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_event_policy.sql b/src/verify/table_event_policy.sql index f897bc83..75c3d54b 100644 --- a/src/verify/table_event_policy.sql +++ b/src/verify/table_event_policy.sql @@ -1,8 +1,8 @@ BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` SET local role.reccoom_username TO :'role_service_reccoom_username'; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_event_recommendation.sql b/src/verify/table_event_recommendation.sql index 71f022ea..fa355cf4 100644 --- a/src/verify/table_event_recommendation.sql +++ b/src/verify/table_event_recommendation.sql @@ -10,7 +10,7 @@ ROLLBACK; BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ @@ -29,4 +29,4 @@ BEGIN ASSERT NOT (SELECT pg_catalog.has_table_privilege(current_setting('role.vibetype_username'), 'vibetype.event_recommendation', 'DELETE')); END $$; -ROLLBACK; \ No newline at end of file +ROLLBACK; diff --git a/src/verify/table_event_upload.sql b/src/verify/table_event_upload.sql index fb49c880..a9d676b1 100644 --- a/src/verify/table_event_upload.sql +++ b/src/verify/table_event_upload.sql @@ -6,7 +6,7 @@ SELECT id, upload_id FROM vibetype.event_upload WHERE FALSE; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_friendship.sql b/src/verify/table_friendship.sql index 66005c24..15b100c1 100644 --- a/src/verify/table_friendship.sql +++ b/src/verify/table_friendship.sql @@ -16,7 +16,7 @@ ROLLBACK; BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_guest_policy.sql b/src/verify/table_guest_policy.sql index 8887f25e..e7537079 100644 --- a/src/verify/table_guest_policy.sql +++ b/src/verify/table_guest_policy.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_jwt.sql b/src/verify/table_jwt.sql index 921bfffb..9a2a23a4 100644 --- a/src/verify/table_jwt.sql +++ b/src/verify/table_jwt.sql @@ -9,7 +9,7 @@ SELECT id, updated_by FROM vibetype_private.jwt WHERE FALSE; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_legal_term.sql b/src/verify/table_legal_term.sql index 16519e49..75c46ca8 100644 --- a/src/verify/table_legal_term.sql +++ b/src/verify/table_legal_term.sql @@ -7,7 +7,7 @@ SELECT id, created_at FROM vibetype.legal_term WHERE FALSE; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_legal_term_acceptance.sql b/src/verify/table_legal_term_acceptance.sql index 0ad20dcb..b5b5d220 100644 --- a/src/verify/table_legal_term_acceptance.sql +++ b/src/verify/table_legal_term_acceptance.sql @@ -6,7 +6,7 @@ SELECT id, created_at FROM vibetype.legal_term_acceptance WHERE FALSE; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_preference_event_category.sql b/src/verify/table_preference_event_category.sql index 585def7b..866e06d4 100644 --- a/src/verify/table_preference_event_category.sql +++ b/src/verify/table_preference_event_category.sql @@ -13,9 +13,9 @@ ROLLBACK; BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` SET local role.reccoom_username TO :'role_service_reccoom_username'; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_preference_event_format.sql b/src/verify/table_preference_event_format.sql index bc53df53..157c373d 100644 --- a/src/verify/table_preference_event_format.sql +++ b/src/verify/table_preference_event_format.sql @@ -13,9 +13,9 @@ ROLLBACK; BEGIN; -\set role_service_reccoom_username `cat /run/secrets/postgres_role_service_reccoom_username` +\set role_service_reccoom_username `cat /run/secrets/postgres-role-service-reccoom-username` SET local role.reccoom_username TO :'role_service_reccoom_username'; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_preference_event_location.sql b/src/verify/table_preference_event_location.sql index ff8b3d34..950f6f1e 100644 --- a/src/verify/table_preference_event_location.sql +++ b/src/verify/table_preference_event_location.sql @@ -7,7 +7,7 @@ SELECT id, created_by FROM vibetype.preference_event_location WHERE FALSE; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_preference_event_size.sql b/src/verify/table_preference_event_size.sql index 6e3c2c5b..f94eee07 100644 --- a/src/verify/table_preference_event_size.sql +++ b/src/verify/table_preference_event_size.sql @@ -10,7 +10,7 @@ ROLLBACK; BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_profile_picture.sql b/src/verify/table_profile_picture.sql index 908530bb..3ef90eb5 100644 --- a/src/verify/table_profile_picture.sql +++ b/src/verify/table_profile_picture.sql @@ -5,7 +5,7 @@ SELECT id, upload_id FROM vibetype.profile_picture WHERE FALSE; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_report.sql b/src/verify/table_report.sql index c9752765..1276cb2e 100644 --- a/src/verify/table_report.sql +++ b/src/verify/table_report.sql @@ -13,7 +13,7 @@ ROLLBACK; BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$ diff --git a/src/verify/table_upload_policy.sql b/src/verify/table_upload_policy.sql index 02645aab..66fbc971 100644 --- a/src/verify/table_upload_policy.sql +++ b/src/verify/table_upload_policy.sql @@ -1,6 +1,6 @@ BEGIN; -\set role_service_vibetype_username `cat /run/secrets/postgres_role_service_vibetype_username` +\set role_service_vibetype_username `cat /run/secrets/postgres-role-service-vibetype-username` SET local role.vibetype_username TO :'role_service_vibetype_username'; DO $$