[NRL-1860] Switch pointer-table-name var to prefix to match module definitions

Author: mattdean3-nhs

terraform/infrastructure/data.tf

@@ -17,22 +17,22 @@ data "aws_iam_policy" "auth-store-read-policy" {
 
 data "aws_dynamodb_table" "pointers-table" {
   count = var.use_shared_resources ? 1 : 0
-  name  = local.is_sandbox_env ? var.dynamodb_sandbox_pointers_table_name : var.dynamodb_pointers_table_name
+  name  = "${local.pointers_table_prefix}-pointers-table"
 }
 
 data "aws_iam_policy" "pointers-table-read" {
   count = var.use_shared_resources ? 1 : 0
-  name  = "${local.shared_prefix}-pointers-table-read"
+  name  = "${local.pointers_table_prefix}-pointers-table-read"
 }
 
 data "aws_iam_policy" "pointers-table-write" {
   count = var.use_shared_resources ? 1 : 0
-  name  = "${local.shared_prefix}-pointers-table-write"
+  name  = "${local.pointers_table_prefix}-pointers-table-write"
 }
 
 data "aws_iam_policy" "pointers-kms-read-write" {
   count = var.use_shared_resources ? 1 : 0
-  name  = "${local.shared_prefix}-pointers-kms-read-write"
+  name  = "${local.pointers_table_prefix}-pointers-kms-read-write"
 }
 
 data "external" "current-info" {

terraform/infrastructure/etc/dev.tfvars

@@ -1,8 +1,8 @@
 account_name     = "dev"
 aws_account_name = "dev"
 
-dynamodb_pointers_table_name         = "nhsd-nrlf--dev-pointers-table"
-dynamodb_sandbox_pointers_table_name = "nhsd-nrlf--dev-sandbox-pointers-table"
+dynamodb_pointers_table_prefix         = "nhsd-nrlf--dev"
+dynamodb_sandbox_pointers_table_prefix = "nhsd-nrlf--dev-sandbox"
 
 domain                = "api.record-locator.dev.national.nhs.uk"
 public_domain         = "internal-dev.api.service.nhs.uk"

terraform/infrastructure/etc/int.tfvars

@@ -1,9 +1,9 @@
 account_name     = "int"
 aws_account_name = "test"
 
-dynamodb_pointers_table_name         = "nhsd-nrlf--int-pointers-table"
-dynamodb_sandbox_pointers_table_name = "nhsd-nrlf--int-sandbox-pointers-table"
-deletion_protection                  = true
+dynamodb_pointers_table_prefix         = "nhsd-nrlf--int"
+dynamodb_sandbox_pointers_table_prefix = "nhsd-nrlf--int-sandbox"
+deletion_protection                    = true
 
 domain                = "api.record-locator.int.national.nhs.uk"
 public_domain         = "int.api.service.nhs.uk"

terraform/infrastructure/etc/perftest.tfvars

@@ -1,7 +1,7 @@
 account_name     = "perftest"
 aws_account_name = "test"
 
-dynamodb_pointers_table_name = "nhsd-nrlf--perftest-baseline-pointers-table"
+dynamodb_pointers_table_prefix = "nhsd-nrlf--perftest-baseline"
 
 domain        = "perftest.record-locator.national.nhs.uk"
 public_domain = "perftest.api.service.nhs.uk"

terraform/infrastructure/etc/prod.tfvars

@@ -1,8 +1,8 @@
 account_name     = "prod"
 aws_account_name = "prod"
 
-dynamodb_pointers_table_name = "nhsd-nrlf--prod-pointers-table"
-deletion_protection          = true
+dynamodb_pointers_table_prefix = "nhsd-nrlf--prod"
+deletion_protection            = true
 
 domain        = "api.record-locator.national.nhs.uk"
 public_domain = "api.service.nhs.uk"

terraform/infrastructure/etc/qa.tfvars

@@ -1,8 +1,8 @@
 account_name     = "qa"
 aws_account_name = "test"
 
-dynamodb_pointers_table_name         = "nhsd-nrlf--qa-pointers-table"
-dynamodb_sandbox_pointers_table_name = "nhsd-nrlf--qa-sandbox-pointers-table"
+dynamodb_pointers_table_prefix         = "nhsd-nrlf--qa"
+dynamodb_sandbox_pointers_table_prefix = "nhsd-nrlf--qa-sandbox"
 
 domain                = "qa.record-locator.national.nhs.uk"
 public_domain         = "internal-qa.api.service.nhs.uk"

terraform/infrastructure/etc/ref.tfvars

@@ -1,7 +1,7 @@
 account_name     = "ref"
 aws_account_name = "test"
 
-dynamodb_pointers_table_name = "nhsd-nrlf--ref-pointers-table"
+dynamodb_pointers_table_prefix = "nhsd-nrlf--ref"
 
 domain        = "api.record-locator.ref.national.nhs.uk"
 public_domain = "ref.api.service.nhs.uk"

terraform/infrastructure/locals.tf

@@ -51,6 +51,8 @@ locals {
   auth_store_id              = var.use_shared_resources ? data.aws_s3_bucket.authorization-store[0].id : module.ephemeral-s3-permission-store[0].bucket_id
   auth_store_read_policy_arn = var.use_shared_resources ? data.aws_iam_policy.auth-store-read-policy[0].arn : module.ephemeral-s3-permission-store[0].bucket_read_policy_arn
 
+  pointers_table_prefix = local.is_sandbox_env ? "${var.dynamodb_sandbox_pointers_table_prefix}-sandbox-pointers-table" : "${var.dynamodb_pointers_table_prefix}-pointers-table"
+
   pointers_table_name             = var.use_shared_resources ? data.aws_dynamodb_table.pointers-table[0].name : module.ephemeral-pointers-table[0].table_name
   pointers_table_read_policy_arn  = var.use_shared_resources ? data.aws_iam_policy.pointers-table-read[0].arn : module.ephemeral-pointers-table[0].read_policy_arn
   pointers_table_write_policy_arn = var.use_shared_resources ? data.aws_iam_policy.pointers-table-write[0].arn : module.ephemeral-pointers-table[0].write_policy_arn

terraform/infrastructure/vars.tf

@@ -68,13 +68,13 @@ variable "disable_firehose_lambda_subscriptions" {
   default     = false
 }
 
-variable "dynamodb_pointers_table_name" {
+variable "dynamodb_pointers_table_prefix" {
   type        = string
-  description = "The name of the DynamoDB pointers table to use when using shared resources"
+  description = "The prefix of the DynamoDB pointers table to use when using shared resources"
 }
 
-variable "dynamodb_sandbox_pointers_table_name" {
+variable "dynamodb_sandbox_pointers_table_prefix" {
   type        = string
-  description = "The name of the DynamoDB pointers table to use when using shared resources in a sandbox environment"
+  description = "The prefix of the DynamoDB pointers table to use when using shared resources in a sandbox environment"
   default     = null
 }