Merge branch 'main' into feature/CCM-12666_playwright-accessibility

Author: harrim91

infrastructure/terraform/components/app/README.md

@@ -13,7 +13,7 @@
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_AMPLIFY_BASIC_AUTH_SECRET"></a> [AMPLIFY\_BASIC\_AUTH\_SECRET](#input\_AMPLIFY\_BASIC\_AUTH\_SECRET) | Secret key/password to use for Amplify Basic Auth - This is intended to be read from CI variables and not committed to any codebase | `string` | `"unset"` | no |
-| <a name="input_CSRF_SECRET"></a> [CSRF\_SECRET](#input\_CSRF\_SECRET) | Secure cryptographic key to be used for generating CSRF tokens - This is intended to be read from CI variables and not committed to any codebase | `string` | n/a | yes |
+| <a name="input_CSRF_SECRET"></a> [CSRF\_SECRET](#input\_CSRF\_SECRET) | Secure cryptographic key to be used for generating CSRF tokens - This is intended to be read from CI variables and not committed to any codebase | `string` | `"value"` | no |
 | <a name="input_aws_account_id"></a> [aws\_account\_id](#input\_aws\_account\_id) | The AWS Account ID (numeric) | `string` | n/a | yes |
 | <a name="input_aws_principal_org_id"></a> [aws\_principal\_org\_id](#input\_aws\_principal\_org\_id) | The AWS Org ID (numeric) | `string` | n/a | yes |
 | <a name="input_backup_report_recipient"></a> [backup\_report\_recipient](#input\_backup\_report\_recipient) | Primary recipient of the Backup reports | `string` | `""` | no |
@@ -54,7 +54,7 @@
 | <a name="module_eventpub"></a> [eventpub](#module\_eventpub) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/eventpub | v2.0.19 |
 | <a name="module_kms"></a> [kms](#module\_kms) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-kms.zip | n/a |
 | <a name="module_kms_us_east_1"></a> [kms\_us\_east\_1](#module\_kms\_us\_east\_1) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-kms.zip | n/a |
-| <a name="module_nhse_backup_vault"></a> [nhse\_backup\_vault](#module\_nhse\_backup\_vault) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.23/terraform-aws-backup-source.zip | n/a |
+| <a name="module_nhse_backup_vault"></a> [nhse\_backup\_vault](#module\_nhse\_backup\_vault) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.25/terraform-aws-backup-source.zip | n/a |
 | <a name="module_s3bucket_cf_logs"></a> [s3bucket\_cf\_logs](#module\_s3bucket\_cf\_logs) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-s3bucket.zip | n/a |
 | <a name="module_ses"></a> [ses](#module\_ses) | ../../modules/ses | n/a |
 ## Outputs

infrastructure/terraform/components/app/module_nhse_backup_vault.tf

@@ -1,5 +1,5 @@
 module "nhse_backup_vault" {
-  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.23/terraform-aws-backup-source.zip"
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.25/terraform-aws-backup-source.zip"
   count  = var.destination_vault_arn != null ? 1 : 0
 
   component   = var.component

infrastructure/terraform/components/app/variables.tf

@@ -110,6 +110,7 @@ variable "CSRF_SECRET" {
   # Github only does uppercase env vars
   type        = string
   description = "Secure cryptographic key to be used for generating CSRF tokens - This is intended to be read from CI variables and not committed to any codebase"
+  default = "value"
 }
 
 variable "branch_name" {

lambdas/backend-api/build.sh

@@ -14,26 +14,26 @@ npx esbuild \
     --entry-names=[name]/[name] \
     --outdir=dist \
     --external:pdfjs-dist \
-    src/templates/copy-scanned-object-to-internal.ts \
-    src/templates/count-routing-configs.ts \
-    src/templates/create-routing-config.ts \
-    src/templates/create.ts \
-    src/templates/delete-failed-scanned-object.ts \
-    src/templates/delete.ts \
-    src/templates/delete-routing-config.ts \
-    src/templates/get-client.ts \
-    src/templates/get-routing-config.ts \
-    src/templates/get.ts \
-    src/templates/list-routing-configs.ts \
-    src/templates/list.ts \
-    src/templates/process-proof.ts \
-    src/templates/proof.ts \
-    src/templates/set-letter-upload-virus-scan-status.ts \
-    src/templates/submit-routing-config.ts \
-    src/templates/submit.ts \
-    src/templates/update-routing-config.ts \
-    src/templates/update.ts \
-    src/templates/upload-letter.ts \
-    src/templates/validate-letter-template-files.ts
+    src/copy-scanned-object-to-internal.ts \
+    src/count-routing-configs.ts \
+    src/create-routing-config.ts \
+    src/create.ts \
+    src/delete-failed-scanned-object.ts \
+    src/delete.ts \
+    src/delete-routing-config.ts \
+    src/get-client.ts \
+    src/get-routing-config.ts \
+    src/get.ts \
+    src/list-routing-configs.ts \
+    src/list.ts \
+    src/process-proof.ts \
+    src/proof.ts \
+    src/set-letter-upload-virus-scan-status.ts \
+    src/submit-routing-config.ts \
+    src/submit.ts \
+    src/update-routing-config.ts \
+    src/update.ts \
+    src/upload-letter.ts \
+    src/validate-letter-template-files.ts
 
 cp -r ../../utils/utils/src/email-templates ./dist/submit

…-scanned-object-to-internal.test.ts.snap …-scanned-object-to-internal.test.ts.snaplambdas/backend-api/src/__tests__/templates/api/__snapshots__/copy-scanned-object-to-internal.test.ts.snap renamed to lambdas/backend-api/src/__tests__/api/__snapshots__/copy-scanned-object-to-internal.test.ts.snap lambdas/backend-api/src/__tests__/templates/api/__snapshots__/copy-scanned-object-to-internal.test.ts.snap renamed to lambdas/backend-api/src/__tests__/api/__snapshots__/copy-scanned-object-to-internal.test.ts.snap

@@ -1,7 +1,7 @@
-import type { LetterFileRepository } from '../../../templates/infra/letter-file-repository';
+import type { LetterFileRepository } from '../../infra/letter-file-repository';
 import { makeGuardDutyMalwareScanResultNotificationEvent } from 'nhs-notify-web-template-management-test-helper-utils';
 import { mock } from 'jest-mock-extended';
-import { createHandler } from '../../../templates/api/copy-scanned-object-to-internal';
+import { createHandler } from '../../api/copy-scanned-object-to-internal';
 import { $GuardDutyMalwareScanStatusFailed } from 'nhs-notify-web-template-management-utils';
 import { createMockLogger } from 'nhs-notify-web-template-management-test-helper-utils/mock-logger';
 

…elete-failed-scanned-object.test.ts.snap …elete-failed-scanned-object.test.ts.snaplambdas/backend-api/src/__tests__/templates/api/__snapshots__/delete-failed-scanned-object.test.ts.snap renamed to lambdas/backend-api/src/__tests__/api/__snapshots__/delete-failed-scanned-object.test.ts.snap lambdas/backend-api/src/__tests__/templates/api/__snapshots__/delete-failed-scanned-object.test.ts.snap renamed to lambdas/backend-api/src/__tests__/api/__snapshots__/delete-failed-scanned-object.test.ts.snap

@@ -1,8 +1,8 @@
 import type { APIGatewayProxyEvent, Context } from 'aws-lambda';
 import { mock } from 'jest-mock-extended';
 import type { Logger } from 'nhs-notify-web-template-management-utils/logger';
-import { createHandler } from '@backend-api/templates/api/count-routing-configs';
-import { RoutingConfigClient } from '@backend-api/templates/app/routing-config-client';
+import { createHandler } from '../../api/count-routing-configs';
+import { RoutingConfigClient } from '../../app/routing-config-client';
 
 jest.mock('nhs-notify-web-template-management-utils/logger', () => ({
   logger: mock<Logger>({