Merge pull request #1215 from bcgov/feature/node-upgrade

rustyjux · web-flow · commit b6d32fa61206 · 2025-01-14T14:03:46.000-08:00
Feature/node upgrade
diff --git a/.github/workflows/aps-cypress-e2e.yaml b/.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,30 +49,37 @@ 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
@@ -81,6 +90,29 @@ jobs:
         with:
           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: |
+          FAILURE_COUNT=$(cat ${{ github.workspace }}/e2e/results/bcgov-aps-e2e-report.json | jq '.stats.failures')
+          if [[ "$FAILURE_COUNT" -gt 0 ]]; then
+            FAILED_TESTS=$(jq -r '
+              .results[] |
+              (.file | split("/") | .[2:] | join("/")) as $file |
+              .. | 
+              .tests? // empty | 
+              .[] | 
+              select(.fail == true) | 
+              "- " + $file + " - " + .title
+            ' ${{ github.workspace }}/e2e/results/bcgov-aps-e2e-report.json)
+            STATS=$(cat ${{ github.workspace }}/e2e/results/bcgov-aps-e2e-report.json | jq -r '.stats | to_entries | map("\(.key)\t\(.value)") | .[]' | column -t)
+            echo -e "Stats: $STATS\n\nFailed Tests:\n$FAILED_TESTS\n\nRun Link: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" > msg
+            export MSG=$(cat msg)
+            gh issue create --title "FAILED: Automated Tests($FAILURE_COUNT)" --body "$MSG" --label "automation" --assignee "${{ env.GIT_COMMIT_AUTHOR }}"
+            exit 1
+          fi
 
       - name: Instrument the code for coverage analysis
         run: |
@@ -92,7 +124,7 @@ jobs:
           #npx nyc instrument --compact=false . --in-place
 
       - name: SonarCloud Scan
-        uses: sonarsource/sonarcloud-github-action@master
+        uses: sonarsource/sonarqube-scan-action@master
         with:
           args: >
             -Dsonar.organization=bcgov-oss
@@ -106,28 +138,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
-      - name: Check for failed tests and create Issue
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          FAILURE_COUNT=$(cat ${{ github.workspace }}/e2e/results/bcgov-aps-e2e-report.json | jq '.stats.failures')
-          if [[ "$FAILURE_COUNT" -gt 0 ]]; then
-            FAILED_TESTS=$(jq -r '
-              .results[] |
-              (.file | split("/") | .[2:] | join("/")) as $file |
-              .. | 
-              .tests? // empty | 
-              .[] | 
-              select(.fail == true) | 
-              "- " + $file + " - " + .title
-            ' ${{ github.workspace }}/e2e/results/bcgov-aps-e2e-report.json)
-            STATS=$(cat ${{ github.workspace }}/e2e/results/bcgov-aps-e2e-report.json | jq -r '.stats | to_entries | map("\(.key)\t\(.value)") | .[]' | column -t)
-            echo -e "Stats: $STATS\n\nFailed Tests:\n$FAILED_TESTS\n\nRun Link: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" > msg
-            export MSG=$(cat msg)
-            gh issue create --title "FAILED: Automated Tests($FAILURE_COUNT)" --body "$MSG" --label "automation" --assignee "${{ env.GIT_COMMIT_AUTHOR }}"
-            exit 1
-          fi
-
       - name: Set up Python 3.9
         if: failure()
         uses: actions/setup-python@v2
diff --git a/.github/workflows/ci-anchore-img-scan.yaml b/.github/workflows/ci-anchore-img-scan.yaml
@@ -17,7 +17,8 @@ jobs:
         with:
           image: 'bcgov/api-services-portal:anchore-scan'
           fail-build: false
+          output-file: 'anchore-results.sarif'
       - name: Upload Anchore Scan Results
         uses: github/codeql-action/upload-sarif@v3
         with:
-          sarif_file: results.sarif
+          sarif_file: anchore-results.sarif
diff --git a/.github/workflows/ci-feat-sonar.yaml b/.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
diff --git a/.github/workflows/ci-trivy-img-scan.yaml b/.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@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: 'trivy-results.sarif'
diff --git a/Dockerfile b/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}
diff --git a/e2e/Dockerfile b/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/.
 
diff --git a/e2e/cypress.config.ts b/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',
diff --git a/e2e/cypress/tests/16-gwa-cli/02-cli-generate-config-quick-start.ts b/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}`)
       });
     });
   })
diff --git a/e2e/cypress/tests/19-api-v3/03-gateways.ts b/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 and end with a letter.',
               },
             },
           }
diff --git a/feeds/Dockerfile b/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
 
diff --git a/local/cypress-jwks-url/Dockerfile b/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
 
diff --git a/local/gwa-api/.env.local b/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/
diff --git a/local/gwa-api/data_planes_config.json b/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
+        }
+    }
+}
diff --git a/local/html-sample-app/Dockerfile b/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
 
diff --git a/local/portal/Dockerfile.E2E b/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}
diff --git a/oauth2-proxy/sample-upstream/Dockerfile b/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/
 
diff --git a/src/lists/extensions/Namespace.ts b/src/lists/extensions/Namespace.ts
@@ -251,7 +251,7 @@ module.exports = {
               assert.strictEqual(
                 re.test(args.namespace),
                 true,
-                'Gateway name must be between 5 and 15 alpha-numeric lowercase characters and begin with an alphabet.'
+                'Gateway ID must be between 5 and 15 lowercase alpha-numeric characters and start and end with a letter.'
               );
               const noauthContext = context.createContext({
                 skipAccessControl: true,
diff --git a/src/package.json b/src/package.json
@@ -8,7 +8,7 @@
   "homepage": "https://github.com/keystonejs/keystone",
   "license": "MIT",
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=22.0.0 <23.0.0"
   },
   "main": "dist/server.js",
   "nodemonConfig": {
@@ -43,7 +43,7 @@
     "mock-server": "nodemon ./test/mock-server/server.js",
     "ks-build": "cross-env NODE_ENV=production keystone build --entry=dist/server.js --out=dist2",
     "start": "cross-env NODE_ENV=production keystone start --entry=dist/server.js",
-    "build": "NODE_OPTIONS='--dns-result-order=ipv4first' npm-run-all delete-assets copy-assets tsoa-build-v1 tsoa-build-v2 tsoa-build-v3 ts-build ks-build copy-keystone-admin-assets",
+    "build": "NODE_OPTIONS='--dns-result-order=ipv4first --openssl-legacy-provider' npm-run-all delete-assets copy-assets tsoa-build-v1 tsoa-build-v2 tsoa-build-v3 ts-build ks-build copy-keystone-admin-assets",
     "create-tables": "cross-env CREATE_TABLES=true keystone create-tables --entry=dist/server.js",
     "lint": "eslint ./nextapp --ext .ts,.tsx --quiet",
     "lint:ts": "tsc -p ./nextapp/tsconfig.json --noEmit",
@@ -110,6 +110,7 @@
     "keycloak-connect": "^17.0.1",
     "lodash": "^4.17.21",
     "multer": "^1.4.2",
+    "node-fetch": "^2.7.0",
     "nodemailer": "^6.6.0",
     "npmlog": "^6.0.1",
     "numeral": "^2.0.6",
diff --git a/src/services/keycloak/group-service.ts b/src/services/keycloak/group-service.ts
@@ -13,10 +13,17 @@ import UserRepresentation from '@keycloak/keycloak-admin-client/lib/defs/userRep
 const logger = Logger('kc.group');
 
 export class KeycloakGroupService {
+  private static instanceCount = 0;  // Track total instances created
+  private instanceId: string;
+  private createdAt: Date;
   private allGroups: any = undefined;
   private kcAdminClient: KeycloakAdminClient;
 
   constructor(issuerUrl: string) {
+    this.instanceId = `kc-group-${++KeycloakGroupService.instanceCount}`;
+    this.createdAt = new Date();
+    logger.info('[Instance Created] id=%s, created=%s', this.instanceId, this.createdAt);
+
     const baseUrl = issuerUrl.substr(0, issuerUrl.indexOf('/realms'));
     const realmName = issuerUrl.substr(issuerUrl.lastIndexOf('/') + 1);
     logger.debug('%s %s', baseUrl, realmName);
diff --git a/src/services/keycloak/namespace-details.ts b/src/services/keycloak/namespace-details.ts
@@ -195,7 +195,7 @@ export function validateNamespaceName(name: string) {
   regExprValidation(
     namespaceValidationRule,
     name,
-    '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 and end with a letter.'
   );
 }
 
diff --git a/src/services/utils.ts b/src/services/utils.ts
@@ -58,7 +58,7 @@ export function regExprValidation(
   errorMessage: string
 ) {
   const re = new RegExp(rule);
-  assert.strictEqual(re.test(value), true, errorMessage);
+  assert.ok(re.test(value), errorMessage);
 }
 
 export async function fetchWithTimeout(resource: string, options: any = {}) {

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ describe('Gateways', () => {`
`188`	`188`	`details: {`
`189`	`189`	`d0: {`
`190`	`190`	`message:`
`191`		`- 'Namespace name must be between 5 and 15 alpha-numeric lowercase characters and start and end with an alphabet.',`
	`191`	`+ 'Gateway ID must be between 5 and 15 lowercase alpha-numeric characters and start and end with a letter.',`
`192`	`192`	`},`
`193`	`193`	`},`
`194`	`194`	`}`