diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 0c58bc9dd..b0fea1b9b 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -12,7 +12,7 @@ jobs: - name: NPM Install run: npm ci - name: Copy Configs - run: cp config/alpha.json public/config.json + run: cp config/base_config.json public/config.json - name: NPM Build run: CI=false npm run build --silent - name: Cypress run integration tests diff --git a/DEVNOTES.md b/DEVNOTES.md index 5104c3bb1..9012a4772 100644 --- a/DEVNOTES.md +++ b/DEVNOTES.md @@ -19,7 +19,7 @@ environment by looking at the deployed configs in https://duos-k8s.dsde-{%ENV%}. will simulate it for local development. The installation steps outlined in this step can also be completed using the [render-configs.sh](scripts/render-configs.sh) script which can generate all required files for local development. ``` -cp config/alpha.json public/config.json +cp config/base_config.json public/config.json ``` Ensure that your `/etc/hosts` file has an entry for `local.dsde-dev.broadinstitute.org` diff --git a/TESTING.md b/TESTING.md index dd3a8caf4..be05a2229 100644 --- a/TESTING.md +++ b/TESTING.md @@ -3,7 +3,7 @@ We use [Cypress](https://docs.cypress.io/) for testing. Update an environment config file to test against: ``` -cp config/alpha.json public/config.json +cp config/base_config.json public/config.json ``` ## Run All Tests diff --git a/config/alpha.json b/config/alpha.json deleted file mode 100644 index 5d91b79ae..000000000 --- a/config/alpha.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "Comments": "The values in this configuration are all publicly accessible values from the deployed application.", - "env": "alpha", - "tag": "alpha", - "hash": "alpha", - "apiUrl": "https://consent.dsde-alpha.broadinstitute.org", - "ontologyApiUrl": "https://consent-ontology.dsde-alpha.broadinstitute.org/", - "errorApiKey": "1234567890abcdefghijklmnop", - "gaId": "", - "profileUrl": "https://profile-dot-broad-shibboleth-prod.appspot.com/dev", - "nihUrl": "https://broad-shibboleth-prod.appspot.com/dev/login", - "features": {} -} diff --git a/config/base_config.json b/config/base_config.json index 2310c252a..9ce317846 100644 --- a/config/base_config.json +++ b/config/base_config.json @@ -2,11 +2,13 @@ "env": "", "hash": "", "tag": "", + "bardApiUrl": "", "apiUrl": "", "ontologyApiUrl": "", "terraUrl": "", "tdrApiUrl": "", "errorApiKey": "", + "profileUrl": "", "nihUrl": "", "gaId": "", "features": {}