ORV2-1763 CORS changes and bug fixes (#1049)

Co-authored-by: cberg-aot <[email protected]>
bcgov · Jan 8, 2024 · 60906a6 · 60906a6
1 parent 21566d9
commit 60906a6
Show file tree

Hide file tree

Showing 16 changed files with 111 additions and 1,245 deletions.
diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
@@ -95,10 +95,9 @@ vehicles:
     enabled: true
     data:
       DOPS_URL: "https://{{.Release.Name}}-dops.apps.silver.devops.gov.bc.ca"
-      FRONTEND_URL: "https://{{.Release.Name}}-frontend.apps.silver.devops.gov.bc.ca"
+      FRONTEND_URL: "https://{{.Release.Name}}-frontend.apps.silver.devops.gov.bc.ca"      
+      ACCESS_API_URL: "https://{{.Release.Name}}-vehicles.apps.silver.devops.gov.bc.ca"
       PAYBC_REDIRECT: "https://{{.Release.Name}}-frontend.apps.silver.devops.gov.bc.ca/payment"
-      VEHICLES_URL: "https://{{.Release.Name}}-vehicles.apps.silver.devops.gov.bc.ca"
-
   containers:
     - name: vehicles
       command:
@@ -115,8 +114,8 @@ vehicles:
             key: DOPS_URL
           - name: FRONTEND_URL
             key: FRONTEND_URL
-          - name: VEHICLES_URL
-            key: VEHICLES_URL
+          - name: ACCESS_API_URL
+            key: ACCESS_API_URL
           - name: PAYBC_REDIRECT
             key: PAYBC_REDIRECT
       ports:
@@ -199,19 +198,25 @@ dops:
   configmap:
     enabled: true
     data:
+      DOPS_URL: "https://{{.Release.Name}}-dops.apps.silver.devops.gov.bc.ca"
+      FRONTEND_URL: "https://{{.Release.Name}}-frontend.apps.silver.devops.gov.bc.ca"
       ACCESS_API_URL: "https://{{.Release.Name}}-vehicles.apps.silver.devops.gov.bc.ca"
   containers:
     - name: dops
       command:
         - "sh"
         - "-c"
-        - "source /vault/secrets/auth0-{{.Values.global.vault.zone}} && source /vault/secrets/mssql-{{.Values.global.vault.zone}} && source /vault/secrets/cdogs-{{.Values.global.vault.zone}} && source /vault/secrets/dops-{{.Values.global.vault.zone}} && npm run start:prod"
+        - "source /vault/secrets/auth0-{{.Values.global.vault.zone}} && source /vault/secrets/mssql-{{.Values.global.vault.zone}} && source /vault/secrets/cdogs-{{.Values.global.vault.zone}} && source /vault/secrets/dops-{{.Values.global.vault.zone}} && source /vault/secrets/s3-{{.Values.global.vault.zone}} && npm run start:prod"
       registry: '{{ .Values.global.registry }}'
       repository: '{{ .Values.global.repository }}' # example, it includes registry and repository
       image: dops
       tag: "{{tpl .Values.global.tag .}}"
       env:
-        fromLocalConfigmap: 
+        fromLocalConfigmap:
+          - name: DOPS_URL
+            key: DOPS_URL
+          - name: FRONTEND_URL
+            key: FRONTEND_URL
           - name: ACCESS_API_URL
             key: ACCESS_API_URL
       ports:
@@ -280,6 +285,7 @@ dops:
       - "mssql-{{tpl $.Values.vault.zone $}}"
       - "cdogs-{{tpl $.Values.vault.zone $}}"
       - "dops-{{tpl $.Values.vault.zone $}}"
+      - "s3-{{tpl $.Values.vault.zone $}}"
     zone: "{{.Values.global.vault.zone}}"
 
 tps-migration:
@@ -297,7 +303,7 @@ tps-migration:
       command:
         - "sh"
         - "-c"
-        - "source /vault/secrets/auth0-{{.Values.global.vault.zone}} && source /vault/secrets/mssql-{{.Values.global.vault.zone}} && source /vault/secrets/dops-{{.Values.global.vault.zone}} && source /vault/secrets/tps-{{.Values.global.vault.zone}} && npm run start:prod"
+        - "source /vault/secrets/auth0-{{.Values.global.vault.zone}} && source /vault/secrets/mssql-{{.Values.global.vault.zone}} && source /vault/secrets/s3-{{.Values.global.vault.zone}} && source /vault/secrets/tps-{{.Values.global.vault.zone}} && npm run start:prod"
       registry: '{{ .Values.global.registry }}'
       repository: '{{ .Values.global.repository }}' # example, it includes registry and repository
       image: tps-migration
@@ -367,7 +373,7 @@ tps-migration:
     license: "{{.Values.global.license}}"
     secretPaths:
       - "auth0-{{tpl $.Values.vault.zone $}}"
-      - "mssql-{{tpl $.Values.vault.zone $}}"
-      - "dops-{{tpl $.Values.vault.zone $}}"
+      - "mssql-{{tpl $.Values.vault.zone $}}"      
       - "tps-{{tpl $.Values.vault.zone $}}"
+      - "s3-{{tpl $.Values.vault.zone $}}"
     zone: "{{.Values.global.vault.zone}}"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -63,8 +63,9 @@ services:
       CHES_CLIENT_ID: ${CHES_CLIENT_ID}
       CHES_CLIENT_SECRET: ${CHES_CLIENT_SECRET}
       CHES_URL: ${CHES_URL}
+      ACCESS_API_URL: "http://vehicles-api:5000"
       DOPS_URL: "http://dops-api:5001"
-      FRONT_END_URL: "http://frontend:3000"
+      FRONTEND_URL: "http://frontend:3000"
       PAYBC_API_KEY: ${PAYBC_API_KEY}
       PAYBC_REF_NUMBER: ${PAYBC_REF_NUMBER}
       PAYBC_BASE_URL: ${PAYBC_BASE_URL}
@@ -107,18 +108,19 @@ services:
       AUTH0_AUDIENCE: ${AUTH0_AUDIENCE}
       AUTH0_IGNORE_EXP: ${AUTH0_IGNORE_EXP}
       DOPS_CVSE_FORMS_CACHE_TTL_MS: ${DOPS_CVSE_FORMS_CACHE_TTL_MS}
-      DOPS_S3_ACCESS_TYPE: ${DOPS_S3_ACCESS_TYPE}
-      DOPS_S3_ACCESSKEYID: ${DOPS_S3_ACCESSKEYID}
-      DOPS_S3_BUCKET: ${DOPS_S3_BUCKET}
-      DOPS_S3_PRESIGNED_URL_EXPIRY: ${DOPS_S3_PRESIGNED_URL_EXPIRY}
-      DOPS_S3_ENDPOINT: ${DOPS_S3_ENDPOINT}
-      DOPS_S3_KEY: ${DOPS_S3_KEY}
-      DOPS_S3_SECRETACCESSKEY: ${DOPS_S3_SECRETACCESSKEY}
+      OCIO_S3_ACCESSKEYID: ${OCIO_S3_ACCESSKEYID}
+      OCIO_S3_BUCKET: ${OCIO_S3_BUCKET}
+      OCIO_S3_PRESIGNED_URL_EXPIRY: ${OCIO_S3_PRESIGNED_URL_EXPIRY}
+      OCIO_S3_ENDPOINT: ${OCIO_S3_ENDPOINT}
+      OCIO_S3_KEY: ${OCIO_S3_KEY}
+      OCIO_S3_SECRETACCESSKEY: ${OCIO_S3_SECRETACCESSKEY}
       CDOGS_TOKEN_URL: ${CDOGS_TOKEN_URL}
       CDOGS_CLIENT_ID: ${CDOGS_CLIENT_ID}
       CDOGS_CLIENT_SECRET: ${CDOGS_CLIENT_SECRET}
       CDOGS_URL: ${CDOGS_URL}
       ACCESS_API_URL: "http://vehicles-api:5000"
+      DOPS_URL: "http://dops-api:5001"
+      FRONTEND_URL: "http://frontend:3000"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:5001/"]
       interval: 1m30s
@@ -182,13 +184,12 @@ services:
       AUTH0_AUDIENCE: ${AUTH0_AUDIENCE}
       AUTH0_IGNORE_EXP: ${AUTH0_IGNORE_EXP}
       DOPS_CVSE_FORMS_CACHE_TTL_MS: ${DOPS_CVSE_FORMS_CACHE_TTL_MS}
-      DOPS_S3_ACCESS_TYPE: ${DOPS_S3_ACCESS_TYPE}
-      DOPS_S3_ACCESSKEYID: ${DOPS_S3_ACCESSKEYID}
-      DOPS_S3_BUCKET: ${DOPS_S3_BUCKET}
-      DOPS_S3_PRESIGNED_URL_EXPIRY: ${DOPS_S3_PRESIGNED_URL_EXPIRY}
-      DOPS_S3_ENDPOINT: ${DOPS_S3_ENDPOINT}
-      DOPS_S3_KEY: ${DOPS_S3_KEY}
-      DOPS_S3_SECRETACCESSKEY: ${DOPS_S3_SECRETACCESSKEY}
+      OCIO_S3_ACCESSKEYID: ${OCIO_S3_ACCESSKEYID}
+      OCIO_S3_BUCKET: ${OCIO_S3_BUCKET}
+      OCIO_S3_PRESIGNED_URL_EXPIRY: ${OCIO_S3_PRESIGNED_URL_EXPIRY}
+      OCIO_S3_ENDPOINT: ${OCIO_S3_ENDPOINT}
+      OCIO_S3_KEY: ${OCIO_S3_KEY}
+      OCIO_S3_SECRETACCESSKEY: ${OCIO_S3_SECRETACCESSKEY}
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:5050/"]
       interval: 1m30s

diff --git a/dops/Dockerfile b/dops/Dockerfile
@@ -29,7 +29,7 @@ RUN mkdir /.cache && chmod 777 /.cache
 WORKDIR /app
 
 # Set node to production
-ENV NODE_ENV production
+ENV NODE_ENV ${NODE_ENV}
 
 # Set environment variables
 ENV DB_TYPE ${DB_TYPE}
@@ -50,18 +50,19 @@ ENV AUTH0_ISSUER_URL ${AUTH0_ISSUER_URL}
 ENV AUTH0_AUDIENCE ${AUTH0_AUDIENCE}
 ENV AUTH0_IGNORE_EXP ${AUTH0_IGNORE_EXP}
 ENV DOPS_CVSE_FORMS_CACHE_TTL_MS ${DOPS_CVSE_FORMS_CACHE_TTL_MS}
-ENV DOPS_S3_ACCESS_TYPE ${DOPS_S3_ACCESS_TYPE}
-ENV DOPS_S3_ACCESSKEYID ${DOPS_S3_ACCESSKEYID}
-ENV DOPS_S3_BUCKET ${DOPS_S3_BUCKET}
-ENV DOPS_S3_PRESIGNED_URL_EXPIRY ${DOPS_S3_PRESIGNED_URL_EXPIRY}
-ENV DOPS_S3_ENDPOINT ${DOPS_S3_ENDPOINT}
-ENV DOPS_S3_KEY ${DOPS_S3_KEY}
-ENV DOPS_S3_SECRETACCESSKEY ${DOPS_S3_SECRETACCESSKEY}
+ENV OCIO_S3_ACCESSKEYID ${OCIO_S3_ACCESSKEYID}
+ENV OCIO_S3_BUCKET ${OCIO_S3_BUCKET}
+ENV OCIO_S3_PRESIGNED_URL_EXPIRY ${OCIO_S3_PRESIGNED_URL_EXPIRY}
+ENV OCIO_S3_ENDPOINT ${OCIO_S3_ENDPOINT}
+ENV OCIO_S3_KEY ${OCIO_S3_KEY}
+ENV OCIO_S3_SECRETACCESSKEY ${OCIO_S3_SECRETACCESSKEY}
 ENV CDOGS_TOKEN_URL ${CDOGS_TOKEN_URL}
 ENV CDOGS_CLIENT_ID ${CDOGS_CLIENT_ID}
 ENV CDOGS_CLIENT_SECRET ${CDOGS_CLIENT_SECRET}
 ENV CDOGS_URL ${CDOGS_URL}
 ENV ACCESS_API_URL ${ACCESS_API_URL}
+ENV DOPS_URL ${DOPS_URL}
+ENV FRONTEND_URL ${FRONTEND_URL}
 
 # Copy production files from build
 COPY --from=builder /app/package*.json ./