Names fixed to handle AWS global unique names for S3 and dynamo

Author: robertnovac1

terraform/Makefile

@@ -26,7 +26,7 @@ init:
 init-reconfigure:
 	$(tf_cmd) init $(tf_state) -upgrade  $(tf_vars) -reconfigure
 
-plan:
+plan: workspace
 	 $(tf_cmd) plan $(tf_vars)
 
 plan-changes: workspace

terraform/api_gateway/mtls_cert.tf

@@ -1,6 +1,6 @@
 locals {
   # NHSD cert file
-  truststore_file_name = "server-renewed-cert.pem"
+  truststore_file_name = var.environment == "int" ? "imms-int-cert.pem" : "server-renewed-cert.pem"
 }
 
 data "aws_s3_bucket" "cert_storage" {
@@ -9,16 +9,16 @@ data "aws_s3_bucket" "cert_storage" {
 
 data "aws_s3_object" "cert" {
   bucket = data.aws_s3_bucket.cert_storage.bucket
-  key = local.truststore_file_name
+  key    = local.truststore_file_name
 }
 
 resource "aws_s3_bucket" "truststore_bucket" {
-  bucket = "${var.prefix}-truststores"
+  bucket        = "${var.prefix}-truststores"
   force_destroy = true
 }
 
 resource "aws_s3_object_copy" "copy_cert_from_storage" {
   bucket = aws_s3_bucket.truststore_bucket.bucket
   key    = local.truststore_file_name
-  source ="${data.aws_s3_object.cert.bucket}/${local.truststore_file_name}"
+  source = "${data.aws_s3_object.cert.bucket}/${local.truststore_file_name}"
 }

terraform/dynamodb.tf

@@ -1,5 +1,6 @@
+
 resource "aws_dynamodb_table" "audit-table" {
-  name         = "immunisation-batch-${local.environment}-audit-table"
+  name         = "immunisation-batch-${local.unique_name}-audit-table"
   billing_mode = "PAY_PER_REQUEST"
   hash_key     = "message_id"
 
@@ -47,7 +48,7 @@ resource "aws_dynamodb_table" "audit-table" {
 }
 
 resource "aws_dynamodb_table" "delta-dynamodb-table" {
-  name         = "imms-${local.environment}-delta"
+  name         = "imms-${local.unique_name}-delta"
   billing_mode = "PAY_PER_REQUEST"
   hash_key     = "PK"
 
@@ -106,7 +107,7 @@ resource "aws_dynamodb_table" "delta-dynamodb-table" {
 }
 
 resource "aws_dynamodb_table" "events-dynamodb-table" {
-  name             = "imms-${local.environment}-imms-events"
+  name             = "imms-${local.unique_name}-imms-events"
   billing_mode     = "PAY_PER_REQUEST"
   hash_key         = "PK"
   stream_enabled   = true

terraform/s3_config.tf

@@ -1,3 +1,4 @@
+
 resource "aws_s3_bucket" "batch_data_source_bucket" {
   bucket        = "${local.batch_prefix}-data-sources"
   force_destroy = local.is_temp
@@ -93,7 +94,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "datasources_lifecycle" {
 
 resource "aws_s3_bucket" "batch_data_destination_bucket" {
   # Deliberately not using `local.batch_prefix` as we don't want separate blue / green destinations in prod.
-  bucket        = "immunisation-batch-${local.environment}-data-destinations"
+  bucket        = "immunisation-batch-${local.unique_name}-data-destinations"
   force_destroy = local.is_temp
 }
 
@@ -195,7 +196,7 @@ resource "aws_s3_bucket" "batch_config_bucket" {
   # For now, only create in internal-dev and prod as we only have one shared Redis instance per account.
   count = local.create_config_bucket ? 1 : 0
 
-  bucket = "imms-${local.environment}-supplier-config"
+  bucket = "imms-${local.unique_name}-supplier-config"
 }
 
 resource "aws_s3_bucket_public_access_block" "batch_config_bucket_public_access_block" {

terraform/variables.tf

@@ -21,7 +21,7 @@ locals {
   env               = terraform.workspace
   prefix            = var.aws_account_name == "int" ? "${var.project_name}-${var.service}-${local.env}-int" : "${var.project_name}-${var.service}-${local.env}"
   short_prefix      = var.aws_account_name == "int" ? "${var.project_short_name}-${local.env}-int" : "${var.project_short_name}-${local.env}"
-  batch_prefix      = "immunisation-batch-${local.env}"
+  batch_prefix      = var.aws_account_name == "int" ? "immunisation-batch-${local.env}-int" : "immunisation-batch-${local.env}"
   config_env        = var.aws_account_name
   config_bucket_env = local.environment == "prod" ? "prod" : "internal-dev"
 
@@ -33,6 +33,7 @@ locals {
   create_config_bucket = true
   config_bucket_arn    = local.create_config_bucket ? aws_s3_bucket.batch_config_bucket[0].arn : data.aws_s3_bucket.existing_config_bucket[0].arn
   config_bucket_name   = local.create_config_bucket ? aws_s3_bucket.batch_config_bucket[0].bucket : data.aws_s3_bucket.existing_config_bucket[0].bucket
+  unique_name          = var.aws_account_name == "int" ? "preprod-${var.aws_account_name}" : var.aws_account_name # Because some dbs already exist with that name
 }
 
 data "aws_vpc" "default" {