Use Node 22, bug fixes

.github/workflows/aps-cypress-e2e.yaml

@@ -4,6 +4,8 @@ on:
   workflow_dispatch: {}
   push:
     branches: ['test', 'cypress/*']
+  pull_request:
+    branches: ['dev']
 
 env:
   DASHBOARD_PROJECT_ID: ${{ secrets.CY_DASHBOARD_PRJ_ID }}
@@ -21,7 +23,7 @@ jobs:
     steps:
       - name: Build GWA API Image
         run: |
-          git clone https://github.com/bcgov/gwa-api.git
+          git clone https://github.com/bcgov/gwa-api.git --branch v1.0.40
           cd gwa-api/microservices/gatewayApi
           docker build -t gwa-api:e2e .
 
@@ -47,60 +49,50 @@ jobs:
 
       - name: Execute Tests & Clean Up
         run: |
+          # Start following logs in the background with continuous output
+          docker logs -f cypress-e2e 2>&1 &
+          LOG_PID=$!
+
           while true; do
             if [ "$(docker ps -aq -f status=exited -f name=cypress-e2e)" ]; then
+              echo "Cypress tests completed."
               # cleanup
               docker compose down
               break
             else
-              echo  "Waiting for Cypress to Complete E2E Tests....."
-              sleep 1m
+              sleep 30s
             fi
           done
 
       - name: Upload E2E Test Results HTML Report
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: test-results-html
           path: ${{ github.workspace }}/e2e/results/report
 
       - name: Upload E2E Test Results JSON Report
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: test-results-json
           path: ${{ github.workspace }}/e2e/results/bcgov-aps-e2e-report.json
 
       - name: Upload E2E Code Coverage Report
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: code-coverage
           path: ${{ github.workspace }}/e2e/coverage
 
-      - name: Instrument the code for coverage analysis
-        run: |
-          # Rewrite the paths as the coverage starts with '../app'!
-          sed -e 's/..\/app/./g' ./e2e/coverage/lcov.info > lcov.info
-
-          #cd src
-          #npm install --legacy-peer-deps
-          #npx nyc instrument --compact=false . --in-place
-
-      - name: SonarCloud Scan
-        uses: sonarsource/sonarcloud-github-action@master
+      - name: Upload Astra scan results
+        uses: actions/upload-artifact@v4
         with:
-          args: >
-            -Dsonar.organization=bcgov-oss
-            -Dsonar.projectKey=aps-portal-e2e
-            -Dsonar.host.url=https://sonarcloud.io
-            -Dsonar.projectBaseDir=src
-            -Dsonar.sources=.
-            -Dsonar.exclusions=nextapp/**,mocks/**,test/**,tools/**,*.json,*.js
-            -Dsonar.javascript.lcov.reportPaths=/github/workspace/lcov.info
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
+          name: astra-scan-results
+          path: ${{ github.workspace }}/e2e/cypress/fixtures/state/scanResult.json
+
       - name: Check for failed tests and create Issue
+        if: always()
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -122,6 +114,30 @@ jobs:
             exit 1
           fi
 
+      - name: Instrument the code for coverage analysis
+        run: |
+          # Rewrite the paths as the coverage starts with '../app'!
+          sed -e 's/..\/app/./g' ./e2e/coverage/lcov.info > lcov.info
+
+          #cd src
+          #npm install --legacy-peer-deps
+          #npx nyc instrument --compact=false . --in-place
+
+      - name: SonarCloud Scan
+        uses: sonarsource/sonarqube-scan-action@master
+        with:
+          args: >
+            -Dsonar.organization=bcgov-oss
+            -Dsonar.projectKey=aps-portal-e2e
+            -Dsonar.host.url=https://sonarcloud.io
+            -Dsonar.projectBaseDir=src
+            -Dsonar.sources=.
+            -Dsonar.exclusions=nextapp/**,mocks/**,test/**,tools/**,*.json,*.js
+            -Dsonar.javascript.lcov.reportPaths=/github/workspace/lcov.info
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
       - name: Set up Python 3.9
         if: failure()
         uses: actions/setup-python@v2

.github/workflows/ci-anchore-img-scan.yaml

@@ -16,9 +16,9 @@ jobs:
         uses: anchore/scan-action@main
         with:
           image: 'bcgov/api-services-portal:anchore-scan'
-          acs-report-enable: true
           fail-build: false
+          output-file: 'anchore-results.sarif'
       - name: Upload Anchore Scan Results
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v3
         with:
-          sarif_file: results.sarif
+          sarif_file: anchore-results.sarif

.github/workflows/ci-feat-sonar.yaml

@@ -42,7 +42,7 @@ jobs:
           docker compose down
 
       - name: SonarCloud Scan
-        uses: sonarsource/sonarcloud-github-action@master
+        uses: sonarsource/sonarqube-scan-action@master
         with:
           args: >
             -Dsonar.organization=bcgov-oss

.github/workflows/ci-trivy-img-scan.yaml

@@ -24,6 +24,6 @@ jobs:
           template: '@/contrib/sarif.tpl'
           output: 'trivy-results.sarif'
       - name: Upload Trivy Scan Results
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: 'trivy-results.sarif'

.github/workflows/jira.yaml

@@ -4,7 +4,7 @@ on: [issues, issue_comment]
 jobs:
   sync-issues:
     name: Sync issues to Jira
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: ikethecoder/sync-issues-github-jira@dev
         with:

.github/workflows/pr-reminder.yaml

@@ -0,0 +1,14 @@
+name: 'Send review reminders'
+on:
+  schedule:
+    - cron: '30 13 * * 1,2,3,4,5' # Scheduled to run at 5:30 AM PST, weekdays
+
+jobs:
+  remind:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run PR reviewer reminder
+        uses: bcgov/aps-devops/pr-reminder@dev
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          dry_run: "false"

.github/workflows/scripts/feeder-init/legal.yaml

@@ -2,6 +2,6 @@ entity: Legal
 record:
   id: "terms-of-use-for-api-gateway-1"
   title: "Terms of Use for API Gateway"
-  link: "https://www2.gov.bc.ca/gov/content/data/open-data/api-terms-of-use-for-ogl-information"
+  link: "https://www2.gov.bc.ca/gov/content/data/policy-standards/open-data/api-terms-of-use-for-ogl-information"
   document: terms-of-use
   version: 1

Dockerfile

@@ -1,5 +1,5 @@
 #FROM node:lts-alpine3.17
-FROM node:16.14.2-alpine3.15
+FROM node:22.12.0-alpine3.21
 
 ARG APP_VERSION
 ENV NEXT_PUBLIC_APP_VERSION=${APP_VERSION}

e2e/Dockerfile

@@ -22,7 +22,7 @@ COPY e2e/*.yml /e2e
 COPY e2e/entrypoint.sh /tmp
 ADD e2e/cypress /e2e/cypress
 
-RUN curl -v -L -O https://github.com/bcgov/gwa-cli/releases/download/v3.0.4/gwa_Linux_x86_64.tgz \
+RUN curl -v -L -O https://github.com/bcgov/gwa-cli/releases/download/v3.0.5/gwa_Linux_x86_64.tgz \
  && tar -xzf gwa_Linux_x86_64.tgz \
  && mv gwa /usr/local/bin/.
 

e2e/cypress.config.ts

@@ -26,7 +26,7 @@ export default defineConfig({
         './cypress/tests/07-*/*.ts',
         './cypress/tests/03-*/*.ts',
         './cypress/tests/04-*/*.ts',
-        './cypress/tests/05-*/*.ts',
+        // './cypress/tests/05-*/*.ts',
         './cypress/tests/08-*/*.ts',
         './cypress/tests/09-*/*.ts',
         './cypress/tests/10-*/*.ts',

e2e/cypress/tests/16-gwa-cli/02-cli-generate-config-quick-start.ts

@@ -103,7 +103,7 @@ describe('Verify CLI commands for generate/apply config', () => {
     cy.executeCliCommand('gwa gateway create --generate').then((response) => {
       const namespace = response.stdout.match(/\bgw-\w+/g)[0]
       cy.executeCliCommand(command).then((response) => {
-        expect(response.stderr).to.contain(`Error: Service ${serviceName} is already in use. Suggestion: ${namespace}-${serviceName}`)
+        expect(response.stderr).to.contain(`Error: Checking service availability: Service ${serviceName} is already in use. Suggestion: ${namespace}-${serviceName}`)
       });
     });
   })

e2e/cypress/tests/19-api-v3/03-gateways.ts

@@ -188,7 +188,7 @@ describe('Gateways', () => {
             details: {
               d0: {
                 message:
-                  'Namespace name must be between 5 and 15 alpha-numeric lowercase characters and start and end with an alphabet.',
+                  'Gateway ID must be between 5 and 15 lowercase alpha-numeric characters and start with a letter.',
               },
             },
           }

e2e/cypress/tests/20-gateways/02-dropdown.ts

@@ -37,7 +37,11 @@ describe('Gateway selector dropdown', () => {
 
   it('Get current total number of gateways', () => {
     // Create a new gateway to ensure there is at least one gateway
-    cy.createGateway();
+    cy.createGateway().then((response) => {
+      const namespace = response.gatewayId
+      cy.log('New namespace created: ' + namespace)
+      cy.activateGateway(namespace);
+    });
 
     cy.visit(ad.yourProductsPath);
     cy.get('[data-testid="ns-dropdown-btn"]').click();
@@ -81,8 +85,8 @@ describe('Gateway selector dropdown', () => {
   it('Recently used gateways are shown in the dropdown', () => {
     cy.visit(ns.listPath)
     cy.get(`[data-testid="ns-list-activate-link-${gateways["namespace1"].gatewayId + '-' + customId}"]`).click()
-    cy.get('[data-testid="ns-dropdown-btn"]').click()
-    cy.get(`[data-testid="ns-dropdown-item-${gateways["namespace2"].gatewayId + '-' + customId}"]`).click()
+    cy.visit(ns.listPath)
+    cy.get(`[data-testid="ns-list-activate-link-${gateways["namespace2"].gatewayId + '-' + customId}"]`).click()
     cy.get('[data-testid="ns-dropdown-btn"]').click()
     cy.get('[data-testid="ns-dropdown-heading"]').should('contain.text', "Recently viewed")
     cy.get(`[data-testid="ns-dropdown-item-${gateways["namespace1"].gatewayId + '-' + customId}"]`).should('exist')

feeds/Dockerfile

@@ -1,5 +1,5 @@
 #FROM node:lts-alpine3.17
-FROM node:16.14.2-alpine3.15
+FROM node:22.12.0-alpine3.21
 
 RUN apk add curl jq
 

feeds/testdata/dataset.json

@@ -124,7 +124,7 @@
       "name": "travel planning"
     }
   ],
-  "contacts": "[{\"name\":\"DataBC Operations\",\"email\":\"[email protected]\",\"org\":\"d2e433a1-b785-4d03-8a2b-392069175eb4\",\"role\":\"pointOfContact\",\"displayed\":true}]",
+  "contacts": "[{\"name\":\"DataBC Operations\",\"email\":\"[email protected]\",\"org\":\"d2e433a1-b785-4d03-8a2b-392069175eb4\",\"role\":\"pointOfContact\",\"displayed\":[\"displayed\"]}]",
   "resource_status": "completed",
   "tracking_summary": {
     "total": 917,

local/cypress-jwks-url/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.14.2-alpine3.15
+FROM node:22.12.0-alpine3.21
 
 WORKDIR /src
 

local/gwa-api/.env.local

@@ -4,6 +4,7 @@ OIDC_BASE_URL=http://keycloak.localtest.me:9081/auth/realms/master
 TOKEN_MATCH_AUD=gwa
 WORKING_FOLDER=/tmp
 CONFIG_PATH=/tmp/production.json
+DATA_PLANES_CONFIG_PATH=/tmp/gwa/data_planes_config.json
 ENVIRONMENT=production
 KONG_ADMIN_URL=http://kong.localtest.me:8001
 KC_SERVER_URL=http://keycloak.localtest.me:9081/auth/

local/gwa-api/data_planes_config.json

@@ -0,0 +1,9 @@
+{
+    "data_planes": {
+        "local.dataplane": {
+            "kube-api": "https://api.cloud",
+            "kube-ns": "xxxxxx-dev",
+            "validate-upstreams": false
+        }
+    }
+}

local/html-sample-app/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.14.2-alpine3.15
+FROM node:22.12.0-alpine3.21
 
 WORKDIR /src
 

local/portal/Dockerfile.E2E

@@ -1,5 +1,5 @@
 #FROM node:lts-alpine3.18
-FROM node:16.14.2-alpine3.15
+FROM node:22.12.0-alpine3.21
 
 ARG APP_VERSION
 ENV APP_VERSION=${APP_VERSION}

oauth2-proxy/sample-upstream/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.14.2-alpine3.15 AS BUILD
+FROM node:22.12.0-alpine3.21 AS BUILD
 
 COPY package*.json /app/
 

src/batch/data-rules.js

@@ -62,6 +62,7 @@ const metadata = {
     transformations: {
       tags: { name: 'toStringDefaultArray' },
       resources: { name: 'toStringDefaultArray' },
+      contacts: { name: 'toStringDefaultArray' },
       organization: {
         name: 'connectOne',
         key: 'organization.id',

src/controllers/v3/DatasetController.ts

@@ -40,7 +40,7 @@ export class DatasetController extends Controller {
 
   /**
    * Update metadata about a Dataset
-   * > `Required Scope:` Namespace.Manage
+   * > `Required Scope:` Gateway.Manage
    *
    * @summary Update Dataset
    */
@@ -66,7 +66,7 @@ export class DatasetController extends Controller {
 
   /**
    * Get metadata about a Dataset
-   * > `Required Scope:` Namespace.Manage
+   * > `Required Scope:` Gateway.Manage
    *
    * @summary Get Dataset
    */