Updated terraform folder to handle new INT account

Author: robertnovac1

terraform/.terraform.lock.hcl

@@ -1,16 +1,14 @@
 -include .env
 
-interactionId=$(environment)
-
-aws_profile = apim-dev
-tf_cmd = AWS_PROFILE=$(aws_profile) terraform
+environment ?= $(ENVIRONMENT)
+aws_account_name ?= $(AWS_ACCOUNT_NAME)
+tf_cmd = AWS_PROFILE=$(AWS_PROFILE) terraform
 
 project_name = immunisation
 project_short_name = imms
-state_bucket = $(project_name)-$(APIGEE_ENVIRONMENT)-terraform-state-files
-tf_state= -backend-config="bucket=$(state_bucket)"
+tf_state= -backend-config="bucket=$(BUCKET_NAME)"
 
-tf_vars= -var="project_name=$(project_name)" -var="project_short_name=$(project_short_name)"
+tf_vars= -var="project_name=$(project_name)" -var="project_short_name=$(project_short_name)" -var="aws_account_name=$(aws_account_name)"
 
 .PHONY : lock-provider workspace init plan apply clean destroy output state-list lambda-zip catch-all-zip
 
@@ -25,7 +23,10 @@ workspace:
 init:
 	$(tf_cmd) init $(tf_state) -upgrade  $(tf_vars)
 
-plan: workspace
+init-reconfigure:
+	$(tf_cmd) init $(tf_state) -upgrade  $(tf_vars) -reconfigure
+
+plan:
 	 $(tf_cmd) plan $(tf_vars)
 
 plan-changes: workspace

terraform/Makefile

@@ -6,6 +6,6 @@ variable "environment" {}
 variable "oas" {}
 
 locals {
-    environment         = terraform.workspace == "green" ? "prod" : terraform.workspace == "blue" ? "prod" : terraform.workspace
-    config_env = local.environment == "prod" ? "prod" : "dev"
+  environment = var.environment
+  config_env  = var.environment
 }

terraform/api_gateway/variables.tf

@@ -1,6 +1,6 @@
 locals {
   // Flag so we can force delete s3 buckets with items in for pr and shortcode environments only.
   is_temp                 = length(regexall("[a-z]{2,4}-?[0-9]+", local.env)) > 0
-  dspp_core_account_id    = local.environment == "prod" ? 232116723729 : 603871901111
-  immunisation_account_id = local.environment == "prod" ? 664418956997 : 084828561157
+  dspp_core_account_id    = local.environment == "prod" ? "232116723729" : "603871901111"
+  immunisation_account_id = local.environment == "prod" ? "664418956997" : "084828561157"
 }

terraform/configs.tf

@@ -107,7 +107,7 @@ module "api_gateway" {
   short_prefix    = local.short_prefix
   zone_id         = data.aws_route53_zone.project_zone.zone_id
   api_domain_name = local.service_domain_name
-  environment     = local.environment
+  environment     = var.aws_account_name
   oas             = local.oas
 }
 

terraform/endpoints.tf

@@ -17,8 +17,8 @@ terraform {
 }
 
 provider "aws" {
-  region  = var.aws_region
-  profile = "apim-dev"
+  region = var.aws_region
+  #profile = "apim-dev"
   default_tags {
     tags = {
       Project     = var.project_name