container fixes

Author: alexnuttall

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

@@ -1,9 +1,6 @@
 module "submit_routing_config_lambda" {
   source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.22/terraform-lambda.zip"
 
-  system_log_level      = "DEBUG"
-  application_log_level = "INFO"
-
   project        = var.project
   environment    = var.environment
   component      = var.component

lambdas/backend-api/src/templates/container.ts

@@ -25,7 +25,7 @@ const ddbDocClient = DynamoDBDocumentClient.from(
   }
 );
 
-const letterFileRepositoryContainer = () => {
+export const letterFileRepositoryContainer = () => {
   const { quarantineBucket, internalBucket, downloadBucket } = loadConfig();
 
   const letterFileRepository = new LetterFileRepository(
@@ -40,22 +40,7 @@ const letterFileRepositoryContainer = () => {
   };
 };
 
-const letterUploadRepositoryContainer = () => {
-  const { quarantineBucket, internalBucket, downloadBucket } = loadConfig();
-
-  const letterUploadRepository = new LetterUploadRepository(
-    quarantineBucket,
-    internalBucket,
-    downloadBucket
-  );
-
-  return {
-    letterUploadRepository,
-    logger,
-  };
-};
-
-const templateRepositoryContainer = () => {
+export const templateRepositoryContainer = () => {
   const { templatesTableName } = loadConfig();
 
   const templateRepository = new TemplateRepository(
@@ -75,10 +60,19 @@ export const letterFileRepositoryAndTemplateRepositoryContainer = () => ({
   logger,
 });
 
-export const validateLetterTemplateContainer = () => {
+export const validateLetterTemplateFilesContainer = () => {
+  const { quarantineBucket, internalBucket, downloadBucket } = loadConfig();
+
+  const letterUploadRepository = new LetterUploadRepository(
+    quarantineBucket,
+    internalBucket,
+    downloadBucket
+  );
+
   return {
     ...templateRepositoryContainer(),
-    ...letterUploadRepositoryContainer(),
+    letterUploadRepository,
+    logger,
   };
 };
 

lambdas/backend-api/src/templates/copy-scanned-object-to-internal.ts

@@ -1,4 +1,4 @@
 import { createHandler } from './api/copy-scanned-object-to-internal';
-import { uploadLetterFileRepositoryContainer } from './container';
+import { letterFileRepositoryContainer } from './container';
 
-export const handler = createHandler(uploadLetterFileRepositoryContainer());
+export const handler = createHandler(letterFileRepositoryContainer());

lambdas/backend-api/src/templates/process-proof.ts

@@ -1,6 +1,6 @@
 import { createHandler } from './api/process-proof';
-import { uploadLetterFileRepositoryAndTemplateRepositoryContainer } from './container';
+import { letterFileRepositoryAndTemplateRepositoryContainer } from './container';
 
 export const handler = createHandler(
-  uploadLetterFileRepositoryAndTemplateRepositoryContainer()
+  letterFileRepositoryAndTemplateRepositoryContainer()
 );

lambdas/backend-api/src/templates/set-letter-upload-virus-scan-status.ts

@@ -1,4 +1,4 @@
 import { createHandler } from './api/set-letter-upload-virus-scan-status';
-import { createTemplateRepositoryContainer } from './container';
+import { templateRepositoryContainer } from './container';
 
-export const handler = createHandler(createTemplateRepositoryContainer());
+export const handler = createHandler(templateRepositoryContainer());

lambdas/backend-api/src/templates/validate-letter-template-files.ts

@@ -1,6 +1,6 @@
 import { ValidateLetterTemplateFilesLambda } from './api/validate-letter-template-files';
-import { validateLetterTemplateContainer } from './container';
+import { validateLetterTemplateFilesContainer } from './container';
 
 export const handler = new ValidateLetterTemplateFilesLambda(
-  validateLetterTemplateContainer()
+  validateLetterTemplateFilesContainer()
 ).sqsHandler;