CCM-8861: Fix after bad rebase

Author: chris-elliott-nhsd

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

@@ -37,11 +37,10 @@ module "lambda_send_letter_proof" {
     id         = data.aws_vpc.account_vpc.id
     cidr_block = data.aws_vpc.account_vpc.cidr_block
     subnet_ids = data.aws_subnets.account_vpc_private_subnets.ids
+    security_group_ids = [
+      data.aws_security_group.account_vpc_sg_allow_sftp_egress.id
+    ]
   }
-
-  security_group_ids = [
-    data.aws_security_group.account_vpc_sg_allow_sftp_egress.id
-  ]
 }
 
 data "aws_iam_policy_document" "send_letter_proof" {

infrastructure/terraform/modules/lambda-function/README.md

@@ -19,7 +19,6 @@ No requirements.
 | <a name="input_log_retention_in_days"></a> [log\_retention\_in\_days](#input\_log\_retention\_in\_days) | Specifies the number of days you want to retain log events in the log group for this Lambda | `number` | `0` | no |
 | <a name="input_memory_size"></a> [memory\_size](#input\_memory\_size) | Lambda memory size | `number` | `128` | no |
 | <a name="input_runtime"></a> [runtime](#input\_runtime) | Identifier of the function's runtime | `string` | `"nodejs20.x"` | no |
-| <a name="input_security_group_ids"></a> [security\_group\_ids](#input\_security\_group\_ids) | n/a | `list(string)` | `[]` | no |
 | <a name="input_source_code_hash"></a> [source\_code\_hash](#input\_source\_code\_hash) | Base64-encoded SHA256 hash of the package file specified by `filename` | `string` | n/a | yes |
 | <a name="input_sqs_event_source_mapping"></a> [sqs\_event\_source\_mapping](#input\_sqs\_event\_source\_mapping) | Configuration for SQS event source mapping | <pre>object({<br/>    sqs_queue_arn                      = string<br/>    batch_size                         = optional(number, 10)<br/>    maximum_batching_window_in_seconds = optional(number, 0)<br/>    scaling_config = optional(object({<br/>      maximum_concurrency = number<br/>    }), null)<br/>  })</pre> | `null` | no |
 | <a name="input_timeout"></a> [timeout](#input\_timeout) | Maximum running time before timeout | `number` | `3` | no |

lambdas/sftp-letters/src/__tests__/infra/sftp-supplier-client-repository.test.ts

@@ -1,6 +1,5 @@
 import { GetParameterCommand, SSMClient } from '@aws-sdk/client-ssm';
 import { createMockLogger } from 'nhs-notify-web-template-management-test-helper-utils/mock-logger';
-import { ICache } from 'nhs-notify-web-template-management-utils';
 import { mock } from 'jest-mock-extended';
 import 'aws-sdk-client-mock-jest';
 import { mockClient } from 'aws-sdk-client-mock';
@@ -10,13 +9,6 @@ import {
   SftpSupplierClientRepository,
 } from '../../infra/sftp-supplier-client-repository';
 import { SftpClient } from '../../infra/sftp-client';
-import {
-  GetParameterCommand,
-  GetParametersByPathCommand,
-  SSMClient,
-} from '@aws-sdk/client-ssm';
-import { createMockLogger } from 'nhs-notify-web-template-management-test-helper-utils/mock-logger';
-import { mock } from 'jest-mock-extended';
 import NodeCache from 'node-cache';
 
 jest.mock('../../infra/sftp-client');
@@ -77,7 +69,6 @@ describe('getClient', () => {
       sftpClient: mockSftpClient,
       baseUploadDir: 'upload/dir',
       baseDownloadDir: 'download/dir',
-      name: 'SYNERTEC',
     });
 
     expect(cache.get).toHaveBeenCalledWith(credKey);
@@ -126,7 +117,6 @@ describe('getClient', () => {
       sftpClient: mockSftpClient,
       baseUploadDir: 'upload/dir',
       baseDownloadDir: 'download/dir',
-      name: 'SYNERTEC',
     });
 
     expect(cache.get).toHaveBeenCalledWith(credKey);

lambdas/sftp-letters/src/config/config-poll.ts

@@ -3,14 +3,14 @@ import z from 'zod';
 export function loadConfig() {
   return z
     .object({
-      CREDENTIALS_TTL_MS: z.string().pipe(z.coerce.number()),
+      CREDENTIALS_TTL_SECONDS: z.string().pipe(z.coerce.number()),
       CSI: z.string(),
       QUARANTINE_BUCKET_NAME: z.string(),
       REGION: z.string(),
       SFTP_ENVIRONMENT: z.string(),
     })
     .transform((e) => ({
-      credentialsTtlMs: e.CREDENTIALS_TTL_MS,
+      credentialsTtlSeconds: e.CREDENTIALS_TTL_SECONDS,
       csi: e.CSI,
       quarantineBucketName: e.QUARANTINE_BUCKET_NAME,
       region: e.REGION,

lambdas/sftp-letters/src/container-poll.ts

@@ -4,16 +4,14 @@ import { SftpSupplierClientRepository } from './infra/sftp-supplier-client-repos
 import { loadConfig } from './config/config-poll';
 import { App } from './app/poll';
 import { logger } from 'nhs-notify-web-template-management-utils/logger';
-import {
-  InMemoryCache,
-  S3Repository,
-} from 'nhs-notify-web-template-management-utils';
+import { S3Repository } from 'nhs-notify-web-template-management-utils';
+import NodeCache from 'node-cache';
 
 export function createContainer() {
   const {
     csi,
     quarantineBucketName,
-    credentialsTtlMs,
+    credentialsTtlSeconds,
     region,
     sftpEnvironment,
   } = loadConfig();
@@ -22,7 +20,7 @@ export function createContainer() {
 
   const s3Client = new S3Client({ region });
 
-  const cache = new InMemoryCache({ ttl: credentialsTtlMs });
+  const cache = new NodeCache({ stdTTL: credentialsTtlSeconds });
 
   const sftpSupplierClientRepository = new SftpSupplierClientRepository(
     csi,

lambdas/sftp-letters/src/infra/sftp-supplier-client-repository.ts

@@ -69,7 +69,6 @@ export class SftpSupplierClientRepository {
       sftpClient: new SftpClient(host, username, privateKey, hostKey),
       baseUploadDir,
       baseDownloadDir,
-      name: supplier,
     };
   }
 }

utils/utils/src/__tests__/s3-repository.test.ts

@@ -1,7 +1,4 @@
-import {
-  PutObjectCommand,
-  S3Client,
-} from '@aws-sdk/client-s3';
+import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { mockClient } from 'aws-sdk-client-mock';
 import 'aws-sdk-client-mock-jest';
 import { mock } from 'jest-mock-extended';

utils/utils/src/s3-repository.ts

@@ -3,7 +3,6 @@ import {
   PutObjectCommandInput,
   PutObjectCommandOutput,
   S3Client,
-  _Object,
 } from '@aws-sdk/client-s3';
 
 export class S3Repository {
@@ -12,10 +11,6 @@ export class S3Repository {
     private readonly client: S3Client
   ) {}
 
-  s3Path(key: string) {
-    return `s3://${this.bucket}/${key}`;
-  }
-
   async putRawData(
     fileData: PutObjectCommandInput['Body'],
     key: string