Rename "main" SNS topic to "eventsub_topic"

stevebux · stevebux · commit 0c685a5d7aca · 2026-02-04T11:35:43.000Z
diff --git a/infrastructure/terraform/components/api/event_source_mapping_mi_updates.tf b/infrastructure/terraform/components/api/event_source_mapping_mi_updates.tf
@@ -1,11 +1,11 @@
 resource "aws_lambda_event_source_mapping" "mi_updates_transformer_kinesis" {
-  event_source_arn                     = aws_kinesis_stream.mi_change_stream.arn
-  function_name                        = module.mi_updates_transformer.function_arn
-  starting_position                    = "LATEST"
-  batch_size                           = 10
-  maximum_batching_window_in_seconds   = 1
+  event_source_arn                   = aws_kinesis_stream.mi_change_stream.arn
+  function_name                      = module.mi_updates_transformer.function_arn
+  starting_position                  = "LATEST"
+  batch_size                         = 10
+  maximum_batching_window_in_seconds = 1
 
   depends_on = [
-    module.mi_updates_transformer    # ensures updates transformer exists
+    module.mi_updates_transformer # ensures updates transformer exists
   ]
 }
diff --git a/infrastructure/terraform/components/api/locals.tf b/infrastructure/terraform/components/api/locals.tf
@@ -27,8 +27,8 @@ locals {
     SUPPLIER_ID_HEADER       = "nhsd-supplier-id",
     APIM_CORRELATION_HEADER  = "nhsd-correlation-id",
     DOWNLOAD_URL_TTL_SECONDS = 60
-    SNS_TOPIC_ARN = "${module.eventsub.sns_topic.arn}",
-    EVENT_SOURCE = "/data-plane/supplier-api/${var.group}/${var.environment}/letters"
+    SNS_TOPIC_ARN            = "${module.eventsub.eventsub_topic.arn}",
+    EVENT_SOURCE             = "/data-plane/supplier-api/${var.group}/${var.environment}/letters"
   }
 
   core_pdf_bucket_arn        = "arn:aws:s3:::comms-${var.core_account_id}-eu-west-2-${var.core_environment}-api-stg-pdf-pipeline"
diff --git a/infrastructure/terraform/components/api/module_lambda_letter_status_update.tf b/infrastructure/terraform/components/api/module_lambda_letter_status_update.tf
@@ -78,7 +78,7 @@ data "aws_iam_policy_document" "letter_status_update" {
     ]
 
     resources = [
-    module.letter_status_updates_queue.sqs_queue_arn
+      module.letter_status_updates_queue.sqs_queue_arn
     ]
   }
 
@@ -91,7 +91,7 @@ data "aws_iam_policy_document" "letter_status_update" {
     ]
 
     resources = [
-      module.eventsub.sns_topic.arn
+      module.eventsub.eventsub_topic.arn
     ]
   }
 }
diff --git a/infrastructure/terraform/components/api/module_lambda_letter_updates_transformer.tf b/infrastructure/terraform/components/api/module_lambda_letter_updates_transformer.tf
@@ -36,7 +36,7 @@ module "letter_updates_transformer" {
 
   lambda_env_vars = merge(local.common_lambda_env_vars, {
     EVENTPUB_SNS_TOPIC_ARN = "${module.eventpub.sns_topic.arn}",
-    EVENT_SOURCE = "/data-plane/supplier-api/${var.group}/${var.environment}/letters"
+    EVENT_SOURCE           = "/data-plane/supplier-api/${var.group}/${var.environment}/letters"
   })
 }
 
diff --git a/infrastructure/terraform/components/api/module_sqs_letter_updates.tf b/infrastructure/terraform/components/api/module_sqs_letter_updates.tf
@@ -38,7 +38,7 @@ data "aws_iam_policy_document" "letter_updates_queue_policy" {
     condition {
       test     = "ArnEquals"
       variable = "aws:SourceArn"
-      values   = [module.eventsub.sns_topic.arn]
+      values   = [module.eventsub.eventsub_topic.arn]
     }
   }
 
@@ -65,7 +65,7 @@ data "aws_iam_policy_document" "letter_updates_queue_policy" {
     condition {
       test     = "ArnEquals"
       variable = "aws:SourceArn"
-      values   = [module.eventsub.sns_topic.arn]
+      values   = [module.eventsub.eventsub_topic.arn]
     }
   }
 }
diff --git a/infrastructure/terraform/components/api/modules_eventsub.tf b/infrastructure/terraform/components/api/modules_eventsub.tf
@@ -22,7 +22,7 @@ module "eventsub" {
   sns_success_logging_sample_percent = var.sns_success_logging_sample_percent
 
   event_cache_expiry_days = 30
-  enable_event_cache                 = var.enable_event_cache
+  enable_event_cache      = var.enable_event_cache
 
   shared_infra_account_id = var.shared_infra_account_id
 }
diff --git a/infrastructure/terraform/components/api/sns_topic_subscription_eventsub_sqs_letter_updates.tf b/infrastructure/terraform/components/api/sns_topic_subscription_eventsub_sqs_letter_updates.tf
@@ -1,5 +1,5 @@
 resource "aws_sns_topic_subscription" "eventsub_sqs_letter_updates" {
-  topic_arn = module.eventsub.sns_topic.arn
+  topic_arn = module.eventsub.eventsub_topic.arn
   protocol  = "sqs"
   endpoint  = module.sqs_letter_updates.sqs_queue_arn
 }
diff --git a/infrastructure/terraform/modules/eventsub/README.md b/infrastructure/terraform/modules/eventsub/README.md
@@ -39,8 +39,8 @@
 
 | Name | Description |
 |------|-------------|
+| <a name="output_eventsub_topic"></a> [eventsub\_topic](#output\_eventsub\_topic) | SNS Topic ARN and Name |
 | <a name="output_s3_bucket_event_cache"></a> [s3\_bucket\_event\_cache](#output\_s3\_bucket\_event\_cache) | S3 Bucket ARN and Name for event cache |
-| <a name="output_sns_topic"></a> [sns\_topic](#output\_sns\_topic) | SNS Topic ARN and Name |
 <!-- vale on -->
 <!-- markdownlint-enable -->
 <!-- END_TF_DOCS -->
diff --git a/infrastructure/terraform/modules/eventsub/cloudwatch_metric_alarm_sns_delivery_failures.tf b/infrastructure/terraform/modules/eventsub/cloudwatch_metric_alarm_sns_delivery_failures.tf
@@ -11,6 +11,6 @@ resource "aws_cloudwatch_metric_alarm" "sns_delivery_failures" {
   treat_missing_data  = "notBreaching"
 
   dimensions = {
-    TopicName = aws_sns_topic.main.name
+    TopicName = aws_sns_topic.eventsub_topic.name
   }
 }
diff --git a/infrastructure/terraform/modules/eventsub/iam_role_firehose_role.tf b/infrastructure/terraform/modules/eventsub/iam_role_firehose_role.tf
@@ -1,8 +1,8 @@
 resource "aws_iam_role" "firehose_role" {
   count = var.enable_event_cache ? 1 : 0
 
-  name                 = "${local.csi}-firehose-role"
-  assume_role_policy   = data.aws_iam_policy_document.firehose_assume_role[0].json
+  name               = "${local.csi}-firehose-role"
+  assume_role_policy = data.aws_iam_policy_document.firehose_assume_role[0].json
 }
 
 data "aws_iam_policy_document" "firehose_assume_role" {
diff --git a/infrastructure/terraform/modules/eventsub/iam_role_sns.tf b/infrastructure/terraform/modules/eventsub/iam_role_sns.tf
@@ -1,6 +1,6 @@
 resource "aws_iam_role" "sns_role" {
-  name                 = "${local.csi}-sns-role"
-  assume_role_policy   = data.aws_iam_policy_document.sns_assume_role.json
+  name               = "${local.csi}-sns-role"
+  assume_role_policy = data.aws_iam_policy_document.sns_assume_role.json
 }
 
 resource "aws_iam_policy" "firehose_delivery" {
diff --git a/infrastructure/terraform/modules/eventsub/iam_role_sns_delivery_logging.tf b/infrastructure/terraform/modules/eventsub/iam_role_sns_delivery_logging.tf
@@ -1,8 +1,8 @@
 resource "aws_iam_role" "sns_delivery_logging_role" {
   count = var.enable_sns_delivery_logging ? 1 : 0
 
-  name                 = "${local.csi}-sns-delivery-logging"
-  assume_role_policy   = data.aws_iam_policy_document.sns_delivery_logging_assume_role[0].json
+  name               = "${local.csi}-sns-delivery-logging"
+  assume_role_policy = data.aws_iam_policy_document.sns_delivery_logging_assume_role[0].json
 }
 
 data "aws_iam_policy_document" "sns_delivery_logging_assume_role" {
diff --git a/infrastructure/terraform/modules/eventsub/module_s3bucket_event_cache.tf b/infrastructure/terraform/modules/eventsub/module_s3bucket_event_cache.tf
@@ -48,7 +48,7 @@ module "s3bucket_event_cache" {
   }
 
   default_tags = {
-    Name = "Event Cache Storage"
+    Name                       = "Event Cache Storage"
     NHSE-Enable-S3-Backup-Acct = "True"
   }
 }
diff --git a/infrastructure/terraform/modules/eventsub/outputs.tf b/infrastructure/terraform/modules/eventsub/outputs.tf
@@ -1,8 +1,8 @@
-output "sns_topic" {
+output "eventsub_topic" {
   description = "SNS Topic ARN and Name"
   value = {
-    arn  = aws_sns_topic.main.arn
-    name = aws_sns_topic.main.name
+    arn  = aws_sns_topic.eventsub_topic.arn
+    name = aws_sns_topic.eventsub_topic.name
   }
 }
 
diff --git a/infrastructure/terraform/modules/eventsub/sns_topic_eventsub.tf b/infrastructure/terraform/modules/eventsub/sns_topic_eventsub.tf
@@ -1,4 +1,4 @@
-resource "aws_sns_topic" "main" {
+resource "aws_sns_topic" "eventsub_topic" {
   name              = local.csi
   kms_master_key_id = var.kms_key_arn
 
diff --git a/infrastructure/terraform/modules/eventsub/sns_topic_policy_eventsub.tf b/infrastructure/terraform/modules/eventsub/sns_topic_policy_eventsub.tf
@@ -1,5 +1,5 @@
-resource "aws_sns_topic_policy" "main" {
-  arn = aws_sns_topic.main.arn
+resource "aws_sns_topic_policy" "eventsub_topic" {
+  arn = aws_sns_topic.eventsub_topic.arn
 
   policy = data.aws_iam_policy_document.sns_topic_policy.json
 }
@@ -8,7 +8,7 @@ data "aws_iam_policy_document" "sns_topic_policy" {
   policy_id = "__default_policy_ID"
 
   statement {
-    sid = "AllowAllSNSActionsFromAccount"
+    sid    = "AllowAllSNSActionsFromAccount"
     effect = "Allow"
 
     principals {
@@ -29,7 +29,7 @@ data "aws_iam_policy_document" "sns_topic_policy" {
     ]
 
     resources = [
-      aws_sns_topic.main.arn,
+      aws_sns_topic.eventsub_topic.arn,
     ]
 
     condition {
@@ -43,7 +43,7 @@ data "aws_iam_policy_document" "sns_topic_policy" {
   }
 
   statement {
-    sid = "AllowAllSNSActionsFromSharedAccount"
+    sid    = "AllowAllSNSActionsFromSharedAccount"
     effect = "Allow"
     actions = [
       "SNS:Publish",
@@ -57,7 +57,7 @@ data "aws_iam_policy_document" "sns_topic_policy" {
     }
 
     resources = [
-      aws_sns_topic.main.arn,
+      aws_sns_topic.eventsub_topic.arn,
     ]
   }
 }
diff --git a/infrastructure/terraform/modules/eventsub/sns_topic_subscription_firehose.tf b/infrastructure/terraform/modules/eventsub/sns_topic_subscription_firehose.tf
@@ -1,7 +1,7 @@
 resource "aws_sns_topic_subscription" "firehose" {
   count = var.enable_event_cache ? 1 : 0
 
-  topic_arn             = aws_sns_topic.main.arn
+  topic_arn             = aws_sns_topic.eventsub_topic.arn
   protocol              = "firehose"
   subscription_role_arn = aws_iam_role.sns_role.arn
   endpoint              = aws_kinesis_firehose_delivery_stream.main[0].arn

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ data "aws_iam_policy_document" "letter_status_update" {`
`78`	`78`	`]`
`79`	`79`
`80`	`80`	`resources = [`
`81`		`- module.letter_status_updates_queue.sqs_queue_arn`
	`81`	`+ module.letter_status_updates_queue.sqs_queue_arn`
`82`	`82`	`]`
`83`	`83`	`}`
`84`	`84`
`@@ -91,7 +91,7 @@ data "aws_iam_policy_document" "letter_status_update" {`
`91`	`91`	`]`
`92`	`92`
`93`	`93`	`resources = [`
`94`		`- module.eventsub.sns_topic.arn`
	`94`	`+ module.eventsub.eventsub_topic.arn`
`95`	`95`	`]`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ module "letter_updates_transformer" {`
`36`	`36`
`37`	`37`	`lambda_env_vars = merge(local.common_lambda_env_vars, {`
`38`	`38`	`EVENTPUB_SNS_TOPIC_ARN = "${module.eventpub.sns_topic.arn}",`
`39`		`- EVENT_SOURCE = "/data-plane/supplier-api/${var.group}/${var.environment}/letters"`
	`39`	`+ EVENT_SOURCE = "/data-plane/supplier-api/${var.group}/${var.environment}/letters"`
`40`	`40`	`})`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ data "aws_iam_policy_document" "letter_updates_queue_policy" {`
`38`	`38`	`condition {`
`39`	`39`	`test = "ArnEquals"`
`40`	`40`	`variable = "aws:SourceArn"`
`41`		`- values = [module.eventsub.sns_topic.arn]`
	`41`	`+ values = [module.eventsub.eventsub_topic.arn]`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`@@ -65,7 +65,7 @@ data "aws_iam_policy_document" "letter_updates_queue_policy" {`
`65`	`65`	`condition {`
`66`	`66`	`test = "ArnEquals"`
`67`	`67`	`variable = "aws:SourceArn"`
`68`		`- values = [module.eventsub.sns_topic.arn]`
	`68`	`+ values = [module.eventsub.eventsub_topic.arn]`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ module "eventsub" {`
`22`	`22`	`sns_success_logging_sample_percent = var.sns_success_logging_sample_percent`
`23`	`23`
`24`	`24`	`event_cache_expiry_days = 30`
`25`		`- enable_event_cache = var.enable_event_cache`
	`25`	`+ enable_event_cache = var.enable_event_cache`
`26`	`26`
`27`	`27`	`shared_infra_account_id = var.shared_infra_account_id`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`resource "aws_sns_topic_subscription" "eventsub_sqs_letter_updates" {`
`2`		`- topic_arn = module.eventsub.sns_topic.arn`
	`2`	`+ topic_arn = module.eventsub.eventsub_topic.arn`
`3`	`3`	`protocol = "sqs"`
`4`	`4`	`endpoint = module.sqs_letter_updates.sqs_queue_arn`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ resource "aws_cloudwatch_metric_alarm" "sns_delivery_failures" {`
`11`	`11`	`treat_missing_data = "notBreaching"`
`12`	`12`
`13`	`13`	`dimensions = {`
`14`		`- TopicName = aws_sns_topic.main.name`
	`14`	`+ TopicName = aws_sns_topic.eventsub_topic.name`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`resource "aws_iam_role" "firehose_role" {`
`2`	`2`	`count = var.enable_event_cache ? 1 : 0`
`3`	`3`
`4`		`- name = "${local.csi}-firehose-role"`
`5`		`- assume_role_policy = data.aws_iam_policy_document.firehose_assume_role[0].json`
	`4`	`+ name = "${local.csi}-firehose-role"`
	`5`	`+ assume_role_policy = data.aws_iam_policy_document.firehose_assume_role[0].json`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`data "aws_iam_policy_document" "firehose_assume_role" {`