CCM-8861: Fix after bad rebase

Author: chris-elliott-nhsd

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

@@ -7,19 +7,19 @@ resource "aws_cloudwatch_event_rule" "sftp_poll" {
 
 resource "aws_cloudwatch_event_target" "sftp_poll" {
   for_each = { for k, v in var.letter_suppliers : k => v if v.polling_enabled }
-  rule = aws_cloudwatch_event_rule.sftp_poll.name
-  arn  = module.lambda_sftp_poll.function_arn
+  rule     = aws_cloudwatch_event_rule.sftp_poll[each.key].name
+  arn      = module.lambda_sftp_poll.function_arn
 
-  input = {
-    supplier: each.key
-  }
+  input = jsonencode({
+    supplier : each.key
+  })
 }
 
 resource "aws_lambda_permission" "allow_cloudwatch" {
-  for_each = { for k, v in var.letter_suppliers : k => v if v.polling_enabled }
-  statement_id  = "AllowExecutionFromCloudWatch"
+  for_each      = { for k, v in var.letter_suppliers : k => v if v.polling_enabled }
+  statement_id  = "AllowExecutionFromCloudWatch${each.key}"
   action        = "lambda:InvokeFunction"
   function_name = module.lambda_sftp_poll.function_name
   principal     = "events.amazonaws.com"
-  source_arn    = aws_cloudwatch_event_rule.sftp_poll.arn
+  source_arn    = aws_cloudwatch_event_rule.sftp_poll[each.key].arn
 }

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

@@ -12,12 +12,12 @@ module "lambda_sftp_poll" {
   execution_role_policy_document = data.aws_iam_policy_document.sftp_poll.json
 
   environment_variables = {
-    CREDENTIALS_TTL_MS      = 900 * 1000
-    CSI                     = local.csi
-    QUARANTINE_BUCKET_NAME  = module.s3bucket_quarantine.id
-    NODE_OPTIONS            = "--enable-source-maps",
-    REGION                  = var.region
-    SFTP_ENVIRONMENT        = local.sftp_environment
+    CREDENTIALS_TTL_MS     = 900 * 1000
+    CSI                    = local.csi
+    QUARANTINE_BUCKET_NAME = module.s3bucket_quarantine.id
+    NODE_OPTIONS           = "--enable-source-maps",
+    REGION                 = var.region
+    SFTP_ENVIRONMENT       = local.sftp_environment
   }
 
   timeout = 20

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