revert some event sub

Author: stevebux

infrastructure/terraform/modules/eventsub/sns_topic_policy.tf

@@ -1,11 +1,5 @@
-resource "aws_sns_topic_policy" "sns_topic_event_bus" {
-  arn = aws_sns_topic.sns_topic_event_bus.arn
-
-  policy = data.aws_iam_policy_document.sns_topic_policy.json
-}
-
-resource "aws_sns_topic_policy" "sns_topic_supplier" {
-  arn = aws_sns_topic.sns_topic_event_bus.arn
+resource "aws_sns_topic_policy" "main" {
+  arn = aws_sns_topic.main.arn
 
   policy = data.aws_iam_policy_document.sns_topic_policy.json
 }
@@ -35,7 +29,7 @@ data "aws_iam_policy_document" "sns_topic_policy" {
     ]
 
     resources = [
-      aws_sns_topic.sns_topic_event_bus.arn,
+      aws_sns_topic.main.arn,
     ]
 
     condition {
@@ -63,7 +57,7 @@ data "aws_iam_policy_document" "sns_topic_policy" {
     }
 
     resources = [
-      aws_sns_topic.sns_topic_event_bus.arn,
+      aws_sns_topic.main.arn,
     ]
   }
 }

infrastructure/terraform/modules/eventsub/sns_topic_subscription_firehose.tf

@@ -1,17 +1,7 @@
-resource "aws_sns_topic_subscription" "sns_topic_event_bus_firehose" {
+resource "aws_sns_topic_subscription" "firehose" {
   count = var.enable_event_cache ? 1 : 0
 
-  topic_arn             = aws_sns_topic.sns_topic_event_bus.arn
-  protocol              = "firehose"
-  subscription_role_arn = aws_iam_role.sns_role.arn
-  endpoint              = aws_kinesis_firehose_delivery_stream.main[0].arn
-  raw_message_delivery  = var.enable_firehose_raw_message_delivery
-}
-
-resource "aws_sns_topic_subscription" "sns_topic_supplier_firehose" {
-  count = var.enable_event_cache ? 1 : 0
-
-  topic_arn             = aws_sns_topic.sns_topic_supplier.arn
+  topic_arn             = aws_sns_topic.main.arn
   protocol              = "firehose"
   subscription_role_arn = aws_iam_role.sns_role.arn
   endpoint              = aws_kinesis_firehose_delivery_stream.main[0].arn