environment issues

Author: Akol125

azure/azure-pr-teardown-pipeline.yml

@@ -47,11 +47,8 @@ jobs:
       - bash: |
           export AWS_PROFILE=apim-dev
 
-          export ENVIRONMENT="internal-dev"
-          export bucket_name="immunisation-internal-dev-terraform-state-files"
           cd terraform
-          make init
-
+          make init environment="dev" sub_environment="$WORKSPACE"
           make workspace sub_environment="$WORKSPACE"
 
           # Extract values from Terraform state before destroying
@@ -80,11 +77,9 @@ jobs:
 
       - bash: |
           export AWS_PROFILE=apim-dev
-          export ENVIRONMENT="dev"
-          export SUB_ENVIRONMENT="$WORKSPACE"
 
           cd terraform
           make workspace sub_environment="$SUB_ENVIRONMENT"
-          make destroy environment="$ENVIRONMENT" sub_environment="$SUB_ENVIRONMENT"
+          make destroy environment="dev" sub_environment="$WORKSPACE"
         displayName: Destroy terraform PR workspace and linked resources
         retryCountOnTaskFailure: 2

terraform/Makefile

@@ -6,7 +6,8 @@ sub_environment_dir := $(if $(findstring pr-,$(sub_environment)),pr,$(sub_enviro
 
 tf_cmd = AWS_PROFILE=$(AWS_PROFILE) terraform
 
-bucket_name = $(if $(filter dev,$(environment)),immunisation-$(sub_environment),immunisation-$(environment))-terraform-state-files
+is_pr := $(findstring pr-,$(sub_environment))
+bucket_name = $(if $(is_pr),immunisation-internal-dev,immunisation-$(environment))-terraform-state-files
 
 tf_state = -backend-config="bucket=$(bucket_name)"