move supplier to the event

Author: alexnuttall

infrastructure/terraform/components/acct/variables.tf

@@ -111,5 +111,6 @@ variable "letter_suppliers" {
     default_supplier = optional(bool)
   }))
   description = "Letter suppliers enabled in the account (across all environments)"
-  default     = {}
+
+  default = {}
 }

infrastructure/terraform/components/app/variables.tf

@@ -198,6 +198,16 @@ variable "letter_suppliers" {
     enable_polling   = bool
     default_supplier = optional(bool)
   }))
+
+  validation {
+    condition = (
+      length(var.letter_suppliers) == 0 ||
+      length([for s in values(var.suppliers) : s if s.default_supplier]) == 1
+    )
+    error_message = "If letter suppliers are configured, exactly one must be default_supplier"
+  }
+
   default = {}
+
   description = "Letter suppliers enabled in the environment"
 }

infrastructure/terraform/components/sandbox/variables.tf

@@ -68,12 +68,22 @@ variable "letter_suppliers" {
     enable_polling   = bool
     default_supplier = optional(bool)
   }))
+
   default = {
     "WTMMOCK" = {
       enable_polling   = true
       default_supplier = true
     }
   }
+
+  validation {
+    condition = (
+      length(var.letter_suppliers) == 0 ||
+      length([for s in values(var.suppliers) : s if s.default_supplier]) == 1
+    )
+    error_message = "If letter suppliers are configured, exactly one must be default_supplier"
+  }
+
   description = "Letter suppliers enabled in the environment"
 }
 

infrastructure/terraform/modules/backend-api/module_lambda_send_letter_proof.tf

@@ -15,9 +15,8 @@ module "lambda_send_letter_proof" {
   execution_role_policy_document = data.aws_iam_policy_document.send_letter_proof.json
 
   environment_variables = {
-    CREDENTIALS_TTL_MS      = 900 * 1000
+    CREDENTIALS_TTL_SECONDS = 900
     CSI                     = local.csi
-    DEFAULT_LETTER_SUPPLIER = try(local.default_letter_supplier.name, "unset")
     ENVIRONMENT             = var.environment
     INTERNAL_BUCKET_NAME    = module.s3bucket_internal.id
     NODE_OPTIONS            = "--enable-source-maps",

lambdas/sftp-letters/package.json

@@ -36,6 +36,7 @@
     "nhs-notify-entity-update-command-builder": "*",
     "nhs-notify-web-template-management-test-helper-utils": "*",
     "nhs-notify-web-template-management-utils": "*",
+    "node-cache": "^5.1.2",
     "ssh2-sftp-client": "^9.1.0",
     "zod": "^3.24.2"
   }

lambdas/sftp-letters/src/__tests__/api/send-handler.test.ts

@@ -3,14 +3,9 @@ import { createHandler } from '../../api/send-handler';
 import { App } from '../../app/send';
 import { createMockLogger } from 'nhs-notify-web-template-management-test-helper-utils/mock-logger';
 import { SftpSupplierClientRepository } from '../../infra/sftp-supplier-client-repository';
-import { SftpClient } from '../../infra/sftp-client';
 import { Callback, Context } from 'aws-lambda';
 import { makeSQSRecord } from 'nhs-notify-web-template-management-test-helper-utils';
 
-const defaultSupplier = 'LETTERSUPPLIER';
-const baseUploadDir = 'Incoming';
-const baseDownloadDir = 'Outgoing';
-
 function setup() {
   const app = mock<App>();
 
@@ -20,8 +15,6 @@ function setup() {
 
   const handler = createHandler({
     app,
-    sftpSupplierClientRepository,
-    defaultSupplier,
     logger,
   });
 
@@ -33,27 +26,15 @@ function setup() {
 }
 
 describe('handler', () => {
-  test('opens SFTP connection, handles proof requests, and closes connection', async () => {
+  test('handles proof requests', async () => {
     const { mocks, handler, logMessages } = setup();
 
-    const client = mock<SftpClient>();
-
-    client.connect.mockResolvedValueOnce();
-
-    mocks.sftpSupplierClientRepository.getClient.mockResolvedValueOnce({
-      sftpClient: client,
-      baseDownloadDir,
-      baseUploadDir,
-    });
-
     mocks.app.send
       .mockResolvedValueOnce('sent')
       .mockRejectedValueOnce(new Error('!'))
       .mockResolvedValueOnce('failed')
       .mockResolvedValueOnce('already-sent');
 
-    client.end.mockResolvedValueOnce();
-
     const record1 = makeSQSRecord({ body: JSON.stringify({}), messageId: 'a' });
     const record2 = makeSQSRecord({ body: JSON.stringify({}), messageId: 'b' });
     const record3 = makeSQSRecord({ body: JSON.stringify({}), messageId: 'c' });
@@ -68,27 +49,14 @@ describe('handler', () => {
       mock<Callback>()
     );
 
-    expect(mocks.sftpSupplierClientRepository.getClient).toHaveBeenCalledTimes(
-      1
-    );
-    expect(mocks.sftpSupplierClientRepository.getClient).toHaveBeenCalledWith(
-      defaultSupplier
-    );
-
-    expect(client.connect).toHaveBeenCalledTimes(1);
-
     expect(mocks.app.send).toHaveBeenCalledTimes(4);
     for (const record of records) {
       expect(mocks.app.send).toHaveBeenCalledWith(
         record.body,
-        record.messageId,
-        client,
-        baseUploadDir
+        record.messageId
       );
     }
 
-    expect(client.end).toHaveBeenCalledTimes(1);
-
     expect(response).toEqual({
       batchItemFailures: [{ itemIdentifier: 'b' }, { itemIdentifier: 'c' }],
     });
@@ -105,50 +73,6 @@ describe('handler', () => {
     expect(logMessages).toContainEqual(
       expect.objectContaining({
         message: { 'already-sent': 1, failed: 2, sent: 1 },
-        recordCount: 4,
-        supplier: defaultSupplier,
-      })
-    );
-  });
-
-  test('logs error and resolves when failing to close SFTP connection', async () => {
-    const { mocks, handler, logMessages } = setup();
-
-    const client = mock<SftpClient>();
-
-    client.connect.mockResolvedValueOnce();
-
-    mocks.sftpSupplierClientRepository.getClient.mockResolvedValueOnce({
-      sftpClient: client,
-      baseDownloadDir,
-      baseUploadDir,
-    });
-
-    mocks.app.send.mockResolvedValue('sent');
-
-    const error = new Error('close error');
-
-    client.end.mockRejectedValue(error);
-
-    const response = await handler(
-      {
-        Records: [],
-      },
-      mock<Context>(),
-      mock<Callback>()
-    );
-
-    expect(client.connect).toHaveBeenCalledTimes(1);
-    expect(client.end).toHaveBeenCalledTimes(1);
-
-    expect(response).toEqual({ batchItemFailures: [] });
-
-    expect(logMessages).toContainEqual(
-      expect.objectContaining({
-        description: 'Failed to close SFTP connection',
-        recordCount: 0,
-        message: error.message,
-        stack: error.stack,
       })
     );
   });