Revert more

Author: stevebux

infrastructure/terraform/components/api/README.md

@@ -37,8 +37,6 @@ No requirements.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_allocation_lambda"></a> [allocation\_lambda](#module\_allocation\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip | n/a |
-| <a name="module_amendments_queue"></a> [amendments\_queue](#module\_amendments\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-sqs.zip | n/a |
 | <a name="module_authorizer_lambda"></a> [authorizer\_lambda](#module\_authorizer\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip | n/a |
 | <a name="module_domain_truststore"></a> [domain\_truststore](#module\_domain\_truststore) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
 | <a name="module_eventpub"></a> [eventpub](#module\_eventpub) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-eventpub.zip | n/a |
@@ -57,7 +55,6 @@ No requirements.
 | <a name="module_post_mi"></a> [post\_mi](#module\_post\_mi) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip | n/a |
 | <a name="module_s3bucket_test_letters"></a> [s3bucket\_test\_letters](#module\_s3bucket\_test\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
 | <a name="module_sqs_letter_updates"></a> [sqs\_letter\_updates](#module\_sqs\_letter\_updates) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-sqs.zip | n/a |
-| <a name="module_supplier_requests_queue"></a> [supplier\_requests\_queue](#module\_supplier\_requests\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
 | <a name="module_supplier_ssl"></a> [supplier\_ssl](#module\_supplier\_ssl) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-ssl.zip | n/a |
 | <a name="module_upsert_letter"></a> [upsert\_letter](#module\_upsert\_letter) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip | n/a |
 ## Outputs

infrastructure/terraform/modules/eventsub/README.md

@@ -40,8 +40,7 @@
 | Name | Description |
 |------|-------------|
 | <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_event_bus"></a> [sns\_topic\_event\_bus](#output\_sns\_topic\_event\_bus) | SNS Topic ARN and Name |
-| <a name="output_sns_topic_supplier"></a> [sns\_topic\_supplier](#output\_sns\_topic\_supplier) | SNS Topic ARN and Name |
+| <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.sns_topic_event_bus.name
+    TopicName = aws_sns_topic.main.name
   }
 }

infrastructure/terraform/modules/eventsub/outputs.tf

@@ -1,16 +1,8 @@
-output "sns_topic_event_bus" {
+output "sns_topic" {
   description = "SNS Topic ARN and Name"
   value = {
-    arn  = aws_sns_topic.sns_topic_event_bus.arn
-    name = aws_sns_topic.sns_topic_event_bus.name
-  }
-}
-
-output "sns_topic_supplier" {
-  description = "SNS Topic ARN and Name"
-  value = {
-    arn  = aws_sns_topic.sns_topic_supplier.arn
-    name = aws_sns_topic.sns_topic_supplier.name
+    arn  = aws_sns_topic.main.arn
+    name = aws_sns_topic.main.name
   }
 }
 

…/modules/eventsub/sns_topic_event_bus.tf …/terraform/modules/eventsub/sns_topic.tfinfrastructure/terraform/modules/eventsub/sns_topic_event_bus.tf renamed to infrastructure/terraform/modules/eventsub/sns_topic.tf infrastructure/terraform/modules/eventsub/sns_topic_event_bus.tf renamed to infrastructure/terraform/modules/eventsub/sns_topic.tf

@@ -1,5 +1,5 @@
-resource "aws_sns_topic" "sns_topic_event_bus" {
-  name              = "${local.csi}-event-bus-events"
+resource "aws_sns_topic" "main" {
+  name              = local.csi
   kms_master_key_id = var.kms_key_arn
 
   application_failure_feedback_role_arn    = var.enable_sns_delivery_logging == true ? aws_iam_role.sns_delivery_logging_role[0].arn : null

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