fix

Author: Namitha-Prabhu

Makefile

@@ -135,7 +135,7 @@ TEST_CMD := APIGEE_ACCESS_TOKEN="$(APIGEE_ACCESS_TOKEN)" \
 	--color=yes \
 	-n 4 \
 	--api-name=nhs-notify-supplier \
-	--proxy-name="nhs-notify-supplier--internal-dev--nhs-notify-supplier" \
+	--proxy-name="$(PROXY_NAME)" \
 	-s \
 	--reruns 5 \
 	--reruns-delay 5 \

tests/component-tests/events-tests/event-subscription.spec.ts

@@ -120,6 +120,7 @@ test.describe("Event Subscription SNS Tests", () => {
     expect(getLetterResponse.status()).toBe(500);
     await pollUpsertLetterLogForError(
       "Message did not match an expected schema",
+      domainId,
     );
   });
 

tests/constants/api-constants.ts

@@ -10,4 +10,8 @@ export const MI_ENDPOINT = "mi";
 export const SUPPLIERTABLENAME = `nhs-${envName}-supapi-suppliers`;
 export const UPSERT_LETTER_LAMBDA_ARN = `arn:aws:lambda:eu-west-2:820178564574:function:nhs-${envName}-supapi-upsertletter`;
 export const DATA = "data";
-export const EVENT_SUBSCRIPTION_TOPIC_NAME = "nhs-main-supapi-eventsub";
+export const EVENT_SUBSCRIPTION_TOPIC_NAME = `nhs-${envName}-supapi-eventsub`;
+export const AWS_ACCOUNT_ID = process.env.AWS_ACCOUNT_ID ?? "820178564574";
+export const EVENT_SUBSCRIPTION_TOPIC_ARN =
+  process.env.EVENT_SUBSCRIPTION_TOPIC_ARN ??
+  `arn:aws:sns:${AWS_REGION}:${AWS_ACCOUNT_ID}:${EVENT_SUBSCRIPTION_TOPIC_NAME}`;

tests/helpers/aws-cloudwatch-helper.ts

@@ -2,7 +2,7 @@ import {
   CloudWatchLogsClient,
   FilterLogEventsCommand,
 } from "@aws-sdk/client-cloudwatch-logs";
-import { envName } from "tests/constants/api-constants";
+import { AWS_REGION, envName } from "tests/constants/api-constants";
 
 const sleep = (ms: number) =>
   new Promise((resolve) => {
@@ -16,7 +16,7 @@ export async function pollSupplierAllocatorLogForResolvedSpec(
   const startTimeMs = Date.now() - 5 * 60_000;
   const timeoutMs = 120_000;
 
-  const client = new CloudWatchLogsClient({});
+  const client = new CloudWatchLogsClient({ region: AWS_REGION });
   const logGroupName = `/aws/lambda/nhs-${envName}-supapi-supplier-allocator`;
   const deadline = Date.now() + timeoutMs;
 
@@ -42,7 +42,6 @@ export async function pollSupplierAllocatorLogForResolvedSpec(
         (!domainId || message.includes(domainId))
       );
     });
-
     if (foundEvent?.message) {
       return foundEvent.message;
     }
@@ -57,12 +56,13 @@ export async function pollSupplierAllocatorLogForResolvedSpec(
 
 export async function pollUpsertLetterLogForError(
   msgToCheck: string,
+  domainId?: string,
 ): Promise<string> {
   const intervalMs = 5000;
   const startTimeMs = Date.now() - 5 * 60_000;
   const timeoutMs = 120_000;
 
-  const client = new CloudWatchLogsClient({});
+  const client = new CloudWatchLogsClient({ region: AWS_REGION });
   const logGroupName = `/aws/lambda/nhs-${envName}-supapi-upsertletter`;
   const deadline = Date.now() + timeoutMs;
 
@@ -73,7 +73,9 @@ export async function pollUpsertLetterLogForError(
         startTime: startTimeMs,
         interleaved: true,
         limit: 100,
-        filterPattern: `"Error processing upsert of record"`,
+        filterPattern: domainId
+          ? `"Error processing upsert of record" "${domainId}"`
+          : `"Error processing upsert of record"`,
       }),
     );
 
@@ -94,6 +96,6 @@ export async function pollUpsertLetterLogForError(
   }
 
   throw new Error(
-    `Timed out waiting for resolved supplier spec log in ${logGroupName}`,
+    `Timed out waiting for upsert letter error log in ${logGroupName}`,
   );
 }

tests/helpers/send-sns-event.ts

@@ -1,33 +1,20 @@
 import {
-  CreateTopicCommand,
   MessageAttributeValue,
   PublishCommand,
   PublishCommandOutput,
 } from "@aws-sdk/client-sns";
+import { EVENT_SUBSCRIPTION_TOPIC_ARN } from "tests/constants/api-constants";
 import { snsClient } from "tests/helpers/aws-sns-helper";
-import { EVENT_SUBSCRIPTION_TOPIC_NAME } from "tests/constants/api-constants";
 
 export type SnsEventMessage = Record<string, unknown> | string;
 
 export async function sendSnsEvent(
   message: SnsEventMessage,
   messageAttributes?: Record<string, MessageAttributeValue>,
 ): Promise<PublishCommandOutput> {
-  const { TopicArn } = await snsClient.send(
-    new CreateTopicCommand({
-      Name: EVENT_SUBSCRIPTION_TOPIC_NAME,
-    }),
-  );
-
-  if (!TopicArn) {
-    throw new Error(
-      `Failed to resolve SNS topic ARN for ${EVENT_SUBSCRIPTION_TOPIC_NAME}`,
-    );
-  }
-
   return snsClient.send(
     new PublishCommand({
-      TopicArn,
+      TopicArn: EVENT_SUBSCRIPTION_TOPIC_ARN,
       Message: typeof message === "string" ? message : JSON.stringify(message),
       ...(messageAttributes ? { MessageAttributes: messageAttributes } : {}),
     }),