Use environments for the different deploys

.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 }}

.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

.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 }}

.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 }}

.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 }}

.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

.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 }}