Rename "main" SNS topic to "eventsub_topic"

Author: stevebux

infrastructure/terraform/components/api/module_lambda_amendment_event_transformer.tf

@@ -105,7 +105,7 @@ data "aws_iam_policy_document" "amendment_event_transformer" {
     ]
 
     resources = [
-      module.eventsub.sns_topic.arn
+      module.eventsub.eventsub_topic.arn
     ]
   }
 }

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]
     }
   }
 }

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
 }

infrastructure/terraform/modules/eventsub/README.md

@@ -40,8 +40,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 -->

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
   }
 }

infrastructure/terraform/modules/eventsub/moved.tf

@@ -0,0 +1,11 @@
+# Moved blocks to handle resource renames without destroy/recreate
+
+moved {
+  from = aws_sns_topic.main
+  to   = aws_sns_topic.eventsub_topic
+}
+
+moved {
+  from = aws_sns_topic_policy.main
+  to   = aws_sns_topic_policy.eventsub_topic
+}

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
   }
 }
 

…/terraform/modules/eventsub/sns_topic.tf …m/modules/eventsub/sns_topic_eventsub.tfinfrastructure/terraform/modules/eventsub/sns_topic.tf renamed to infrastructure/terraform/modules/eventsub/sns_topic_eventsub.tf infrastructure/terraform/modules/eventsub/sns_topic.tf renamed to 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
 

…orm/modules/eventsub/sns_topic_policy.tf …es/eventsub/sns_topic_policy_eventsub.tfinfrastructure/terraform/modules/eventsub/sns_topic_policy.tf renamed to infrastructure/terraform/modules/eventsub/sns_topic_policy_eventsub.tf infrastructure/terraform/modules/eventsub/sns_topic_policy.tf renamed to 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
 }
@@ -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 {
@@ -57,7 +57,7 @@ data "aws_iam_policy_document" "sns_topic_policy" {
     }
 
     resources = [
-      aws_sns_topic.main.arn,
+      aws_sns_topic.eventsub_topic.arn,
     ]
   }
 }

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