Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: wrong backend api urls #76

Merged
merged 1 commit into from
May 8, 2023
Merged

fix: wrong backend api urls #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/merge-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-open.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion frontend/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion frontend/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
```
Expand Down
3 changes: 1 addition & 2 deletions frontend/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
});
8 changes: 4 additions & 4 deletions frontend/openshift.deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down