Sub envs value coming from makefile

Author: robertnovac1

terraform/Makefile

@@ -2,7 +2,9 @@
 
 tf_cmd = AWS_PROFILE=$(AWS_PROFILE) terraform
 tf_state= -backend-config="bucket=$(STATE_BUCKET_NAME)"
-tf_vars= -var-file="./environments/$(ENVIRONMENT)/$(SUB_ENVIRONMENT)/variables.tfvars"
+
+sub_env_folder := $(if $(findstring pr-,$(SUB_ENVIRONMENT)),pr,$(SUB_ENVIRONMENT))
+tf_vars= -var="sub_environment=$(SUB_ENVIRONMENT)" -var-file="./environments/$(ENVIRONMENT)/$(sub_env_folder)/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

terraform/environments/int/blue/variables.tfvars

@@ -1,5 +1,4 @@
 environment             = "int"
-sub_environment         = "blue"
 immunisation_account_id = "084828561157"
 dspp_core_account_id    = "603871901111"
 pds_check_enabled       = false

terraform/environments/int/green/variables.tfvars

@@ -1,5 +1,4 @@
 environment             = "int"
-sub_environment         = "green"
 immunisation_account_id = "084828561157"
 dspp_core_account_id    = "603871901111"
 pds_check_enabled       = false

terraform/environments/non-prod/int/variables.tfvars

@@ -1,5 +1,4 @@
 environment             = "dev"
-sub_environment         = "int"
 immunisation_account_id = "345594581768"
 dspp_core_account_id    = "603871901111"
 pds_check_enabled       = false

terraform/environments/non-prod/internal-dev/variables.tfvars

@@ -1,5 +1,4 @@
 environment             = "dev"
-sub_environment         = "internal-dev"
 immunisation_account_id = "345594581768"
 dspp_core_account_id    = "603871901111"
 create_config_bucket    = true

terraform/environments/non-prod/pr/variables.tfvars

@@ -1,4 +1,3 @@
 environment             = "dev"
-sub_environment         = "pr"
 immunisation_account_id = "345594581768"
 dspp_core_account_id    = "603871901111"

terraform/environments/non-prod/ref/variables.tfvars

@@ -1,5 +1,4 @@
 environment             = "dev"
-sub_environment         = "ref"
 immunisation_account_id = "345594581768"
 dspp_core_account_id    = "603871901111"
 pds_environment         = "ref"

terraform/environments/prod/blue/variables.tfvars

@@ -1,4 +1,3 @@
 environment             = "prod"
-sub_environment         = "blue"
 immunisation_account_id = "664418956997"
 pds_environment         = "prod"

terraform/environments/prod/green/variables.tfvars

@@ -1,4 +1,3 @@
 environment             = "prod"
-sub_environment         = "green"
 immunisation_account_id = "664418956997"
 pds_environment         = "prod"

terraform/variables.tf

@@ -1,5 +1,9 @@
 variable "environment" {}
-variable "sub_environment" {}
+
+variable "sub_environment" {
+  description = "The value is passed in the makefile"
+}
+
 variable "immunisation_account_id" {}
 variable "dspp_core_account_id" {}
 # For now, only create the config bucket in internal-dev and prod as we only have one Redis instance per account.
@@ -39,7 +43,6 @@ variable "root_domain" {
 }
 
 locals {
-  sub_environment     = can(regex("pr-", var.sub_environment)) ? terraform.workspace : var.sub_environment
   prefix              = "${var.project_name}-${var.service}-${var.sub_environment}"
   short_prefix        = "${var.project_short_name}-${var.sub_environment}"
   batch_prefix        = "immunisation-batch-${var.sub_environment}"