Cleanup and removed unused resources

Author: robertnovac1

terraform/Makefile

@@ -19,7 +19,7 @@ init-reconfigure:
 	$(tf_cmd) init $(tf_state) -upgrade $(tf_vars) -reconfigure
 
 plan: workspace
-	 $(tf_cmd) plan $(tf_vars) -out=tfplan
+	 $(tf_cmd) plan $(tf_vars)
 
 plan-changes: workspace
 	 $(tf_cmd) plan $(tf_vars) -out=plan && $(tf_cmd) show -no-color -json plan | jq -r '.resource_changes[] | select(.change.actions[0]=="update" or .change.actions[0]=="create" or .change.actions[0]=="add") | .address'

terraform/endpoints.tf

@@ -112,7 +112,8 @@ 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     = var.sub_environment
+  environment     = var.environment
+  sub_environment = var.sub_environment
   oas             = local.oas
 }
 

terraform/main.tf

@@ -101,3 +101,7 @@ data "aws_kms_key" "existing_kinesis_encryption_key" {
 data "aws_kms_key" "mesh_s3_encryption_key" {
   key_id = "alias/local-immunisation-mesh"
 }
+
+data "aws_route53_zone" "project_zone" {
+  name = local.project_domain_name
+}

terraform/modules/api_gateway/variables.tf

@@ -3,4 +3,5 @@ variable "short_prefix" {}
 variable "zone_id" {}
 variable "api_domain_name" {}
 variable "environment" {}
+variable "sub_environment" {}
 variable "oas" {}

terraform/route53.tf

@@ -30,19 +30,22 @@ variable "pds_environment" {
   default = "int"
 }
 
-locals {
-  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}"
+variable "root_domain" {
+  default = "imms.dev.vds.platform.nhs.uk"
+}
 
-  vpc_name            = "imms-${var.sub_environment}-fhir-api-vpc"
-  root_domain         = "${var.sub_environment}.${var.environment}.vds.platform.nhs.uk"
-  project_domain_name = data.aws_route53_zone.project_zone.name
+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}"
+  vpc_name            = "imms-${var.environment}-fhir-api-vpc"
+  root_domain_name    = "${var.environment}.vds.platform.nhs.uk"
+  project_domain_name = "imms.${local.root_domain_name}"
   service_domain_name = "${var.sub_environment}.${local.project_domain_name}"
-
-  config_bucket_arn  = aws_s3_bucket.batch_config_bucket.arn
-  config_bucket_name = aws_s3_bucket.batch_config_bucket.bucket
-  is_temp            = length(regexall("[a-z]{2,4}-?[0-9]+", var.sub_environment)) > 0
+  config_bucket_arn   = aws_s3_bucket.batch_config_bucket.arn
+  config_bucket_name  = aws_s3_bucket.batch_config_bucket.bucket
+  is_temp             = length(regexall("[a-z]{2,4}-?[0-9]+", var.sub_environment)) > 0
 
   # Public subnet - The subnet has a direct route to an internet gateway. Resources in a public subnet can access the public internet.
   # public_subnet_ids = [for k, v in data.aws_route.internet_traffic_route_by_subnet : k if length(v.gateway_id) > 0]