Address review comments

Author: stevebux

infrastructure/terraform/components/api/locals.tf

@@ -5,14 +5,14 @@ locals {
   root_domain_nameservers       = local.acct.route53_zone_nameservers["supplier-api"]
 
   openapi_spec = templatefile("${path.module}/resources/spec.tmpl.json", {
-    APIG_EXECUTION_ROLE_ARN  = aws_iam_role.api_gateway_execution_role.arn
-    AWS_REGION               = var.region
-    AUTHORIZER_LAMBDA_ARN    = module.authorizer_lambda.function_arn
-    GET_LETTER_LAMBDA_ARN  = module.get_letter.function_arn
-    GET_LETTERS_LAMBDA_ARN  = module.get_letters.function_arn
+    APIG_EXECUTION_ROLE_ARN     = aws_iam_role.api_gateway_execution_role.arn
+    AWS_REGION                  = var.region
+    AUTHORIZER_LAMBDA_ARN       = module.authorizer_lambda.function_arn
+    GET_LETTER_LAMBDA_ARN       = module.get_letter.function_arn
+    GET_LETTERS_LAMBDA_ARN      = module.get_letters.function_arn
     GET_LETTER_DATA_LAMBDA_ARN  = module.get_letter_data.function_arn
-    PATCH_LETTER_LAMBDA_ARN  = module.patch_letter.function_arn
-    GET_STATUS_LAMBDA_ARN = module.get_status.function_arn
+    GET_STATUS_LAMBDA_ARN       = module.get_status.function_arn
+    PATCH_LETTER_LAMBDA_ARN     = module.patch_letter.function_arn
   })
 
   destination_arn = "arn:aws:logs:${var.region}:${var.shared_infra_account_id}:destination:nhs-main-obs-firehose-logs"

infrastructure/terraform/components/api/module_lambda_get_status.tf

@@ -34,10 +34,6 @@ module "get_status" {
   send_to_firehose          = true
   log_destination_arn       = local.destination_arn
   log_subscription_role_arn = local.acct.log_subscription_role_arn
-
-  lambda_env_vars = merge(local.common_lambda_env_vars, {
-    MAX_LIMIT = var.max_get_limit
-  })
 }
 
 data "aws_iam_policy_document" "get_status_lambda" {

lambdas/api-handler/src/config/deps.ts

@@ -13,36 +13,39 @@ export type Deps = {
   env: EnvVars
 };
 
-function createLetterRepository(log: pino.Logger, envVars: EnvVars): LetterRepository {
+function createDocumentClient(): DynamoDBDocumentClient {
   const ddbClient = new DynamoDBClient({});
-  const docClient = DynamoDBDocumentClient.from(ddbClient);
+  return DynamoDBDocumentClient.from(ddbClient);
+}
+
+
+function createLetterRepository(documentClient: DynamoDBDocumentClient, log: pino.Logger, envVars: EnvVars): LetterRepository {
   const config = {
     lettersTableName: envVars.LETTERS_TABLE_NAME,
     ttlHours: envVars.LETTER_TTL_HOURS
   };
 
-  return new LetterRepository(docClient, log, config);
+  return new LetterRepository(documentClient, log, config);
 }
 
-function createDBHealthcheck(envVars: EnvVars): DBHealthcheck {
-  const ddbClient = new DynamoDBClient({});
-  const docClient = DynamoDBDocumentClient.from(ddbClient);
+function createDBHealthcheck(documentClient: DynamoDBDocumentClient, envVars: EnvVars): DBHealthcheck {
   const config = {
     lettersTableName: envVars.LETTERS_TABLE_NAME,
     ttlHours: envVars.LETTER_TTL_HOURS
   };
 
-  return new DBHealthcheck(docClient, config);
+  return new DBHealthcheck(documentClient, config);
 }
 
 export function createDependenciesContainer(): Deps {
 
   const log = pino();
+  const documentClient = createDocumentClient();
 
   return {
     s3Client: new S3Client(),
-    letterRepo: createLetterRepository(log, envVars),
-    dbHealthcheck: createDBHealthcheck(envVars),
+    letterRepo: createLetterRepository(documentClient, log, envVars),
+    dbHealthcheck: createDBHealthcheck(documentClient, envVars),
     logger: log,
     env: envVars
   };

lambdas/api-handler/src/handlers/__tests__/get_status.test.ts

@@ -19,7 +19,7 @@ describe('API Lambda handler', () => {
 
     expect(result).toEqual({
       statusCode: 200,
-      body: JSON.stringify({}, null, 2),
+      body: '{}',
     });
   });
 

lambdas/api-handler/src/handlers/get-status.ts

@@ -25,11 +25,11 @@ export function createGetStatusHandler(deps: Deps): APIGatewayProxyHandler {
 
       return {
         statusCode: 200,
-        body: JSON.stringify({}, null, 2)
+        body: '{}'
       };
     } catch (error) {
       return mapErrorToResponse(error, commonHeadersResult.value.correlationId, deps.logger);
-  }
+    }
   }
 }