👷 Separate PostgreSQL pipeline

Author: pavelsvagr

.github/actions/test-create-project/action.yml

@@ -0,0 +1,84 @@
+name: 'Create project'
+description: 'Runs create-node-project and performs tests'
+inputs:
+  options:
+    description: 'create-node-app options'
+    required: true
+  dbConnection:
+    description: 'DB_CONNECTION_STRING env var'
+    default: 'postgresql://postgres:postgres@localhost:5432/postgres'
+runs:
+  using: 'composite'
+  steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Cache dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/.npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+
+    - name: Install dependencies
+      run: npm ci --ignore-scripts
+      shell: bash
+
+    - name: Build the project
+      run: npm run build
+      shell: bash
+
+    - name: Run npm link
+      run: npm link
+      shell: bash
+
+    - name: Create project
+      run: create-node-app ${{ inputs.options }}
+      shell: bash
+
+    - name: Build created project
+      working-directory: ./node-app
+      run: npm run build
+      shell: bash
+
+    - name: Run lint
+      working-directory: ./node-app
+      run: npm run ci-lint
+      shell: bash
+
+    - name: Wait for PostgreSQL
+      if: ${{ contains(inputs.options, '--database postgres-knex') }}
+      run: |
+        until pg_isready -h localhost -p 5432 -U postgres; do
+          echo "Waiting for PostgreSQL to be ready..."
+          sleep 2
+        done
+        echo "PostgreSQL is ready!"
+      shell: bash
+
+    - name: Run tests
+      working-directory: ./node-app
+      run: npm run ci-test
+      shell: bash
+      env:
+        DB_CONNECTION_STRING: ${{inputs.dbConnection}}
+
+    - name: Run start
+      if: ${{ !contains(inputs.options, '--api none') }}
+      working-directory: ./node-app
+      run: |
+        npm run start &
+        start_pid=$!
+        sleep 10
+        kill $start_pid
+      shell: bash
+      env:
+        DB_CONNECTION_STRING: ${{inputs.dbConnection}}
+
+    - name: Run start
+      if: ${{ contains(inputs.options, '--api none') }}
+      working-directory: ./node-app
+      shell: bash
+      run: npm run start
+      env:
+        DB_CONNECTION_STRING: ${{inputs.dbConnection}}

.github/workflows/create-projects.yml

@@ -17,54 +17,48 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        create-app-command: 
-         - "create-node-app -f --api rest --database postgres-knex --pipeline cloudrun-gitlab"
-         - "create-node-app -f --api graphql --database postgres-knex --pipeline cloudrun-gitlab"
-         - "create-node-app -f --api rest --database none --pipeline cloudrun-gitlab"
-         - "create-node-app -f --api graphql --database none --pipeline cloudrun-gitlab"
-         - "create-node-app -f --api rest --database none --pipeline none"
-         - "create-node-app -f --api none --database none --pipeline cloudrun-gitlab"
+        create-app-options: 
+         - "--api rest --database none --pipeline cloudrun-gitlab"
+         - "--api graphql --database none --pipeline cloudrun-gitlab"
+         - "--api rest --database none --pipeline none"
+         - "--api none --database none --pipeline cloudrun-gitlab"
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Cache dependencies
-        uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - id: create-node-app
+        uses: ./.github/actions/test-create-project
         with:
-          path: ~/.npm
-          key: npm-${{ hashFiles('package-lock.json') }}
-          restore-keys: npm-
-
-      - name: Install dependencies
-        run: npm ci --ignore-scripts
-
-      - name: Build the project
-        run: npm run build
-
-      - name: Run npm link
-        run: npm link
-
-      - name: Create project
-        run: ${{ matrix.create-app-command }}
-      
-      - name: Build created project
-        working-directory: ./node-app
-        run: npm run build
+          options: ${{ matrix.create-app-options }}
 
-      - name: Run lint
-        working-directory: ./node-app
-        run: npm run ci-lint
+  create-projects-with-postgres:
+    needs: "build"
+    services:
+      postgres:
+        image: postgres:17
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+          POSTGRES_USER: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+    strategy:
+      fail-fast: false
+      matrix:
+        create-app-options: 
+         - "--api none --database postgres-knex --pipeline none"
+         - "--api rest --database postgres-knex --pipeline cloudrun-gitlab"
+         - "--api graphql --database postgres-knex --pipeline cloudrun-gitlab"
+    runs-on: ubuntu-latest
 
-      - name: Run tests
-        working-directory: ./node-app
-        run: npm run ci-test
-      
-      - name: Run start
-        working-directory: ./node-app
-        run: |
-          npm run start &
-          start_pid=$!
-          sleep 10
-          kill $start_pid
+    steps:
+      - uses: actions/checkout@v4
+      - id: create-node-app
+        uses: ./.github/actions/test-create-project
+        with:
+          options: ${{ matrix.create-app-options }}

starter/_base/src/index.ts

@@ -1,4 +1,3 @@
-import { config } from './config.js'
 import { createContainer } from './container.js'
 import { RequestContext } from './context.js'
 

starter/infra/postgresql-knex/docker-compose/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   postgres:
-    image: postgres:15
+    image: postgres:17
     environment:
       - POSTGRES_DB={{PROJECT_NAME}}_docker
       - POSTGRES_USER={{PROJECT_NAME}}_docker

starter/infra/postgresql-knex/src/adapters/knex.database.test.ts

@@ -14,7 +14,8 @@ describe('knexConnection', () => {
       })
     )
     assert(db)
-    await assert.doesNotReject(db.raw('SELECT version()'))
+    const version = await db.raw('SELECT version()')
+    assert(version.rows.length === 1)
     await assert.doesNotReject(knexConnection.disconnect(db))
   })
 })