From 232a622b7266f3b9f74b7c05e6b6f55dd09d470a Mon Sep 17 00:00:00 2001 From: barrfalk Date: Tue, 24 Oct 2023 15:12:51 -0700 Subject: [PATCH] Initial commit --- .github/workflows/analysis.yml | 58 +++++++++++++++++----------------- .github/workflows/merge.yml | 4 +-- SECURITY.md | 2 +- backend/openshift.deploy.yml | 6 ++-- database/openshift.deploy.yml | 2 +- frontend/cypress.config.ts | 2 +- frontend/openshift.deploy.yml | 4 +-- frontend/package-lock.json | 4 +-- frontend/package.json | 2 +- 9 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 0972b131..55a76d55 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -69,32 +69,32 @@ jobs: --health-retries 5 ports: - 5432:5432 - strategy: - matrix: - dir: [backend, frontend] - include: - - dir: backend - sonar_projectKey: quickstart-openshift_backend - token: SONAR_TOKEN_BACKEND - triggers: ('backend/') - - dir: frontend - sonar_projectKey: quickstart-openshift_frontend - token: SONAR_TOKEN_FRONTEND - triggers: ('frontend/') - steps: - - uses: bcgov-nr/action-test-and-analyse@v1.1.0 - with: - commands: | - npm ci - npm run test:cov - dir: ${{ matrix.dir }} - node_version: "20" - sonar_args: > - -Dsonar.exclusions=**/coverage/**,**/node_modules/**,**/*spec.ts - -Dsonar.organization=bcgov-sonarcloud - -Dsonar.projectKey=${{ matrix.sonar_projectKey }} - -Dsonar.sources=src - -Dsonar.tests.inclusions=**/*spec.ts - -Dsonar.javascript.lcov.reportPaths=./coverage/lcov.info - sonar_token: ${{ secrets[matrix.token] }} - triggers: ${{ matrix.triggers }} + # strategy: + # matrix: + # dir: [backend, frontend] + # include: + # - dir: backend + # sonar_projectKey: nr-compliance-enforcement-cm_backend + # token: SONAR_TOKEN_BACKEND + # triggers: ('backend/') + # - dir: frontend + # sonar_projectKey: nr-compliance-enforcement-cm_frontend + # token: SONAR_TOKEN_FRONTEND + # triggers: ('frontend/') + # steps: + # - uses: bcgov-nr/action-test-and-analyse@v1.1.0 + # with: + # commands: | + # npm ci + # npm run test:cov + # dir: ${{ matrix.dir }} + # node_version: "20" + # sonar_args: > + # -Dsonar.exclusions=**/coverage/**,**/node_modules/**,**/*spec.ts + # -Dsonar.organization=bcgov-sonarcloud + # -Dsonar.projectKey=${{ matrix.sonar_projectKey }} + # -Dsonar.sources=src + # -Dsonar.tests.inclusions=**/*spec.ts + # -Dsonar.javascript.lcov.reportPaths=./coverage/lcov.info + # sonar_token: ${{ secrets[matrix.token] }} + # triggers: ${{ matrix.triggers }} diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 6661bc27..fc4d3488 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -73,7 +73,7 @@ jobs: - name: Install dependencies run: npm ci - name: Run integration tests - run: BASE_URL=https://quickstart-openshift-test-backend.apps.silver.devops.gov.bc.ca API_NAME=nest node src/main.js + run: BASE_URL=https://nr-compliance-enforcement-cm-test-backend.apps.silver.devops.gov.bc.ca API_NAME=nest node src/main.js cypress-e2e: name: Cypress end to end test @@ -103,7 +103,7 @@ jobs: - uses: cypress-io/github-action@v6 name: Cypress run with: - config: pageLoadTimeout=10000,baseUrl=https://quickstart-openshift-test-frontend.apps.silver.devops.gov.bc.ca/ + config: pageLoadTimeout=10000,baseUrl=https://nr-compliance-enforcement-cm-test-frontend.apps.silver.devops.gov.bc.ca/ working-directory: ./frontend browser: ${{ matrix.browser }} - uses: actions/upload-artifact@v3 diff --git a/SECURITY.md b/SECURITY.md index d45a1626..d8fd1e5e 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -7,4 +7,4 @@ This product currently has no support and is experimental. That could change in ## Reporting a Vulnerability -Please report any issues or vulerabilities with an [issue](https://github.com/bcgov/quickstart-openshift/issues). +Please report any issues or vulerabilities with an [issue](https://github.com/bcgov/nr-compliance-enforcement-cm/issues). diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml index 3ea5dec4..df18fb0c 100644 --- a/backend/openshift.deploy.yml +++ b/backend/openshift.deploy.yml @@ -3,7 +3,7 @@ kind: Template parameters: - name: NAME description: Module name - value: quickstart-openshift + value: nr-compliance-enforcement-cm - name: COMPONENT description: Component name value: backend @@ -45,10 +45,10 @@ parameters: value: bcgov - name: PROMOTE description: Image (namespace/name:tag) to promote/import - value: bcgov/quickstart-openshift/backend:test + value: bcgov/nr-compliance-enforcement-cm/backend:test - name: PROMOTE_MIGRATION description: Image (namespace/name:tag) for migration to promote/import - value: bcgov/quickstart-openshift/migrations:test + value: bcgov/nr-compliance-enforcement-cm/migrations:test - name: COMPONENT_DB_MIGRATION description: Component name for database migrations value: migrations diff --git a/database/openshift.deploy.yml b/database/openshift.deploy.yml index 946cc5b2..d412f0c4 100644 --- a/database/openshift.deploy.yml +++ b/database/openshift.deploy.yml @@ -3,7 +3,7 @@ kind: Template parameters: - name: NAME description: Product name - value: quickstart-openshift + value: nr-compliance-enforcement-cm - name: COMPONENT description: Component name value: database diff --git a/frontend/cypress.config.ts b/frontend/cypress.config.ts index 732c2df9..642b3473 100644 --- a/frontend/cypress.config.ts +++ b/frontend/cypress.config.ts @@ -2,7 +2,7 @@ import { defineConfig } from "cypress"; export default defineConfig({ e2e: { - baseUrl: 'https://quickstart-openshift-test-frontend.apps.silver.devops.gov.bc.ca/', + baseUrl: 'https://nr-compliance-enforcement-cm-test-frontend.apps.silver.devops.gov.bc.ca/', setupNodeEvents(on, config) { // implement node event listeners here }, diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml index 4c121eea..bfbaa47a 100644 --- a/frontend/openshift.deploy.yml +++ b/frontend/openshift.deploy.yml @@ -3,7 +3,7 @@ kind: Template parameters: - name: NAME description: Module name - value: quickstart-openshift + value: nr-compliance-enforcement-cm - name: COMPONENT description: Component name value: frontend @@ -34,7 +34,7 @@ parameters: value: ghcr.io - name: PROMOTE description: Image (namespace/name:tag) to promote/import - value: bcgov/quickstart-openshift/frontend:prod + value: bcgov/nr-compliance-enforcement-cm/frontend:prod - name: LOG_LEVEL description: Caddy logging level DEBUG, INFO, WARN, ERROR, PANIC, and FATAL (https://github.com/caddyserver/caddy/blob/master/logging.go) value: "info" diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 37bd4331..d7e6d839 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,11 +1,11 @@ { - "name": "quickstart-openshift-react-frontend", + "name": "nr-compliance-enforcement-cm-react-frontend", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "quickstart-openshift-react-frontend", + "name": "nr-compliance-enforcement-cm-react-frontend", "version": "1.0.0", "dependencies": { "@emotion/react": "^11.11.0", diff --git a/frontend/package.json b/frontend/package.json index 0203f614..db050b7e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "quickstart-openshift-react-frontend", + "name": "nr-compliance-enforcement-cm-react-frontend", "private": true, "version": "1.0.0", "type": "module",