Update deployment config (#95)

Relates to #51
chanzuckerberg · Oct 17, 2023 · 1709ab6 · 1709ab6
1 parent ff1bfda
commit 1709ab6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/prod-deploy.yml b/.github/workflows/prod-deploy.yml
@@ -7,13 +7,13 @@ permissions:
       id-token: write
       contents: read
 
-concurrency:
-  group: ${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
 
   deploy-to-prod:
+    concurrency:
+      group: prod-frontend-deploy-${{ github.ref }}
+      cancel-in-progress: true
+
     name: deploy prod branch
     runs-on: ubuntu-latest
     environment: prod
@@ -36,7 +36,7 @@ jobs:
           DOCKER_REPO: ${{ secrets.ECR_REPO }}/
           ENV: prod
         with:
-          stack-name: prod
+          stack-name: frontend
           create-tag: true
           tag: ${{ env.STACK_NAME }}
           tfe-token: ${{ secrets.TFE_TOKEN }}

diff --git a/.github/workflows/staging-deploy.yml b/.github/workflows/staging-deploy.yml
@@ -10,12 +10,12 @@ permissions:
   id-token: write
   contents: read
 
-concurrency:
-  group: ${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   deploy-to-staging:
+    concurrency:
+      group: staging-frontend-deploy-${{ github.ref }}
+      cancel-in-progress: true
+
     name: deploy staging branch
     runs-on: ubuntu-latest
     environment: staging
@@ -38,7 +38,7 @@ jobs:
           DOCKER_REPO: ${{ secrets.ECR_REPO }}/
           ENV: staging
         with:
-          stack-name: staging
+          stack-name: frontend
           create-tag: true
           tag: ${{ env.STACK_NAME }}
           tfe-token: ${{ secrets.TFE_TOKEN }}

diff --git a/frontend/.happy/terraform/envs/prod/providers.tf b/frontend/.happy/terraform/envs/prod/providers.tf
@@ -24,6 +24,5 @@ data "kubernetes_namespace" "happy-namespace" {
   }
 }
 provider "datadog" {
-  app_key = "FAKE_APP_KEY"
-  api_key = "FAKE_API_KEY"
+  validate = false
 }
diff --git a/frontend/.happy/terraform/envs/staging/providers.tf b/frontend/.happy/terraform/envs/staging/providers.tf
@@ -24,6 +24,5 @@ data "kubernetes_namespace" "happy-namespace" {
   }
 }
 provider "datadog" {
-  app_key = "FAKE_APP_KEY"
-  api_key = "FAKE_API_KEY"
+  validate = false
 }