Merge branch 'main' into api-secret-migration

cds-snc · Oct 29, 2024 · 07afd5e · 07afd5e
2 parents 7c69075 + c8f2a39
commit 07afd5e
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 17 deletions.
diff --git a/.github/workflows/merge_to_main_production.yaml b/.github/workflows/merge_to_main_production.yaml
@@ -9,7 +9,7 @@ on:
 
 env:
   PRIVATE_ECR: ${{ secrets.PRODUCTION_AWS_ACCOUNT }}.dkr.ecr.ca-central-1.amazonaws.com/notify
-  API_LAMBDA_IMAGE: api-lambda:ae6543a
+  API_LAMBDA_IMAGE: api-lambda:2d0c0dd
   HEARTBEAT_IMAGE: heartbeat:5c8da95
   SYSTEM_STATUS_IMAGE: system_status:078cf82
   OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.PRODUCTION_OP_SERVICE_ACCOUNT_TOKEN }}

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.72.42
+v0.73.1
diff --git a/base/notify-api/api-deployment.yaml b/base/notify-api/api-deployment.yaml
@@ -264,6 +264,10 @@ spec:
               value: 'True'
             - name: CACHE_CLEAR_CLIENT_SECRET
               value: '$(CACHE_CLEAR_CLIENT_SECRET)'
+            - name: CYPRESS_USER_PW_SECRET
+              value: '$(CYPRESS_USER_PW_SECRET)'
+            - name: CYPRESS_AUTH_CLIENT_SECRET
+              value: '$(CYPRESS_AUTH_CLIENT_SECRET)'
           resources:
             requests:
               cpu: "200m"

diff --git a/env.example b/env.example
@@ -78,3 +78,5 @@ AWS_US_TOLL_FREE_NUMBER=
 SRE_CLIENT_SECRET=
 CACHE_CLEAR_CLIENT_SECRET=
 FF_RTL=
+CYPRESS_USER_PW_SECRET=
+CYPRESS_AUTH_CLIENT_SECRET=
diff --git a/env/dev/.env.zip.enc.aws b/env/dev/.env.zip.enc.aws
diff --git a/env/dev/kustomization.yaml b/env/dev/kustomization.yaml
@@ -612,3 +612,17 @@ vars:
       apiVersion: v1
       kind: ConfigMap
       name: application-config
+  - fieldref:
+      fieldPath: data.CYPRESS_USER_PW_SECRET
+    name: CYPRESS_USER_PW_SECRET
+    objref:
+      apiVersion: v1
+      kind: ConfigMap
+      name: application-config
+  - fieldref:
+      fieldPath: data.CYPRESS_AUTH_CLIENT_SECRET
+    name: CYPRESS_AUTH_CLIENT_SECRET
+    objref:
+      apiVersion: v1
+      kind: ConfigMap
+      name: application-config
diff --git a/env/production/.env.zip.enc.aws b/env/production/.env.zip.enc.aws
diff --git a/env/production/kustomization.yaml b/env/production/kustomization.yaml
@@ -60,7 +60,7 @@ images:
   - name: admin
     newName: public.ecr.aws/cds-snc/notify-admin:618014e
   - name: api
-    newName: public.ecr.aws/cds-snc/notify-api:ae6543a
+    newName: public.ecr.aws/cds-snc/notify-api:2d0c0dd
   - name: document-download-api
     newName: public.ecr.aws/cds-snc/notify-document-download-api:fc59224
   - name: documentation
@@ -599,3 +599,17 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.FF_RTL
+  - name: CYPRESS_USER_PW_SECRET
+    objref:
+      kind: ConfigMap
+      name: application-config
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.CYPRESS_USER_PW_SECRET
+  - name: CYPRESS_AUTH_CLIENT_SECRET
+    objref:
+      kind: ConfigMap
+      name: application-config
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.CYPRESS_AUTH_CLIENT_SECRET
diff --git a/env/sandbox/kustomization.yaml b/env/sandbox/kustomization.yaml
@@ -599,17 +599,31 @@ vars:
       apiVersion: v1
       kind: ConfigMap
       name: application-config
-- fieldref:
-    fieldPath: data.CACHE_CLEAR_CLIENT_SECRET
-  name: CACHE_CLEAR_CLIENT_SECRET
-  objref:
-    apiVersion: v1
-    kind: ConfigMap
-    name: application-config
-- fieldref:
-    fieldPath: data.FF_RTL
-  name: FF_RTL
-  objref:
-    apiVersion: v1
-    kind: ConfigMap
-    name: application-config
+  - fieldref:
+      fieldPath: data.CACHE_CLEAR_CLIENT_SECRET
+    name: CACHE_CLEAR_CLIENT_SECRET
+    objref:
+      apiVersion: v1
+      kind: ConfigMap
+      name: application-config
+  - fieldref:
+      fieldPath: data.FF_RTL
+    name: FF_RTL
+    objref:
+      apiVersion: v1
+      kind: ConfigMap
+      name: application-config
+  - fieldref:
+      fieldPath: data.CYPRESS_USER_PW_SECRET
+    name: CYPRESS_USER_PW_SECRET
+    objref:
+      apiVersion: v1
+      kind: ConfigMap
+      name: application-config
+  - fieldref:
+      fieldPath: data.CYPRESS_AUTH_CLIENT_SECRET
+    name: CYPRESS_AUTH_CLIENT_SECRET
+    objref:
+      apiVersion: v1
+      kind: ConfigMap
+      name: application-config
diff --git a/env/staging/.env.zip.enc.aws b/env/staging/.env.zip.enc.aws
diff --git a/env/staging/kustomization.yaml b/env/staging/kustomization.yaml
@@ -613,3 +613,17 @@ vars:
       apiVersion: v1
       kind: ConfigMap
       name: application-config
+  - fieldref:
+      fieldPath: data.CYPRESS_USER_PW_SECRET
+    name: CYPRESS_USER_PW_SECRET
+    objref:
+      apiVersion: v1
+      kind: ConfigMap
+      name: application-config
+  - fieldref:
+      fieldPath: data.CYPRESS_AUTH_CLIENT_SECRET
+    name: CYPRESS_AUTH_CLIENT_SECRET
+    objref:
+      apiVersion: v1
+      kind: ConfigMap
+      name: application-config