CCM-7940: Reduce lambda bundle size

chris-elliott-nhsd · chris-elliott-nhsd · commit 4886e1f76f9f · 2025-07-15T14:41:23.000+01:00
diff --git a/infrastructure/terraform/modules/backend-api/module_create_letter_template_lambda.tf b/infrastructure/terraform/modules/backend-api/module_create_letter_template_lambda.tf
@@ -27,7 +27,7 @@ module "create_letter_template_lambda" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/create-letter"
 
   send_to_firehose          = var.send_to_firehose
   log_destination_arn       = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_create_template_lambda.tf b/infrastructure/terraform/modules/backend-api/module_create_template_lambda.tf
@@ -27,7 +27,7 @@ module "create_template_lambda" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/create"
 
   send_to_firehose          = var.send_to_firehose
   log_destination_arn       = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_delete_template_lambda.tf b/infrastructure/terraform/modules/backend-api/module_delete_template_lambda.tf
@@ -27,7 +27,7 @@ module "delete_template_lambda" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/delete"
 
   send_to_firehose          = var.send_to_firehose
   log_destination_arn       = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_get_client_lambda.tf b/infrastructure/terraform/modules/backend-api/module_get_client_lambda.tf
@@ -27,7 +27,7 @@ module "get_client_lambda" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/get-client"
 
   send_to_firehose          = var.send_to_firehose
   log_destination_arn       = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_get_template_lambda.tf b/infrastructure/terraform/modules/backend-api/module_get_template_lambda.tf
@@ -27,7 +27,7 @@ module "get_template_lambda" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/get"
 
   send_to_firehose          = var.send_to_firehose
   log_destination_arn       = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_lambda_copy_scanned_object_to_internal.tf b/infrastructure/terraform/modules/backend-api/module_lambda_copy_scanned_object_to_internal.tf
@@ -27,7 +27,7 @@ module "lambda_copy_scanned_object_to_internal" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/copy-scanned-object-to-internal"
 
   send_to_firehose             = var.send_to_firehose
   log_destination_arn          = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_lambda_delete_failed_scanned_object.tf b/infrastructure/terraform/modules/backend-api/module_lambda_delete_failed_scanned_object.tf
@@ -27,7 +27,7 @@ module "lambda_delete_failed_scanned_object" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/delete-failed-scanned-object"
 
   send_to_firehose             = var.send_to_firehose
   log_destination_arn          = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_lambda_process_proof.tf b/infrastructure/terraform/modules/backend-api/module_lambda_process_proof.tf
@@ -27,7 +27,7 @@ module "lambda_process_proof" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/process-proof"
 
   send_to_firehose             = var.send_to_firehose
   log_destination_arn          = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_lambda_request_proof.tf b/infrastructure/terraform/modules/backend-api/module_lambda_request_proof.tf
@@ -27,7 +27,7 @@ module "request_proof_lambda" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/proof"
 
   send_to_firehose          = var.send_to_firehose
   log_destination_arn       = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_lambda_set_letter_file_virus_scan_status_for_upload.tf b/infrastructure/terraform/modules/backend-api/module_lambda_set_letter_file_virus_scan_status_for_upload.tf
@@ -27,7 +27,7 @@ module "lambda_set_file_virus_scan_status_for_upload" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/set-letter-upload-virus-scan-status"
 
   send_to_firehose             = var.send_to_firehose
   log_destination_arn          = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_lambda_validate_letter_template_files.tf b/infrastructure/terraform/modules/backend-api/module_lambda_validate_letter_template_files.tf
@@ -28,7 +28,7 @@ module "lambda_validate_letter_template_files" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/validate-letter-template-files"
 
   send_to_firehose          = var.send_to_firehose
   log_destination_arn       = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_list_template_lambda.tf b/infrastructure/terraform/modules/backend-api/module_list_template_lambda.tf
@@ -27,7 +27,7 @@ module "list_template_lambda" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/list"
 
   send_to_firehose          = var.send_to_firehose
   log_destination_arn       = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_submit_template_lambda.tf b/infrastructure/terraform/modules/backend-api/module_submit_template_lambda.tf
@@ -27,7 +27,7 @@ module "submit_template_lambda" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/submit"
 
   send_to_firehose          = var.send_to_firehose
   log_destination_arn       = var.log_destination_arn
diff --git a/infrastructure/terraform/modules/backend-api/module_update_template_lambda.tf b/infrastructure/terraform/modules/backend-api/module_update_template_lambda.tf
@@ -27,7 +27,7 @@ module "update_template_lambda" {
   lambda_env_vars         = local.backend_lambda_environment_variables
   function_s3_bucket      = var.function_s3_bucket
   function_code_base_path = local.lambdas_dir
-  function_code_dir       = "backend-api/dist"
+  function_code_dir       = "backend-api/dist/update"
 
   send_to_firehose          = var.send_to_firehose
   log_destination_arn       = var.log_destination_arn
diff --git a/lambdas/backend-api/build.sh b/lambdas/backend-api/build.sh
@@ -11,9 +11,8 @@ npx esbuild \
     --target=es2020 \
     --platform=node \
     --loader:.node=file \
-    --entry-names=[name] \
+    --entry-names=[name]/[name] \
     --outdir=dist \
-    --external:pdfjs-dist \
     src/templates/copy-scanned-object-to-internal.ts \
     src/templates/create-letter.ts \
     src/templates/create.ts \
@@ -29,4 +28,4 @@ npx esbuild \
     src/templates/update.ts \
     src/templates/validate-letter-template-files.ts
 
-cp -r ../../utils/utils/src/email-templates ./dist
+cp -r ../../utils/utils/src/email-templates ./dist/submit
diff --git a/lambdas/backend-api/src/__tests__/utils/validate.test.ts b/lambdas/backend-api/src/__tests__/utils/validate.test.ts
@@ -1,7 +1,6 @@
-import { z } from 'zod';
 import { validate, formatZodErrors } from '../../utils';
 import { mockDeep } from 'jest-mock-extended';
-import { ZodError } from 'zod/v4';
+import { z, ZodError } from 'zod/v4';
 
 describe('validate', () => {
   test('should return error when schema is invalid', async () => {
diff --git a/lambdas/backend-api/src/__tests__/utils/zod-json-preprocessor.test.ts b/lambdas/backend-api/src/__tests__/utils/zod-json-preprocessor.test.ts
@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 import { parseJsonPreprocessor } from '@backend-api/utils/zod-json-preprocessor';
 import { mock } from 'jest-mock-extended';
 
diff --git a/lambdas/backend-api/src/templates/app/template-client.ts b/lambdas/backend-api/src/templates/app/template-client.ts
@@ -24,7 +24,7 @@ import { Logger } from 'nhs-notify-web-template-management-utils/logger';
 import { LetterUploadRepository } from '../infra/letter-upload-repository';
 import { ProofingQueue } from '../infra/proofing-queue';
 import { ClientConfigRepository } from '../infra/client-config-repository';
-import z from 'zod';
+import { z } from 'zod/v4-mini';
 
 export class TemplateClient {
   private $LetterForProofing = z.intersection(
diff --git a/lambdas/backend-api/src/templates/domain/test-data-csv.ts b/lambdas/backend-api/src/templates/domain/test-data-csv.ts
@@ -1,5 +1,5 @@
 import { parse } from 'csv-parse/sync';
-import z from 'zod';
+import { z } from 'zod/v4';
 
 const $ExpectedHeaders = z.enum([
   'Personalisation field',
diff --git a/lambdas/backend-api/src/templates/infra/client-config-repository.ts b/lambdas/backend-api/src/templates/infra/client-config-repository.ts
@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 import NodeCache from 'node-cache';
 import {
   GetParameterCommand,
diff --git a/lambdas/backend-api/src/templates/infra/config.ts b/lambdas/backend-api/src/templates/infra/config.ts
@@ -1,4 +1,4 @@
-import z from 'zod';
+import { z } from 'zod/v4';
 
 const $Env = z.object({
   CLIENT_CONFIG_SSM_KEY_PREFIX: z.string(),
diff --git a/lambdas/backend-api/src/templates/infra/letter-upload-repository.ts b/lambdas/backend-api/src/templates/infra/letter-upload-repository.ts
@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 import { ErrorCase } from 'nhs-notify-backend-client';
 import type {
   FileType,
diff --git a/lambdas/backend-api/src/utils/validate.ts b/lambdas/backend-api/src/utils/validate.ts
@@ -1,5 +1,5 @@
 import { ErrorCase } from 'nhs-notify-backend-client';
-import { z } from 'zod';
+import { z } from 'zod/v4';
 import { ApplicationResult, failure, success } from './result';
 
 export const formatZodErrors = (error: z.ZodError) => {
diff --git a/lambdas/backend-api/src/utils/zod-json-preprocessor.ts b/lambdas/backend-api/src/utils/zod-json-preprocessor.ts
@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 
 export const parseJsonPreprocessor = (value: unknown, ctx: z.RefinementCtx) => {
   try {
diff --git a/lambdas/backend-client/src/schemas/client.ts b/lambdas/backend-client/src/schemas/client.ts
@@ -1,4 +1,4 @@
-import z from 'zod';
+import { z } from 'zod/v4';
 import { schemaFor } from './schema-for';
 import { ClientConfiguration, ClientFeatures } from '../types/generated';
 
diff --git a/lambdas/backend-client/src/schemas/schema-for.ts b/lambdas/backend-client/src/schemas/schema-for.ts
@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 
 export const schemaFor =
   <Output, Input = Output>() =>
diff --git a/lambdas/backend-client/src/schemas/template-schema.ts b/lambdas/backend-client/src/schemas/template-schema.ts
@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 import {
   BaseTemplate,
   CreateLetterProperties,
diff --git a/utils/utils/src/lambda-cognito-authorizer.ts b/utils/utils/src/lambda-cognito-authorizer.ts
@@ -6,7 +6,7 @@ import { verify } from 'jsonwebtoken';
 import getJwksClient from 'jwks-rsa';
 import { jwtDecode } from 'jwt-decode';
 import type { Logger } from './logger';
-import z from 'zod';
+import z from 'zod/v4';
 
 const $AccessToken = z.object({
   client_id: z.string(),
