Migrate supplier updates so that they pass through new topic

Author: stevebux

infrastructure/terraform/components/api/locals.tf

@@ -27,7 +27,7 @@ locals {
     SUPPLIER_ID_HEADER       = "nhsd-supplier-id",
     APIM_CORRELATION_HEADER  = "nhsd-correlation-id",
     DOWNLOAD_URL_TTL_SECONDS = 60
-    SNS_TOPIC_ARN            = "${module.eventsub.eventsub_topic.arn}",
+    AMENDMENTS_TOPIC_ARN     = "${module.eventsub.amendments_topic.arn}",
     EVENT_SOURCE             = "/data-plane/supplier-api/${var.group}/${var.environment}/letters"
   }
 

infrastructure/terraform/components/api/module_lambda_letter_status_update.tf

@@ -91,7 +91,7 @@ data "aws_iam_policy_document" "letter_status_update" {
     ]
 
     resources = [
-      module.eventsub.eventsub_topic.arn
+      module.eventsub.amendments_topic.arn
     ]
   }
 }

infrastructure/terraform/components/api/module_sqs_letter_updates.tf

@@ -18,29 +18,6 @@ module "sqs_letter_updates" {
 
 data "aws_iam_policy_document" "letter_updates_queue_policy" {
   version = "2012-10-17"
-  statement {
-    sid    = "AllowSNSToSendMessage"
-    effect = "Allow"
-
-    principals {
-      type        = "Service"
-      identifiers = ["sns.amazonaws.com"]
-    }
-
-    actions = [
-      "sqs:SendMessage"
-    ]
-
-    resources = [
-      "arn:aws:sqs:${var.region}:${var.aws_account_id}:${var.project}-${var.environment}-${var.component}-letter-updates-queue"
-    ]
-
-    condition {
-      test     = "ArnEquals"
-      variable = "aws:SourceArn"
-      values   = [module.eventsub.eventsub_topic.arn]
-    }
-  }
 
   statement {
     sid    = "AllowSNSPermissions"
@@ -65,7 +42,7 @@ data "aws_iam_policy_document" "letter_updates_queue_policy" {
     condition {
       test     = "ArnEquals"
       variable = "aws:SourceArn"
-      values   = [module.eventsub.eventsub_topic.arn]
+      values   = [module.eventsub.eventsub_topic.arn, module.eventsub.amendments_topic.arn]
     }
   }
 }

infrastructure/terraform/components/api/sns_topic_subscription_eventsub_sqs_letter_updates.tf

@@ -3,3 +3,9 @@ resource "aws_sns_topic_subscription" "eventsub_sqs_letter_updates" {
   protocol  = "sqs"
   endpoint  = module.sqs_letter_updates.sqs_queue_arn
 }
+
+resource "aws_sns_topic_subscription" "eventsub_sqs_letter_updates" {
+  topic_arn = module.eventsub.amendments_topic.arn
+  protocol  = "sqs"
+  endpoint  = module.sqs_letter_updates.sqs_queue_arn
+}

lambdas/api-handler/src/config/env.ts

@@ -11,7 +11,7 @@ const EnvVarsSchema = z.object({
   MAX_LIMIT: z.coerce.number().int().optional(),
   QUEUE_URL: z.coerce.string().optional(),
   EVENT_SOURCE: z.string(),
-  SNS_TOPIC_ARN: z.string(),
+  AMENDMENTS_TOPIC_ARN: z.string(),
 });
 
 export type EnvVars = z.infer<typeof EnvVarsSchema>;

lambdas/api-handler/src/handlers/__tests__/letter-status-update.test.ts

@@ -117,7 +117,7 @@ describe("createLetterStatusUpdateHandler", () => {
         i + 1,
         expect.objectContaining({
           input: expect.objectContaining({
-            TopicArn: mockedDeps.env.SNS_TOPIC_ARN,
+            TopicArn: mockedDeps.env.AMENDMENTS_TOPIC_ARN,
             Message: JSON.stringify(
               mapLetterToCloudEvent(
                 updateLetterCommands[i] as Letter,

lambdas/api-handler/src/handlers/letter-status-update.ts

@@ -31,7 +31,7 @@ export default function createLetterStatusUpdateHandler(
           deps.env.EVENT_SOURCE,
         );
         await deps.snsClient.send(
-          buildSnsCommand(letterEvent, deps.env.SNS_TOPIC_ARN),
+          buildSnsCommand(letterEvent, deps.env.AMENDMENTS_TOPIC_ARN),
         );
       } catch (error) {
         deps.logger.error(