Support existing database secret names for Basic signup migration

This commit is contained in:
pavlov346346-source 2026-09-22 18:45:27 +08:00
parent 7ed7fdad79
commit 7c05b63846

View File

@ -21,40 +21,62 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 8 timeout-minutes: 8
env: env:
PGHOST: db.usfjwhztqoopzzfmfbis.supabase.co SUPABASE_DB_URL: ${{ secrets.SUPABASE_DB_URL }}
PGPORT: "5432" DATABASE_URL: ${{ secrets.DATABASE_URL }}
PGDATABASE: postgres CATERIUM_DB_URL: ${{ secrets.CATERIUM_DB_URL }}
PGUSER: postgres SUPABASE_DB_PASSWORD: ${{ secrets.SUPABASE_DB_PASSWORD }}
PGPASSWORD: ${{ secrets.SUPABASE_DB_PASSWORD }} SUPABASE_DATABASE_PASSWORD: ${{ secrets.SUPABASE_DATABASE_PASSWORD }}
PGSSLMODE: require CATERIUM_DB_PASSWORD: ${{ secrets.CATERIUM_DB_PASSWORD }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Require configured database password - name: Select configured database connection
shell: bash shell: bash
run: | run: |
set -euo pipefail set -euo pipefail
if [ -z "${PGPASSWORD:-}" ]; then if [ -n "${SUPABASE_DB_URL:-}" ]; then
echo "::error::Repository secret SUPABASE_DB_PASSWORD is not configured." echo "CATERIUM_PSQL_MODE=url" >> "$GITHUB_ENV"
echo "CATERIUM_DATABASE_URL=$SUPABASE_DB_URL" >> "$GITHUB_ENV"
elif [ -n "${CATERIUM_DB_URL:-}" ]; then
echo "CATERIUM_PSQL_MODE=url" >> "$GITHUB_ENV"
echo "CATERIUM_DATABASE_URL=$CATERIUM_DB_URL" >> "$GITHUB_ENV"
elif [ -n "${DATABASE_URL:-}" ]; then
echo "CATERIUM_PSQL_MODE=url" >> "$GITHUB_ENV"
echo "CATERIUM_DATABASE_URL=$DATABASE_URL" >> "$GITHUB_ENV"
else
password="${SUPABASE_DB_PASSWORD:-${SUPABASE_DATABASE_PASSWORD:-${CATERIUM_DB_PASSWORD:-}}}"
if [ -z "$password" ]; then
echo "::error::No supported Caterium/Supabase database secret is configured."
exit 2 exit 2
fi fi
echo "CATERIUM_PSQL_MODE=password" >> "$GITHUB_ENV"
echo "PGHOST=db.usfjwhztqoopzzfmfbis.supabase.co" >> "$GITHUB_ENV"
echo "PGPORT=5432" >> "$GITHUB_ENV"
echo "PGDATABASE=postgres" >> "$GITHUB_ENV"
echo "PGUSER=postgres" >> "$GITHUB_ENV"
echo "PGPASSWORD=$password" >> "$GITHUB_ENV"
echo "PGSSLMODE=require" >> "$GITHUB_ENV"
fi
- name: Apply only v17.9.1 public Basic signup migration - name: Apply only v17.9.1 public Basic signup migration
shell: bash shell: bash
run: | run: |
set -euo pipefail set -euo pipefail
if [ "${CATERIUM_PSQL_MODE}" = "url" ]; then
psql "${CATERIUM_DATABASE_URL}" -v ON_ERROR_STOP=1 -f ops/sql/SUPABASE-V17.9.1-PUBLIC-BASIC-SIGNUP.sql
else
psql -v ON_ERROR_STOP=1 -f ops/sql/SUPABASE-V17.9.1-PUBLIC-BASIC-SIGNUP.sql psql -v ON_ERROR_STOP=1 -f ops/sql/SUPABASE-V17.9.1-PUBLIC-BASIC-SIGNUP.sql
fi
- name: Verify server policy and workspace function - name: Verify server policy and workspace function
shell: bash shell: bash
run: | run: |
set -euo pipefail set -euo pipefail
psql -v ON_ERROR_STOP=1 -At <<'SQL' query="select public.caterium_public_signup_policy(); select case when pg_get_functiondef('public.sun_create_workspace(text)'::regprocedure) like '%public_signup_basic%' and pg_get_functiondef('public.sun_create_workspace(text)'::regprocedure) like '%v_promo.plan_id%' then 'PASS' else 'FAIL' end;"
select public.caterium_public_signup_policy(); if [ "${CATERIUM_PSQL_MODE}" = "url" ]; then
select case result="$(psql "${CATERIUM_DATABASE_URL}" -v ON_ERROR_STOP=1 -Atc "$query")"
when pg_get_functiondef('public.sun_create_workspace(text)'::regprocedure) like '%public_signup_basic%' else
and pg_get_functiondef('public.sun_create_workspace(text)'::regprocedure) like '%v_promo.plan_id%' result="$(psql -v ON_ERROR_STOP=1 -Atc "$query")"
then 'PASS' fi
else 'FAIL' printf '%s\n' "$result"
end; grep -q "PASS" <<<"$result"
SQL