Refactoring

Author: robertnovac1

terraform/.terraform.lock.hcl

@@ -1,26 +1,16 @@
 -include .env
 
-interactionId = $(ENVIRONMENT)# to change to lower case
-environment = $(ENVIRONMENT)
-aws_profile = $(AWS_PROFILE)#apim-dev # Leave this here for pipeline
-tf_cmd = AWS_PROFILE=$(aws_profile) terraform
-
-project_name = immunisation
-project_short_name = imms
-state_bucket = $(BUCKET_NAME)#$(project_name)-$(APIGEE_ENVIRONMENT)-terraform-state-files
-tf_state= -backend-config="bucket=$(state_bucket)"
-
-tf_vars= -var="project_name=$(project_name)" -var="project_short_name=$(project_short_name)"
-
-.PHONY : lock-provider workspace init plan apply clean destroy output state-list lambda-zip catch-all-zip
+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"
 
 lock-provider:
 	# Run this only when you install a new terraform provider. This will generate sha code in lock file for all platform
 	echo "This may take a while. Be patient!"
 	$(tf_cmd) providers lock -platform=darwin_arm64 -platform=darwin_amd64 -platform=linux_amd64 -platform=windows_amd64
 
 workspace:
-	$(tf_cmd) workspace new $(ENVIRONMENT) || $(tf_cmd) workspace select $(ENVIRONMENT) && echo "Switched to workspace/environment: $(ENVIRONMENT)"
+	$(tf_cmd) workspace new $(SUB_ENVIRONMENT) || $(tf_cmd) workspace select $(SUB_ENVIRONMENT) && echo "Switched to workspace/environment: $(SUB_ENVIRONMENT)"
 
 init:
 	$(tf_cmd) init $(tf_state) -upgrade  $(tf_vars)
@@ -43,7 +33,7 @@ clean:
 destroy: workspace
 	$(tf_cmd) destroy $(tf_vars) -auto-approve
 	$(tf_cmd) workspace select default
-	$(tf_cmd) workspace delete $(ENVIRONMENT)
+	$(tf_cmd) workspace delete $(SUB_ENVIRONMENT)
 
 output:
 	$(tf_cmd) output -raw $(name)
@@ -62,3 +52,5 @@ catch-all-zip:
 
 tf-%:
 	$(tf_cmd) $*
+
+.PHONY : lock-provider workspace init plan apply clean destroy output state-list lambda-zip catch-all-zip

terraform/Makefile

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

terraform/environments/int/blue/variables.tfvars

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

terraform/environments/int/green/variables.tfvars

@@ -1,3 +1,4 @@
 environment             = "non-prod"
 sub_environment         = "int"
 immunisation_account_id = "345594581768"
+dspp_core_account_id    = "603871901111"

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

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

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

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

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

@@ -1,3 +1,4 @@
 environment             = "non-prod"
 sub_environment         = "ref"
 immunisation_account_id = "345594581768"
+dspp_core_account_id    = "603871901111"

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

@@ -21,7 +21,7 @@ resource "aws_ecr_repository" "operation_lambda_repository" {
 #resource "docker_image" "lambda_function_docker" {
 module "docker_image" {
   source  = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version = "7.21.1"
+  version = "8.0.1"
 
   create_ecr_repo  = false
   ecr_repo         = "${local.prefix}-operation-lambda-repo"

terraform/lambda.tf

@@ -20,7 +20,7 @@ resource "aws_ecr_repository" "mesh_file_converter_lambda_repository" {
 module "mesh_processor_docker_image" {
   count   = var.environment == "int" ? 0 : 1
   source  = "terraform-aws-modules/lambda/aws//modules/docker-build"
-  version = "7.21.1"
+  version = "8.0.1"
 
   create_ecr_repo = false
   ecr_repo        = aws_ecr_repository.mesh_file_converter_lambda_repository[0].name