21464 - Merge EFT into main branch

.github/workflows/bcol-api-cd.yml

@@ -31,7 +31,7 @@ jobs:
       name: "dev"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Login Openshift
         shell: bash
@@ -74,7 +74,7 @@ jobs:
       name: "${{ github.event.inputs.environment }}"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set env by input
         run: |
           echo "TAG_NAME=${{ github.event.inputs.environment }}" >> $GITHUB_ENV

.github/workflows/bcol-api-ci.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - feature-queue-python-upgrade
     paths:
       - "bcol-api/**"
 
@@ -19,7 +20,7 @@ jobs:
     if: github.repository == 'bcgov/sbc-pay'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: "true"
 
   linting:
@@ -28,10 +29,10 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.12]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
@@ -79,6 +80,10 @@ jobs:
 
     runs-on: ubuntu-20.04
 
+    strategy:
+      matrix:
+        python-version: [3.12]
+
     services:
       postgres:
         image: postgres:12
@@ -92,7 +97,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
@@ -118,8 +123,12 @@ jobs:
     needs: setup-job
     runs-on: ubuntu-20.04
 
+    strategy:
+      matrix:
+        python-version: [3.12]
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: build to check strictness
         id: build
         run: |

.github/workflows/ftp-poller-cd.yml

@@ -31,7 +31,7 @@ jobs:
       name: "dev"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Login Openshift
         shell: bash
@@ -74,7 +74,7 @@ jobs:
       name: "${{ github.event.inputs.environment }}"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set env by input
         run: |
           echo "TAG_NAME=${{ github.event.inputs.environment }}" >> $GITHUB_ENV

.github/workflows/ftp-poller-ci.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - feature-queue-python-upgrade
     paths:
       - "jobs/ftp-poller/**"
 
@@ -19,7 +20,7 @@ jobs:
     if: github.repository == 'bcgov/sbc-pay'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: "true"
 
   linting:
@@ -28,10 +29,10 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.12]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
@@ -51,28 +52,32 @@ jobs:
   testing:
     needs: setup-job
     env:
-      DATABASE_TEST_URL: "postgresql://postgres:postgres@localhost:5432/postgres"
+      DATABASE_TEST_URL: "postgresql://postgres:postgres@localhost:5432/pay-test"
       USE_DOCKER_MOCK: "YES"
       JWT_OIDC_ISSUER: "http://localhost:8081/auth/realms/demo"
       SBC_AUTH_ADMIN_CLIENT_ID: "sbc-auth-admin"
       SBC_AUTH_ADMIN_CLIENT_SECRET: "2222222222"
 
     runs-on: ubuntu-20.04
 
+    strategy:
+      matrix:
+        python-version: [3.12]
+
     services:
       postgres:
         image: postgres:12
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: postgres
+          POSTGRES_DB: pay-test
         ports:
           - 5432:5432
         # needed because the postgres container does not provide a healthcheck
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
@@ -96,8 +101,12 @@ jobs:
     needs: setup-job
     runs-on: ubuntu-20.04
 
+    strategy:
+      matrix:
+        python-version: [3.12]
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: build to check strictness
         id: build
         run: |

.github/workflows/notebook-report-cd.yml

@@ -31,7 +31,7 @@ jobs:
       name: "dev"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Login Openshift
         shell: bash
@@ -69,7 +69,7 @@ jobs:
       name: "${{ github.event.inputs.environment }}"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set env by input
         run: |
           echo "TAG_NAME=${{ github.event.inputs.environment }}" >> $GITHUB_ENV

.github/workflows/notebook-report-ci.yml

@@ -19,7 +19,7 @@ jobs:
     if: github.repository == 'bcgov/sbc-pay'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: "true"
 
   linting:
@@ -28,10 +28,10 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.12]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
@@ -55,6 +55,10 @@ jobs:
 
     runs-on: ubuntu-20.04
 
+    strategy:
+      matrix:
+        python-version: [3.12]
+
     services:
       postgres:
         image: postgres:12
@@ -68,7 +72,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
@@ -92,8 +96,12 @@ jobs:
     needs: setup-job
     runs-on: ubuntu-20.04
 
+    strategy:
+      matrix:
+        python-version: [3.12]
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: build to check strictness
         id: build
         run: |

.github/workflows/pay-admin-cd-gcp.yml

@@ -0,0 +1,30 @@
+name: Pay Admin CD GCP
+
+on:
+  push:
+    branches:
+      - feature-gcp
+    paths:
+      - "pay-admin/**"
+  workflow_dispatch:
+    inputs:
+      target:
+        description: "Deploy To"
+        required: true
+        type: choice
+        options:
+        - dev
+        - test
+        - sandbox
+        - prod
+
+jobs:
+  pay-admin-cd:
+    uses: bcgov/bcregistry-sre/.github/workflows/cloud-run-service-cd.yaml@main
+    with:
+      target: ${{ inputs.target }}
+      app_name: "pay-admin"
+      working_directory: "./pay-admin"
+    secrets:
+      WORKLOAD_IDENTIFY_POOLS_PROVIDER: ${{ secrets.WORKLOAD_IDENTIFY_POOLS_PROVIDER }}
+      GCP_SERVICE_ACCOUNT: ${{ secrets.GCP_SERVICE_ACCOUNT }}

.github/workflows/pay-admin-ci.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - feature-queue-python-upgrade
     paths:
       - "pay-admin/**"
       - "pay-api/src/pay_api/models/**"
@@ -20,7 +21,7 @@ jobs:
     if: github.repository == 'bcgov/sbc-pay'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: "true"
 
   linting:
@@ -29,10 +30,10 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.12]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
@@ -53,25 +54,31 @@ jobs:
     needs: setup-job
     env:
       FLASK_ENV: "testing"
-      DATABASE_TEST_URL: "postgresql://postgres:postgres@localhost:5432/postgres"
+      # Needs different database than POSTGRES otherwise dropping database doesn't work
+      DATABASE_TEST_URL: "postgresql://postgres:postgres@localhost:5432/pay-test"
 
 
     runs-on: ubuntu-20.04
 
+    strategy:
+      matrix:
+        python-version: [3.12]
+
     services:
       postgres:
         image: postgres:12
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: postgres
+          # Needs different database than POSTGRES otherwise dropping database doesn't work
+          POSTGRES_DB: pay-test
         ports:
           - 5432:5432
         # needed because the postgres container does not provide a healthcheck
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
@@ -95,8 +102,12 @@ jobs:
     needs: setup-job
     runs-on: ubuntu-20.04
 
+    strategy:
+      matrix:
+        python-version: [3.12]
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: build to check strictness
         id: build
         run: |

.github/workflows/pay-api-cd-gcp.yml

@@ -1,9 +1,9 @@
-name: Pay API CD
+name: Pay API CD GCP
 
 on:
   push:
     branches:
-      - feature-queue-python-upgrade
+      - feature-gcp
     paths:
       - "pay-api/**"
   workflow_dispatch:
@@ -27,4 +27,4 @@ jobs:
       working_directory: "./pay-api"
     secrets:
       WORKLOAD_IDENTIFY_POOLS_PROVIDER: ${{ secrets.WORKLOAD_IDENTIFY_POOLS_PROVIDER }}
-      GCP_SERVICE_ACCOUNT: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+      GCP_SERVICE_ACCOUNT: ${{ secrets.GCP_SERVICE_ACCOUNT }}