fix(deploy): resolve FDW bootstrap race + extract bootstrap DO block to .sql file (#499)

.forgejo/workflows/deploy-tradein.yml

@@ -169,6 +169,17 @@ jobs:
                 || echo "  (skipped — already applied or error: $fname)"
             done
 
+            # Retry backend lifespan hook AFTER migrations applied.
+            # tradein-backend startup runs ensure_fdw_user_mapping which needs
+            # FOREIGN SERVER gendesign_remote (created by 060_postgres_fdw_extension.sql).
+            # Without restart, the first compose-up's startup hook failed with
+            # "server gendesign_remote does not exist" because migrations hadn't run yet.
+            # See PR #493 deploy/1156 for the incident details.
+            echo "→ Restarting tradein-backend so lifespan hook retries USER MAPPING setup"
+            docker restart tradein-backend
+            # Give backend time to come up before Caddy reload + health check below
+            sleep 5
+
             # Caddy reload — основной Caddyfile содержит inline tradein routes
             # (см. Caddyfile в корне репы). Reload, чтобы Caddy перечитал DNS
             # tradein-backend / tradein-frontend (они в gendesign_shared network).

.forgejo/workflows/deploy.yml

@@ -252,22 +252,16 @@ jobs:
             echo "All migrations applied."
 
             # Set tradein_fdw_reader password from env (post-migration bootstrap).
-            # SQL migration creates role passwordless; password lives only in
+            # SQL migration 100_tradein_fdw_role.sql creates role passwordless;
-            # /opt/gendesign/backend/.env.runtime (sourced below via set -a / source).
+            # password lives only in /opt/gendesign/backend/.env.runtime.
-            # Idempotent: ALTER is no-op if password unchanged on subsequent deploys.
+            # See ops/db-bootstrap/set_tradein_fdw_password.sql for the idempotent DO block.
             set -a; source backend/.env.runtime; set +a
             if [ -n "${GENDESIGN_FDW_PASSWORD:-}" ]; then
               echo "→ Applying tradein_fdw_reader password from env"
               docker compose -p gendesign -f docker-compose.prod.yml exec -T postgres \
                 psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" -v ON_ERROR_STOP=on \
                 -v "pw=$GENDESIGN_FDW_PASSWORD" \
-                -c "DO \$\$ BEGIN \
+                < ops/db-bootstrap/set_tradein_fdw_password.sql
-                  IF EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'tradein_fdw_reader') THEN \
-                    EXECUTE format('ALTER ROLE tradein_fdw_reader WITH PASSWORD %L', :'pw'); \
-                  ELSE \
-                    RAISE NOTICE 'tradein_fdw_reader role missing; migration not yet applied'; \
-                  END IF; \
-                END \$\$;"
             else
               echo "⚠️  GENDESIGN_FDW_PASSWORD not set in backend/.env.runtime — skipping ALTER ROLE for tradein_fdw_reader"
             fi
@@ -279,6 +273,21 @@ jobs:
 
             docker compose -p gendesign -f docker-compose.prod.yml up -d
 
+            # Defense: ensure postgres is in gendesign_shared network for tradein FDW.
+            # `compose up -d` should detect networks: shared addition and recreate
+            # postgres, but in PR #493 deploy/1156 incident the bootstrap step failed
+            # earlier so this code path never ran. Plus compose sometimes skips
+            # recreate if it thinks config is "compatible enough". Verify explicitly.
+            if ! docker inspect gendesign-postgres-1 \
+                --format '{{range $k,$v := .NetworkSettings.Networks}}{{$k}} {{end}}' \
+                2>/dev/null | grep -q gendesign_shared; then
+              echo "⚠️  postgres not in gendesign_shared after compose up — force-recreating"
+              docker compose -p gendesign -f docker-compose.prod.yml up -d \
+                --force-recreate --no-deps postgres
+              # Brief settle window: backend will reconnect after postgres restart.
+              sleep 5
+            fi
+
             # backend/.env.runtime изменения (SENTRY_RELEASE, GLITCHTIP_DSN)
             # требуют --force-recreate — обычный `up -d` не перечитывает env_file
             # если только image не сменился. На deploy где меняется только runtime

ops/db-bootstrap/set_tradein_fdw_password.sql

@@ -0,0 +1,27 @@
+-- Set tradein_fdw_reader password from env.
+-- Applied by .forgejo/workflows/deploy.yml after main DB migrations:
+--   psql -v pw="$GENDESIGN_FDW_PASSWORD" -f ops/db-bootstrap/set_tradein_fdw_password.sql
+--
+-- Idempotent: ALTER if role exists, NOTICE and continue if missing
+-- (migration 100_tradein_fdw_role.sql might not have applied yet on first deploy).
+-- Password is NEVER stored in this file or in git — only the variable name.
+--
+-- Format %L escapes the password as a SQL string literal — safe even with quotes.
+-- Combined with the regex whitelist on the backend side (fdw.py _PASSWORD_RE)
+-- this gives defense-in-depth.
+--
+-- Extracted from deploy.yml inline DO block (PR #493 deploy/1156 incident).
+-- The original block used multi-line backslash continuations inside a double-quoted
+-- bash string with $$-dollar-quoting + psql variable substitution — fragile escaping
+-- that likely caused the bootstrap step to fail before `compose up -d` ran.
+-- Using `-f <file>` with psql-native variable substitution via `-v pw=` is safe.
+
+DO $$
+BEGIN
+  IF EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'tradein_fdw_reader') THEN
+    EXECUTE format('ALTER ROLE tradein_fdw_reader WITH PASSWORD %L', :'pw');
+    RAISE NOTICE 'tradein_fdw_reader password set';
+  ELSE
+    RAISE NOTICE 'tradein_fdw_reader role missing — migration 100_tradein_fdw_role.sql not applied yet';
+  END IF;
+END $$;