fix: resolve pr review comments

Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>

Author: skwowet

.github/scripts/prepare-test-template-db.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+# shellcheck source=scripts/utils
+source "${REPO_ROOT}/scripts/utils"
+
+: "${DB_HOST:?DB_HOST is required}"
+: "${DB_PORT:?DB_PORT is required}"
+: "${DB_USER:?DB_USER is required}"
+: "${DB_PASSWORD:?DB_PASSWORD is required}"
+
+say "Applying Sequin bootstrap SQL..."
+docker run --rm --network host \
+  -v "${REPO_ROOT}/scripts/scaffold/sequin/postgres-docker-entrypoint-initdb.d/create-sequin-database.sql:/bootstrap.sql:ro" \
+  -e "PGPASSWORD=${DB_PASSWORD}" \
+  postgres:14-alpine \
+  psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d postgres -v ON_ERROR_STOP=1 -f /bootstrap.sql
+
+say "Recreating test_template..."
+docker run --rm --network host \
+  -e "PGPASSWORD=${DB_PASSWORD}" \
+  postgres:14-alpine \
+  psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d postgres -v ON_ERROR_STOP=1 \
+  -c "DROP DATABASE IF EXISTS test_template;" \
+  -c "CREATE DATABASE test_template;"
+
+say "Building flyway image..."
+docker build -t crowd_flyway -f "${REPO_ROOT}/backend/src/database/Dockerfile.flyway" "${REPO_ROOT}/backend/src/database"
+
+say "Migrating test_template..."
+docker run --rm --network host \
+  -e "PGHOST=${DB_HOST}" \
+  -e "PGPORT=${DB_PORT}" \
+  -e "PGUSER=${DB_USER}" \
+  -e "PGPASSWORD=${DB_PASSWORD}" \
+  -e PGDATABASE=test_template \
+  crowd_flyway
+
+say "Test template database ready."

.github/workflows/server-tests.yml

@@ -29,6 +29,7 @@ jobs:
     services:
       postgres:
         image: postgres:14-alpine
+        command: postgres -c wal_level=logical
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: example
@@ -40,7 +41,6 @@ jobs:
           --health-interval 2s
           --health-timeout 5s
           --health-retries 15
-          postgres -c wal_level=logical
 
     env:
       NODE_ENV: test
@@ -53,7 +53,7 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v4
 
-      - name: Setup Node and cache pnpm
+      - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: 20
@@ -65,7 +65,7 @@ jobs:
           pnpm i --frozen-lockfile
 
       - name: Prepare test database
-        run: SEQUIN_BOOTSTRAP=1 ./scripts/prepare-test-template-db.sh
+        run: ./.github/scripts/prepare-test-template-db.sh
 
       - name: Run server tests
         run: pnpm test:server

scripts/cli

@@ -787,11 +787,21 @@ function down_test_scaffold() {
 }
 
 function migrate_test() {
-    set -a
-    # shellcheck source=/dev/null
-    source "$CLI_HOME/../.env.test"
-    set +a
-    "$CLI_HOME/prepare-test-template-db.sh"
+    wait_for_postgres test-db crowd-test-db
+    say "Recreating test_template..."
+    docker exec crowd-test-db psql -U postgres -d postgres -v ON_ERROR_STOP=1 \
+        -c "DROP DATABASE IF EXISTS test_template;" \
+        -c "CREATE DATABASE test_template;"
+    say "Building crowd flyway migration image..."
+    docker build $DOCKER_PLATFORM_FLAGS -t crowd_flyway -f $CLI_HOME/../backend/src/database/Dockerfile.flyway $CLI_HOME/../backend/src/database --load
+    say "Migrating test_template..."
+    docker run --rm --network "${PROJECT_NAME}-bridge-test" \
+        -e PGHOST=crowd-test-db \
+        -e PGPORT=5432 \
+        -e PGUSER=postgres \
+        -e PGPASSWORD=example \
+        -e PGDATABASE=test_template \
+        crowd_flyway
 }
 
 function source_edition() {

scripts/prepare-test-template-db.sh

@@ -1,7 +1,6 @@
 import pgPromise from 'pg-promise'
 
-import { IS_TEST_ENV } from '@crowd/common'
-import { DEFAULT_TENANT_ID } from '@crowd/common/src/env'
+import { DEFAULT_TENANT_ID, IS_TEST_ENV } from '@crowd/common'
 import { type DbConnection, type DbInstance, type IDatabaseConfig } from '@crowd/database'
 import type { QueryExecutor } from '@crowd/database'
 
@@ -60,7 +59,7 @@ export async function resetTestDatabase(qx: QueryExecutor): Promise<void> {
   const { name } = await qx.selectOne('SELECT current_database() AS name')
 
   if (!/^test_[a-z0-9_]+$/.test(name)) {
-    throw new Error(`Not a worker test database: ${name}`)
+    throw new Error(`Expected worker test database (got ${name})`)
   }
 
   await qx.selectNone(`
@@ -137,21 +136,19 @@ async function dropDatabase(catalog: DbConnection, name: string): Promise<void>
  */
 function getTestPostgres(): TestPostgres {
   if (!IS_TEST_ENV) {
-    throw new Error(`NODE_ENV=test required (got ${process.env.NODE_ENV ?? 'unset'})`)
+    throw new Error(`Expected NODE_ENV=test (got ${process.env.NODE_ENV ?? 'unset'})`)
   }
 
   const { DB_HOST: host, DB_PORT, DB_USER: user, DB_PASSWORD: password } = process.env
 
   if (!host || !DB_PORT || !user || !password) {
-    throw new Error(
-      'DB_HOST, DB_PORT, DB_USER, and DB_PASSWORD are required — run ./scripts/cli scaffold up-test and use .env.test',
-    )
+    throw new Error('Missing required database environment variables')
   }
 
   const port = Number(DB_PORT)
 
   if (!['localhost', '127.0.0.1', '::1'].includes(host)) {
-    throw new Error(`Security safeguard: DB_HOST must be localhost (got: ${host})`)
+    throw new Error(`Expected local DB_HOST (got ${host})`)
   }
 
   return { host, port, user, password }

services/libs/test-kit/src/postgres.ts

@@ -3,11 +3,25 @@ import { defineConfig } from 'vitest/config'
 
 const root = __dirname
 
-const testEnv = loadEnv('test', root, '')
+/** Load .env.${mode} and let existing process env vars override file values. */
+function resolveTestEnv(mode: string): Record<string, string> {
+  const env = loadEnv(mode, root, '')
+  const resolved = { ...env }
 
-export default defineConfig({
+  for (const key in env) {
+    const value = process.env[key]
+
+    if (value !== undefined) {
+      resolved[key] = value
+    }
+  }
+
+  return resolved
+}
+
+export default defineConfig(({ mode }) => ({
   test: {
-    env: testEnv,
+    env: resolveTestEnv(mode),
     server: {
       deps: { inline: [/@crowd\//] },
     },
@@ -17,12 +31,19 @@ export default defineConfig({
         test: {
           name: 'server',
           include: ['backend/**/*.test.ts', 'services/**/*.test.ts'],
-          exclude: ['**/node_modules/**', '**/dist/**', 'services/cronjobs/**'],
+          exclude: [
+            '**/node_modules/**',
+            '**/dist/**',
+            'services/cronjobs/**',
+            // TODO: packages_worker has its own vitest config and packages-db; it was landed in another PR
+            // alongside the test foundation. excluding this for now, will refactor it later!
+            'services/apps/packages_worker/**',
+          ],
           pool: 'forks',
           hookTimeout: 300_000,
           testTimeout: 30_000,
         },
       },
     ],
   },
-})
+}))