Fix delete review app workflow

DFE-Digital · Jan 31, 2024 · 1d44d4e · 1d44d4e
1 parent a7a0a5e
commit 1d44d4e
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 17 deletions.
diff --git a/.github/workflows/aks_destroy_review.yml b/.github/workflows/aks_destroy_review.yml
@@ -30,8 +30,8 @@ jobs:
 
           echo "TF_STATE_FILE=$state_file_name" >> $GITHUB_ENV
 
-          state_file_status=$(az storage blob list -c cpdecf-tfstate \
-            --account-name "s189t01cpdecftfstatervsa" \
+          state_file_status=$(az storage blob list -c terraform-state \
+            --account-name "s189t01cpdtshrvtfsa" \
             --prefix $state_file_name --query "[].name" -o tsv)
 
           if [ -n "$state_file_status" ]; then
@@ -56,5 +56,5 @@ jobs:
       - name: Delete Terraform state file
         if: env.TF_STATE_EXISTS == 'true'
         run: |
-          az storage blob delete -c cpdecf-tfstate --name ${{ env.TF_STATE_FILE }} \
-            --account-name "s189t01cpdecftfstatervsa"
+          az storage blob delete -c terraform-state --name ${{ env.TF_STATE_FILE }} \
+            --account-name "s189t01cpdtshrvtfsa"
diff --git a/Makefile b/Makefile
@@ -74,6 +74,9 @@ terraform-plan: terraform-init
 terraform-apply: terraform-init
 	terraform -chdir=terraform/application apply -var-file "config/${CONFIG}.tfvars.json" ${AUTO_APPROVE}
 
+terraform-destroy: terraform-init
+	terraform -chdir=terraform/application destroy -var-file "config/${CONFIG}.tfvars.json" ${AUTO_APPROVE}
+
 set-what-if:
 	$(eval WHAT_IF=--what-if)
 

diff --git a/terraform/application/.terraform.lock.hcl b/terraform/application/.terraform.lock.hcl