CCM-12858: WIP fixes

Author: nhsd-angel-pastor

infrastructure/terraform/components/dl/README.md

@@ -45,6 +45,7 @@ No requirements.
 | <a name="module_s3bucket_letters"></a> [s3bucket\_letters](#module\_s3bucket\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-s3bucket.zip | n/a |
 | <a name="module_s3bucket_static_assets"></a> [s3bucket\_static\_assets](#module\_s3bucket\_static\_assets) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-s3bucket.zip | n/a |
 | <a name="module_sqs_core_notifier"></a> [sqs\_core\_notifier](#module\_sqs\_core\_notifier) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
+| <a name="module_sqs_core_notifier_errors"></a> [sqs\_core\_notifier\_errors](#module\_sqs\_core\_notifier\_errors) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
 | <a name="module_sqs_event_publisher_errors"></a> [sqs\_event\_publisher\_errors](#module\_sqs\_event\_publisher\_errors) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
 | <a name="module_sqs_ttl"></a> [sqs\_ttl](#module\_sqs\_ttl) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
 | <a name="module_sqs_ttl_handle_expiry_errors"></a> [sqs\_ttl\_handle\_expiry\_errors](#module\_sqs\_ttl\_handle\_expiry\_errors) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |

infrastructure/terraform/components/dl/lambda_event_source_mapping_core_notifier_lambda.tf

@@ -0,0 +1,26 @@
+resource "aws_lambda_event_source_mapping" "core_notifier_lambda" {
+  event_source_arn                   = module.sqs_core_notifier.sqs_queue_arn
+  function_name                      = module.core_notifier.function_arn
+  starting_position                  = "TRIM_HORIZON"
+  batch_size                         = 50
+  maximum_batching_window_in_seconds = 10
+  maximum_retry_attempts             = 3
+
+  function_response_types = [
+    "ReportBatchItemFailures"
+  ]
+
+  destination_config {
+    on_failure {
+      destination_arn = module.sqs_core_notifier_errors.sqs_queue_arn
+    }
+  }
+
+  filter_criteria {
+    filter {
+      pattern = jsonencode({
+        eventName : ["REMOVE"]
+      })
+    }
+  }
+}

infrastructure/terraform/components/dl/module_lambda_core_notifier.tf

@@ -103,7 +103,7 @@ data "aws_iam_policy_document" "core_notifier_lambda" {
   }
 
   statement {
-    sid    = "SQSPermissionsEventPublisherDLQ"
+    sid    = "SQSPermissionsDLQ"
     effect = "Allow"
 
     actions = [
@@ -112,6 +112,7 @@ data "aws_iam_policy_document" "core_notifier_lambda" {
     ]
 
     resources = [
+      module.sqs_core_notifier_errors.sqs_queue_arn,
       module.sqs_event_publisher_errors.sqs_queue_arn,
     ]
   }

infrastructure/terraform/components/dl/module_sqs_core_notifier.tf

@@ -6,7 +6,7 @@ module "sqs_core_notifier" {
   environment    = var.environment
   project        = var.project
   region         = var.region
-  name           = "core-notifier"
+  name           = "core"
 
   sqs_kms_key_arn = module.kms.key_arn
 

infrastructure/terraform/components/dl/module_sqs_core_notifier_errors.tf

@@ -0,0 +1,14 @@
+module "sqs_core_notifier_errors" {
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip"
+
+  aws_account_id = var.aws_account_id
+  component      = local.component
+  environment    = var.environment
+  project        = var.project
+  region         = var.region
+  name           = "core_notifier-errors"
+
+  sqs_kms_key_arn = module.kms.key_arn
+
+  visibility_timeout_seconds = 60
+}