From 2a8a43522aa0d00b83d10213d9cb310985b37b1c Mon Sep 17 00:00:00 2001 From: Ricardo Campos Date: Mon, 8 May 2023 13:15:09 -0300 Subject: [PATCH] fix: wrong backend api urls (#76) --- .github/workflows/merge-main.yml | 8 ++++---- .github/workflows/pr-open.yml | 2 +- frontend/CONTRIBUTING.md | 2 +- frontend/README.md | 1 - frontend/jest.config.js | 3 +-- frontend/openshift.deploy.yml | 8 ++++---- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml index 70329c95a..83d540424 100644 --- a/.github/workflows/merge-main.yml +++ b/.github/workflows/merge-main.yml @@ -89,12 +89,12 @@ jobs: verification_path: "actuator/health" parameters: -p REACT_APP_SPAR_BUILD_VERSION=snapshot-test - -p REACT_APP_SERVER_URL=https://https://nr-spar-test-backend.apps.silver.devops.gov.bc.ca + -p REACT_APP_SERVER_URL=https://nr-spar-test-backend.apps.silver.devops.gov.bc.ca + -p REACT_APP_ORACLE_SERVER_URL=https://nr-spar-test-oracle-api.apps.silver.devops.gov.bc.ca -p REACT_APP_NRSPARWEBAPP_VERSION=test -p REACT_APP_KC_URL=https://test.loginproxy.gov.bc.ca/auth -p REACT_APP_KC_REALM=standard -p REACT_APP_KC_CLIENT_ID=seed-planning-test-4296 - -p REACT_APP_ENABLE_MOCK_SERVER=true -p MIN_REPLICAS=1 -p MAX_REPLICAS=1 - name: oracle-api file: oracle-api/openshift.deploy.yml @@ -198,12 +198,12 @@ jobs: verification_path: "actuator/health" parameters: -p REACT_APP_SPAR_BUILD_VERSION=snapshot-prod - -p REACT_APP_SERVER_URL=https://https://nr-spar-prod-backend.apps.silver.devops.gov.bc.ca + -p REACT_APP_SERVER_URL=https://nr-spar-prod-backend.apps.silver.devops.gov.bc.ca + -p REACT_APP_ORACLE_SERVER_URL=https://nr-spar-prod-oracle-api.apps.silver.devops.gov.bc.ca -p REACT_APP_NRSPARWEBAPP_VERSION=prod -p REACT_APP_KC_URL=https://loginproxy.gov.bc.ca/auth -p REACT_APP_KC_REALM=standard -p REACT_APP_KC_CLIENT_ID=seed-planning-test-4296 - -p REACT_APP_ENABLE_MOCK_SERVER=true -p MIN_REPLICAS=1 -p MAX_REPLICAS=1 - name: oracle-api file: oracle-api/openshift.deploy.yml diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 55bd2e780..17565334d 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -101,11 +101,11 @@ jobs: parameters: -p REACT_APP_SPAR_BUILD_VERSION=snapshot-${{ github.event.number }} -p REACT_APP_SERVER_URL=https://nr-spar-${{ github.event.number }}-backend.apps.silver.devops.gov.bc.ca + -p REACT_APP_ORACLE_SERVER_URL=https://nr-spar-${{ github.event.number }}-oracle-api.apps.silver.devops.gov.bc.ca -p REACT_APP_NRSPARWEBAPP_VERSION=dev -p REACT_APP_KC_URL=https://test.loginproxy.gov.bc.ca/auth -p REACT_APP_KC_REALM=standard -p REACT_APP_KC_CLIENT_ID=seed-planning-test-4296 - -p REACT_APP_ENABLE_MOCK_SERVER=true -p MIN_REPLICAS=1 -p MAX_REPLICAS=1 - name: oracle-api file: oracle-api/openshift.deploy.yml diff --git a/frontend/CONTRIBUTING.md b/frontend/CONTRIBUTING.md index 12f09ce7b..5598b0fd6 100644 --- a/frontend/CONTRIBUTING.md +++ b/frontend/CONTRIBUTING.md @@ -59,11 +59,11 @@ Remember of setting up the required environment variables. You can create a `.en ``` REACT_APP_SERVER_URL= +REACT_APP_ORACLE_SERVER_URL= REACT_APP_NRSPARWEBAPP_VERSION= REACT_APP_KC_URL= REACT_APP_KC_REALM= REACT_APP_KC_CLIENT_ID= -REACT_APP_ENABLE_MOCK_SERVER= ``` And if you want to run Cypress, please add: diff --git a/frontend/README.md b/frontend/README.md index b32c18fc1..3f97ce792 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -60,7 +60,6 @@ REACT_APP_ORACLE_SERVER_URL=https://localhost:8092/ REACT_APP_KC_URL=https://test.loginproxy.gov.bc.ca/auth REACT_APP_KC_REALM=standard REACT_APP_KC_CLIENT_ID=seed-planning-test-4296 -REACT_APP_ENABLE_MOCK_SERVER=true CYPRESS_USERNAME=LOAD-3-TEST CYPRESS_PASSWORD=[password-here] ``` diff --git a/frontend/jest.config.js b/frontend/jest.config.js index 6cdebcc37..417711c73 100644 --- a/frontend/jest.config.js +++ b/frontend/jest.config.js @@ -20,6 +20,5 @@ module.exports = { process.env = Object.assign(process.env, { REACT_APP_KC_URL: 'https://dev.any-keycloak-server.com/auth', REACT_APP_KC_REALM: 'default', - REACT_APP_KC_CLIENT_ID: 'test-client-id', - REACT_APP_ENABLE_MOCK_SERVER: 'true' + REACT_APP_KC_CLIENT_ID: 'test-client-id' }); diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml index 3523307d9..3408f610b 100644 --- a/frontend/openshift.deploy.yml +++ b/frontend/openshift.deploy.yml @@ -55,8 +55,8 @@ parameters: - name: REACT_APP_KC_CLIENT_ID description: REACT_APP_KC_CLIENT_ID required: true - - name: REACT_APP_ENABLE_MOCK_SERVER - description: REACT_APP_ENABLE_MOCK_SERVER + - name: REACT_APP_ORACLE_SERVER_URL + description: Oracle back-end api URL required: true objects: - apiVersion: v1 @@ -120,8 +120,8 @@ objects: value: ${REACT_APP_KC_REALM} - name: REACT_APP_KC_CLIENT_ID value: ${REACT_APP_KC_CLIENT_ID} - - name: REACT_APP_ENABLE_MOCK_SERVER - value: ${REACT_APP_ENABLE_MOCK_SERVER} + - name: REACT_APP_ORACLE_SERVER_URL + value: ${REACT_APP_ORACLE_SERVER_URL} ports: - containerPort: 3000 protocol: TCP