env

Author: Akol125

azure/azure-pr-teardown-pipeline.yml

@@ -47,21 +47,17 @@ jobs:
           export AWS_PROFILE=apim-dev
           account_id="$(aws sts get-caller-identity --query Account --output text)"
 
-          export sub_environment="$(WORKSPACE)"
-
-          BUCKET_NAME="immunisation-${sub_environment}-terraform-state-files"
-          FALLBACK_BUCKET_NAME="immunisation-internal-dev-terraform-state-files"
-
           export ENVIRONMENT="internal-dev"
-          export BUCKET_NAME="$FALLBACK_BUCKET_NAME"
-          cd terraform
+          export BUCKET_NAME="immunisation-internal-dev-terraform-state-files"
+          make init
           make init
 
-          export ENVIRONMENT="$sub_environment"
-          export BUCKET_NAME="immunisation-${sub_environment}-terraform-state-files"
+          export ENVIRONMENT="dev"
+          export SUB_ENVIRONMENT="pr-711"
+          export BUCKET_NAME="immunisation-pr-711-terraform-state-files"
 
           cd terraform
-          make workspace sub_environment=$sub_environment
-          make destroy sub_environment=$sub_environment aws_account_no=${account_id}
+          terraform workspace select $(WORKSPACE)
+          make destroy aws_account_no=${account_id} environment=$(WORKSPACE)
         displayName: Destroy terraform PR workspace and linked resources
         retryCountOnTaskFailure: 2

terraform/Makefile

@@ -12,7 +12,7 @@ tf_state = -backend-config="bucket=$(bucket_name)"
 
 tf_vars = \
   -var="sub_environment=$(sub_environment)" \
-  -var-file=./environments/$(sub_environment)/variables.tfvars
+  -var-file=./environments/$(environment)/$(sub_environment_dir)/variables.tfvars
 
 lock-provider:
 	# Run this only when you install a new terraform provider. This will generate sha code in lock file for all platform