From d0114a46c50f40ecfc06c368b04d271307a11cfd Mon Sep 17 00:00:00 2001
From: halprin <halprin@users.noreply.github.com>
Date: Mon, 5 Feb 2024 12:36:29 -0700
Subject: [PATCH] Use environments for the different deploys

---
 .github/workflows/cicd.yml                      | 1 +
 .github/workflows/deploy_reusable.yml           | 2 ++
 .github/workflows/dev-deploy.yml                | 1 +
 .github/workflows/internal-deploy.yml           | 1 +
 .github/workflows/prod-deploy.yml               | 3 ++-
 .github/workflows/terraform-ci-deploy.yml       | 3 +++
 .github/workflows/terraform-deploy_reusable.yml | 5 +++++
 7 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index b533eba28..058604190 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -19,6 +19,7 @@ jobs:
     needs: ci
     uses: ./.github/workflows/terraform-deploy_reusable.yml
     with:
+      ENVIRONMENT: stg
       TERRAFORM_DIRECTORY: operations/environments/staging
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CDC_CLIENT_ID }}
diff --git a/.github/workflows/deploy_reusable.yml b/.github/workflows/deploy_reusable.yml
index dd72943f0..e891fb2b8 100644
--- a/.github/workflows/deploy_reusable.yml
+++ b/.github/workflows/deploy_reusable.yml
@@ -30,6 +30,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    environment:
+      name: ${{ inputs.ENVIRONMENT }}
     permissions:
       id-token: write
       contents: read
diff --git a/.github/workflows/dev-deploy.yml b/.github/workflows/dev-deploy.yml
index 7c9b81b3d..5f1318c3b 100644
--- a/.github/workflows/dev-deploy.yml
+++ b/.github/workflows/dev-deploy.yml
@@ -12,6 +12,7 @@ jobs:
     name: Dev Infrastructure Deploy
     uses: ./.github/workflows/terraform-deploy_reusable.yml
     with:
+      ENVIRONMENT: dev
       TERRAFORM_DIRECTORY: operations/environments/dev
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CDC_CLIENT_ID }}
diff --git a/.github/workflows/internal-deploy.yml b/.github/workflows/internal-deploy.yml
index 874e57cbc..7574b2c4d 100644
--- a/.github/workflows/internal-deploy.yml
+++ b/.github/workflows/internal-deploy.yml
@@ -12,6 +12,7 @@ jobs:
     name: Internal Infrastructure Deploy
     uses: ./.github/workflows/terraform-deploy_reusable.yml
     with:
+      ENVIRONMENT: internal
       TERRAFORM_DIRECTORY: operations/environments/internal
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
diff --git a/.github/workflows/prod-deploy.yml b/.github/workflows/prod-deploy.yml
index 2b4828c37..0d0837f80 100644
--- a/.github/workflows/prod-deploy.yml
+++ b/.github/workflows/prod-deploy.yml
@@ -16,6 +16,7 @@ jobs:
     needs: ci
     uses: ./.github/workflows/terraform-deploy_reusable.yml
     with:
+      ENVIRONMENT: prd
       TERRAFORM_DIRECTORY: operations/environments/prod
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CDC_CLIENT_ID }}
@@ -27,7 +28,7 @@ jobs:
     needs: terraform-deploy
     uses: ./.github/workflows/deploy_reusable.yml
     with:
-      ENVIRONMENT: prod
+      ENVIRONMENT: prd
       REPO: trusted-intermediary-router
       REPO_DOCS: trusted-intermediary-docs
       APP: ${{ needs.terraform-deploy.outputs.APP }}
diff --git a/.github/workflows/terraform-ci-deploy.yml b/.github/workflows/terraform-ci-deploy.yml
index 482828a6c..f02bcdcc1 100644
--- a/.github/workflows/terraform-ci-deploy.yml
+++ b/.github/workflows/terraform-ci-deploy.yml
@@ -31,6 +31,7 @@ jobs:
     uses: ./.github/workflows/terraform-deploy_reusable.yml
     if: needs.paths-filter.outputs.operations == 'true'
     with:
+      ENVIRONMENT: pr
       TERRAFORM_DIRECTORY: operations/environments/pr
       TERRAFORM_INIT_PARAMETERS: -backend-config="key=pr_${{ github.event.number }}.tfstate"
       TERRAFORM_APPLY_PARAMETERS: -var="pr_number=${{ github.event.number }}"
@@ -76,6 +77,8 @@ jobs:
 
   destroy-environment:
     name: Destroy PR Environment
+    environment:
+      name: pr
     needs:
       - pr-deploy
       - paths-filter
diff --git a/.github/workflows/terraform-deploy_reusable.yml b/.github/workflows/terraform-deploy_reusable.yml
index 393294c3b..164225f3e 100644
--- a/.github/workflows/terraform-deploy_reusable.yml
+++ b/.github/workflows/terraform-deploy_reusable.yml
@@ -3,6 +3,9 @@ name: Terraform Deploy
 on:
   workflow_call:
     inputs:
+      ENVIRONMENT:
+        required: true
+        type: string
       TERRAFORM_DIRECTORY:
         type: string
         required: true
@@ -32,6 +35,8 @@ on:
 jobs:
   terraform-deploy:
     name: Terraform Deploy
+    environment:
+      name: ${{ inputs.ENVIRONMENT }}
     runs-on: ubuntu-latest
     env:
       ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}