CCM-10283: Fix CI

Author: chris-elliott-nhsd

infrastructure/terraform/components/sandbox/ses_receipt_rule.tf

@@ -1,6 +1,6 @@
 resource "aws_ses_receipt_rule" "main" {
   name          = "${local.csi}-store-email-sandbox"
-  rule_set_name = local.acct["ses_testing_config"].bucket_name
+  rule_set_name = local.acct["ses_testing_config"].rule_set_name
   recipients    = [local.sandbox_letter_supplier_mock_recipient]
   enabled       = true
   scan_enabled  = true

lambdas/backend-api/src/templates/infra/email-client.ts

@@ -1,4 +1,4 @@
-import { createMimeMessage } from 'mimetext';
+import { createMimeMessage, MailboxAddrObject } from 'mimetext';
 import { SESClient, SendRawEmailCommand } from '@aws-sdk/client-ses';
 import { TemplateDto } from 'nhs-notify-backend-client';
 import { Logger } from 'nhs-notify-web-template-management-utils/logger';
@@ -42,9 +42,11 @@ export class EmailClient {
 
     const msg = createMimeMessage();
     msg.setSender({ name: 'NHS Notify', addr: this.senderEmail });
-    msg.setBcc(
-      recipientEmailsForSupplier.map((emailAddress) => ({ addr: emailAddress }))
+
+    const recipients: MailboxAddrObject[] = recipientEmailsForSupplier.map(
+      (emailAddress) => ({ addr: emailAddress, type: 'Bcc' })
     );
+    msg.setTo(recipients);
     msg.setSubject(`${supplier} - Letter proof approved by an NHS Notify user`);
     msg.addMessage({
       contentType: 'text/html',

lambdas/backend-api/tsconfig.json

@@ -1,6 +1,7 @@
 {
-  "extends": "@tsconfig/node20/tsconfig.json",
   "compilerOptions": {
+    "isolatedModules": true,
+    "moduleResolution": "node16",
     "paths": {
       "@backend-api/templates/*": [
         "./src/templates/*"
@@ -9,9 +10,9 @@
         "./src/utils/*"
       ]
     },
-    "resolveJsonModule": true,
-    "isolatedModules": true
+    "resolveJsonModule": true
   },
+  "extends": "@tsconfig/node20/tsconfig.json",
   "include": [
     "src/**/*",
     "scripts/generate-dependencies.ts"

package-lock.json

@@ -24,27 +24,30 @@ export class EmailHelper {
   constructor() {}
 
   async getAllS3Items() {
-    const command = new ListObjectsV2Command({
-      Bucket: this.testEmailBucketName,
-      Prefix: this.testEmailPrefix,
-    });
-
-    const { Contents = [], ContinuationToken } = await this.s3Client.send(command);
+    const { Contents = [], ContinuationToken } = await this.s3Client.send(
+      new ListObjectsV2Command({
+        Bucket: this.testEmailBucketName,
+        Prefix: this.testEmailPrefix,
+      })
+    );
 
     let nextToken = ContinuationToken;
     let s3Items = Contents;
 
     while (nextToken) {
-      const command = new ListObjectsV2Command({
-        Bucket: this.testEmailBucketName,
-        Prefix: this.testEmailPrefix,
-        ContinuationToken: nextToken,
-      });
-
-      const { Contents = [], ContinuationToken } = await this.s3Client.send(command);
-
-      s3Items = [...s3Items, ...Contents];
-      nextToken = ContinuationToken;
+      const {
+        Contents: newContents = [],
+        ContinuationToken: newContinuationToken,
+      } = await this.s3Client.send(
+        new ListObjectsV2Command({
+          Bucket: this.testEmailBucketName,
+          Prefix: this.testEmailPrefix,
+          ContinuationToken: nextToken,
+        })
+      );
+
+      s3Items = [...s3Items, ...newContents];
+      nextToken = newContinuationToken;
     }
 
     return s3Items;
@@ -53,12 +56,12 @@ export class EmailHelper {
   async getEmailForTemplateId(templateId: string, dateCutoff: Date) {
     const s3Items = await this.getAllS3Items();
 
-    const sortedKeys = s3Items.filter(
-      ({ LastModified }) => (LastModified ?? 0) > dateCutoff
-    ).sort(
-      (a, b) =>
-        (b.LastModified?.getTime() ?? 0) - (a.LastModified?.getTime() ?? 0)
-    );
+    const sortedKeys = s3Items
+      .filter(({ LastModified }) => (LastModified ?? 0) > dateCutoff)
+      .sort(
+        (a, b) =>
+          (b.LastModified?.getTime() ?? 0) - (a.LastModified?.getTime() ?? 0)
+      );
 
     // SES does not tell us what the S3 keys are going to be for received emails,
     // so we have to search all recent ones to ensure we get the right one and