feat(stack)!: update secret format

Author: dargmuesli

.github/workflows/benchmark.yml

@@ -45,8 +45,8 @@ 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

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

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 "$*"

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 (

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 (

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

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;

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;

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';

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';