chore: release to test

.github/workflows/e2e-keycloak.yaml

@@ -35,14 +35,25 @@ jobs:
           summary-title: 'Pre-reqs'
           wait-on: https://bcgov.github.io/sso-requests-sandbox/
           wait-on-timeout: 120
-          record: true
           install-command: yarn
           working-directory: app
           spec: |
             cypress/e2e/**/integration-990-deleteAllIntegrations.cy.ts
           browser: electron
-          # project: ./e2e
-          ci-build-id: ${{ github.event.number }}
+
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: cypress-screenshots
+          path: app/cypress/screenshots/**/*
+          if-no-files-found: ignore
+
+      # - uses: actions/upload-artifact@v4
+      #   if: failure()
+      #   with:
+      #     name: cypress-videos
+      #     path: app/cypress/videos/**/*
+      #     if-no-files-found: ignore
 
   idp-stopper:
     runs-on: ubuntu-latest
@@ -60,15 +71,27 @@ jobs:
         continue-on-error: false
         with:
           summary-title: 'E2E tests'
-          record: true
           wait-on: 'https://bcgov.github.io/sso-requests-sandbox/'
           wait-on-timeout: 360
           install-command: yarn
           working-directory: app
           spec: |
             cypress/e2e/external/idpstopper-*.cy.ts
           browser: electron
-          ci-build-id: ${{ github.event.number }}
+
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: cypress-screenshots
+          path: app/cypress/screenshots/**/*
+          if-no-files-found: ignore
+
+      # - uses: actions/upload-artifact@v4
+      #   if: failure()
+      #   with:
+      #     name: cypress-videos
+      #     path: app/cypress/videos/**/*
+      #     if-no-files-found: ignore
 
   search-users:
     runs-on: ubuntu-latest
@@ -83,15 +106,27 @@ jobs:
         continue-on-error: false
         with:
           summary-title: 'E2E tests'
-          record: true
           wait-on: 'https://bcgov.github.io/sso-requests-sandbox/'
           wait-on-timeout: 360
           install-command: yarn
           working-directory: app
           spec: |
             cypress/e2e/external/search-users.cy.ts
           browser: electron
-          ci-build-id: ${{ github.event.number }}
+
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: cypress-screenshots
+          path: app/cypress/screenshots/**/*
+          if-no-files-found: ignore
+
+      # - uses: actions/upload-artifact@v4
+      #   if: failure()
+      #   with:
+      #     name: cypress-videos
+      #     path: app/cypress/videos/**/*
+      #     if-no-files-found: ignore
 
   roles-tests:
     runs-on: ubuntu-latest
@@ -106,15 +141,27 @@ jobs:
         continue-on-error: false
         with:
           summary-title: 'E2E tests'
-          record: true
           wait-on: 'https://bcgov.github.io/sso-requests-sandbox/'
           wait-on-timeout: 360
           install-command: yarn
           working-directory: app
           spec: |
             cypress/e2e/external/integration-roles.cy.ts
           browser: electron
-          ci-build-id: ${{ github.event.number }}
+
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: cypress-screenshots
+          path: app/cypress/screenshots/**/*
+          if-no-files-found: ignore
+
+      # - uses: actions/upload-artifact@v4
+      #   if: failure()
+      #   with:
+      #     name: cypress-videos
+      #     path: app/cypress/videos/**/*
+      #     if-no-files-found: ignore
 
   integration-tests:
     runs-on: ubuntu-latest
@@ -129,12 +176,24 @@ jobs:
         continue-on-error: false
         with:
           summary-title: 'E2E tests'
-          record: true
           wait-on: 'https://bcgov.github.io/sso-requests-sandbox/'
           wait-on-timeout: 360
           install-command: yarn
           working-directory: app
           spec: |
             cypress/e2e/ci/integrations-crud.cy.ts
           browser: electron
-          ci-build-id: ${{ github.event.number }}
+
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: cypress-screenshots
+          path: app/cypress/screenshots/**/*
+          if-no-files-found: ignore
+
+      # - uses: actions/upload-artifact@v4
+      #   if: failure()
+      #   with:
+      #     name: cypress-videos
+      #     path: app/cypress/videos/**/*
+      #     if-no-files-found: ignore

.github/workflows/e2e.yaml

@@ -16,7 +16,6 @@ env:
   CYPRESS_guid: ${{ secrets.CYPRESS_GUID }}
   CYPRESS_loginproxy: ${{ secrets.CYPRESS_LOGINPROXY }}
   CYPRESS_siteminder: ${{ secrets.CYPRESS_SITEMINDER }}
-  CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   CYPRESS_host: 'http://localhost:3000'
   CYPRESS_smoketest: true
@@ -39,14 +38,25 @@ jobs:
         continue-on-error: false
         with:
           summary-title: 'E2E tests'
-          record: true
           wait-on: 'http://localhost:3000'
-          parallel: true
           wait-on-timeout: 360
           install-command: yarn
           working-directory: app
           spec: |
-            cypress/e2e/smoke/smoke-10-brokenlinks.cy.ts
+            cypress/e2e/ci/smoke-10-brokenlinks.cy.ts
             cypress/e2e/ci/*.cy.ts
           browser: electron
-          ci-build-id: ${{ github.event.number }}
+
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: cypress-screenshots
+          path: app/cypress/screenshots/**/*
+          if-no-files-found: ignore
+
+      # - uses: actions/upload-artifact@v4
+      #   if: failure()
+      #   with:
+      #     name: cypress-videos
+      #     path: app/cypress/videos/**/*
+      #     if-no-files-found: ignore

.github/workflows/terraform.yml

@@ -64,7 +64,8 @@ jobs:
           UPTIME_STATUS_DOMAIN_NAME=status.sandbox.loginproxy.gov.bc.ca
           AWS_ECR_URI=${{secrets.DEV_AWS_ECR_URI}}
           INCLUDE_DIGITAL_CREDENTIAL=true
-          INSTALL_SSO_CSS_GRAFANA=true
+          INSTALL_GRAFANA=true
+          INSTALL_REDIS=true
 
           INCLUDE_BC_SERVICES_CARD=true
           ALLOW_BC_SERVICES_CARD_PROD=true
@@ -116,7 +117,8 @@ jobs:
           UPTIME_STATUS_DOMAIN_NAME=status.sandbox.loginproxy.gov.bc.ca
           AWS_ECR_URI=${{secrets.DEV_AWS_ECR_URI}}
           INCLUDE_DIGITAL_CREDENTIAL=true
-          INSTALL_SSO_CSS_GRAFANA=false
+          INSTALL_GRAFANA=false
+          INSTALL_REDIS=true
 
           INCLUDE_BC_SERVICES_CARD=true
           ALLOW_BC_SERVICES_CARD_PROD=false
@@ -167,7 +169,8 @@ jobs:
           CUSTOM_DOMAIN_NAME=api.loginproxy.gov.bc.ca
           UPTIME_STATUS_DOMAIN_NAME=status.loginproxy.gov.bc.ca
           AWS_ECR_URI=${{secrets.PROD_AWS_ECR_URI}}
-          INSTALL_SSO_CSS_GRAFANA=true
+          INSTALL_GRAFANA=true
+          INSTALL_REDIS=true
           INCLUDE_DIGITAL_CREDENTIAL=true
 
           INCLUDE_BC_SERVICES_CARD=true
@@ -309,7 +312,8 @@ jobs:
           ms_graph_api_authority="${{secrets.MS_GRAPH_API_AUTHORITY}}"
           ms_graph_api_client_id="${{secrets.MS_GRAPH_API_CLIENT_ID}}"
           ms_graph_api_client_secret="${{secrets.MS_GRAPH_API_CLIENT_SECRET}}"
-          install_sso_css_grafana="${{ env.INSTALL_SSO_CSS_GRAFANA == 'true' && 1 || 0 }}"
+          install_grafana="${{ env.INSTALL_GRAFANA == 'true' && 1 || 0 }}"
+          install_redis="${{ env.INSTALL_REDIS == 'true' && 1 || 0 }}"
 
           allow_bc_services_card_prod="${{env.ALLOW_BC_SERVICES_CARD_PROD}}"
           include_bc_services_card="${{env.INCLUDE_BC_SERVICES_CARD}}"
@@ -319,7 +323,6 @@ jobs:
           bcsc_registration_base_url_dev="${{env.BCSC_REGISTRATION_BASE_URL_DEV}}"
           bcsc_registration_base_url_test="${{env.BCSC_REGISTRATION_BASE_URL_TEST}}"
           bcsc_registration_base_url_prod="${{env.BCSC_REGISTRATION_BASE_URL_PROD}}"
-
           EOF
 
         working-directory: ./terraform

.tool-versions

@@ -7,3 +7,4 @@ terraform-docs 0.12.1
 tflint 0.41.0
 k6 0.34.1
 helm 3.10.2
+bun 1.1.34

Dockerfile

@@ -1,5 +1,6 @@
-FROM node:16.14.2-slim
+FROM node:20.17.0-slim
 
+RUN npm i -g bun
 RUN apt-get update && apt-get install curl make -y \
                    && apt-get install libsqlite3-dev bzip2 icu-devtools uuid-dev -y
 

Dockerfile.tf-modules

@@ -1,5 +1,7 @@
-FROM docker.io/hashicorp/terraform:latest
+FROM docker.io/hashicorp/terraform:1.1.4
 
+RUN apk update
+RUN apk upgrade
 RUN apk add --no-cache curl
 
 # Set working directory

app/cypress.config.ts

@@ -20,7 +20,7 @@ export default defineConfig({
     json: true,
   },
   e2e: {
-    baseUrl: 'http://localhost:3000',
+    baseUrl: 'https://bcgov.github.io/sso-requests-sandbox',
     projectId: 'gctfmh',
     setupNodeEvents(on, config) {
       on('before:browser:launch', (browser, launchOptions) => {

app/jest/ssoDashboard.test.tsx

@@ -3,6 +3,8 @@ import AdminDashboard from 'pages/admin-dashboard';
 import { Integration } from 'interfaces/Request';
 import { sampleRequest } from './samples/integrations';
 import { deleteRequest, updateRequestMetadata, updateRequest, restoreRequest, getRequestAll } from 'services/request';
+import BcServicesCardTabContent from 'page-partials/admin-dashboard/AdminTabs/BcServicesCardTabContent';
+
 import { getCompositeClientRoles } from '@app/services/keycloak';
 import { debug } from 'jest-preview';
 
@@ -479,4 +481,31 @@ describe('SSO Dashboard', () => {
 
     expect(screen.queryByText('Remove Service Account')).not.toBeInTheDocument();
   });
+
+  it('BCSC Tab can approve submitted bcsc integrations', () => {
+    const bcServicesCardIntegration: Integration = {
+      ...sampleRequest,
+      devIdps: ['bcservicescard'],
+      status: 'applied',
+      publicAccess: false,
+    };
+
+    render(<BcServicesCardTabContent integration={bcServicesCardIntegration} />);
+    const textElement = screen.getByText('To begin the BC Services Card integration in production, Click Below.');
+    expect(textElement).toBeInTheDocument();
+  });
+
+  it('BCSC Tab cannot approve archived bcsc integrations', () => {
+    const bcServicesCardIntegrationArchived: Integration = {
+      ...sampleRequest,
+      devIdps: ['bcservicescard'],
+      status: 'applied',
+      archived: true,
+      publicAccess: false,
+    };
+
+    render(<BcServicesCardTabContent integration={bcServicesCardIntegrationArchived} />);
+    const textElement = screen.getByText('Cannot approve deleted/archived integrations.');
+    expect(textElement).toBeInTheDocument();
+  });
 });

app/page-partials/admin-dashboard/AdminTabs/TabContent.tsx

@@ -86,7 +86,14 @@ function TabContent({ integration, type, canApproveProd, awaitingTFComplete, onA
   }
 
   let content;
-  if (canApproveProd) {
+
+  if (integration?.archived) {
+    content = (
+      <>
+        <p>Cannot approve deleted/archived integrations.</p>
+      </>
+    );
+  } else if (canApproveProd) {
     content = (
       <>
         <p>{`To begin the ${displayType} integration in production, Click Below.`}</p>

app/page-partials/my-dashboard/IntegrationInfoTabs/LogsPanel.tsx

@@ -99,11 +99,10 @@ interface Props {
  * @param filename Name to give to the downloaded file
  * @param dataObjToWrite The data to include in the file
  */
-const saveTemplateAsFile = (filename: string, dataObjToWrite: any) => {
-  const blob = new Blob([JSON.stringify(dataObjToWrite)], { type: 'text/json' });
+const saveTemplateAsFile = (filename: string, dataObjToWrite: Blob) => {
   const link = document.createElement('a');
   link.download = filename;
-  link.href = window.URL.createObjectURL(blob);
+  link.href = window.URL.createObjectURL(dataObjToWrite);
   link.dataset.downloadurl = ['text/json', link.download, link.href].join(':');
 
   const evt = new MouseEvent('click', {
@@ -174,6 +173,8 @@ const LogsPanel = ({ integration, alert }: Props) => {
   };
 
   const handleFileProgress = (progressEvent: AxiosProgressEvent) => {
+    // Ignore progress indicator if unsupported in browser. Some browsers ignore content-length for zipped responses.
+    if (progressEvent.total === undefined || progressEvent.loaded === undefined) return;
     const percentComplete = Math.floor((progressEvent.loaded / Number(progressEvent.total)) * 100);
     if (percentComplete !== fileProgress) {
       setFileProgress(percentComplete);
@@ -222,11 +223,13 @@ const LogsPanel = ({ integration, alert }: Props) => {
       if (err) {
         // Ignore error if request cancelled
         if (err.code === 'ERR_CANCELED') return;
+        let content = 'Error fetching logs.';
+        if (err?.status === 429) content = 'Too many requests';
         alert.show({
           variant: 'danger',
           fadeOut: 10000,
           closable: true,
-          content: err?.response?.data?.message ?? 'Error fetching logs.',
+          content,
         });
       } else {
         alert.show({
@@ -235,10 +238,9 @@ const LogsPanel = ({ integration, alert }: Props) => {
           closable: true,
           content: result?.message ?? 'Downloaded logs.',
         });
-        const resultJSON = await result.text();
         saveTemplateAsFile(
           `${integration.clientId}-${fromDate.toLocaleString()}-${toDate.toLocaleString()}.json`,
-          JSON.parse(resultJSON),
+          result.data,
         );
         surveyContext?.setShowSurvey(true, 'downloadLogs');
       }

app/page-partials/my-dashboard/TeamInfoTabs/ServiceAccountsList.tsx

@@ -111,7 +111,7 @@ function ServiceAccountsList({
     data = data || {};
 
     const text = {
-      tokenUrl: `${data['auth-server-url']}/realms/${data.realm}/protocol/openid-connect/token`,
+      tokenUrl: `${data['token-url']}`,
       clientId: `${data.resource}`,
       clientSecret: `${data.credentials?.secret}`,
     };