Merge branch 'main' of https://github.com/NHSDigital/nhs-notify-web-template-management into feature/CCM-11343_rtl-disable-proofing

bhansell1 · bhansell1 · commit c32ad32bc384 · 2025-07-31T16:17:10.000+01:00
diff --git a/.github/actions/acceptance-tests/action.yaml b/.github/actions/acceptance-tests/action.yaml
@@ -44,30 +44,9 @@ runs:
       run: |
         make test-${{ inputs.testType }}
 
-    - name: Archive ui-e2e test results
-      if: ${{ inputs.testType == 'ui-e2e' }}
+    - name: Archive test results
       uses: actions/upload-artifact@v4
+      if: always()
       with:
-        name: UI E2E test report
-        path: "tests/test-team/playwright-report"
-
-    - name: Archive ui-component test results
-      if: ${{ inputs.testType == 'ui-component' }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: UI-component test report
-        path: "tests/test-team/playwright-report"
-
-    - name: Archive api test results
-      if: ${{ inputs.testType == 'api' }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: API test report
-        path: "tests/test-team/playwright-report"
-
-    - name: Archive accessibility results
-      if: ${{ inputs.testType == 'accessibility' }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: accessibility
-        path: "tests/accessibility/.reports/accessibility"
+        name: ${{ inputs.testType }} - test report
+        path: "tests/acceptance-test-report"
diff --git a/.github/workflows/cicd-1-pull-request.yaml b/.github/workflows/cicd-1-pull-request.yaml
@@ -6,8 +6,6 @@ on:
   push:
     branches:
       - "**"
-  pull_request:
-    types: [opened, reopened]
 
 jobs:
   metadata:
diff --git a/.tool-versions b/.tool-versions
@@ -3,7 +3,7 @@ gitleaks 8.24.0
 jq 1.6
 nodejs 20.18.2
 pre-commit 3.6.0
-terraform 1.9.2
+terraform 1.10.1
 terraform-docs 0.19.0
 trivy 0.61.0
 vale 3.6.0
diff --git a/infrastructure/terraform/bin/terraform.sh b/infrastructure/terraform/bin/terraform.sh
@@ -599,7 +599,7 @@ readonly backend_config="terraform {
     region         = \"${region}\"
     bucket         = \"${bucket}\"
     key            = \"${backend_key}\"
-    dynamodb_table = \"${bucket}\"
+    use_lockfile   = true
   }
 }";
 
diff --git a/infrastructure/terraform/components/acct/.tool-versions b/infrastructure/terraform/components/acct/.tool-versions
@@ -1 +1 @@
-terraform 1.9.2
+terraform 1.10.1
diff --git a/infrastructure/terraform/components/acct/README.md b/infrastructure/terraform/components/acct/README.md
@@ -6,7 +6,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10.1 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.50 |
 ## Inputs
 
diff --git a/infrastructure/terraform/components/acct/versions.tf b/infrastructure/terraform/components/acct/versions.tf
@@ -6,5 +6,5 @@ terraform {
     }
   }
 
-  required_version = ">= 1.9.0"
+  required_version = ">= 1.10.1"
 }
diff --git a/infrastructure/terraform/components/app/.tool-versions b/infrastructure/terraform/components/app/.tool-versions
@@ -1 +1 @@
-terraform 1.9.2
+terraform 1.10.1
diff --git a/infrastructure/terraform/components/branch/README.md b/infrastructure/terraform/components/branch/README.md
@@ -6,7 +6,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10.1 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.50 |
 ## Inputs
 
diff --git a/infrastructure/terraform/components/branch/versions.tf b/infrastructure/terraform/components/branch/versions.tf
@@ -6,5 +6,5 @@ terraform {
     }
   }
 
-  required_version = ">= 1.9.0"
+  required_version = ">= 1.10.1"
 }
diff --git a/infrastructure/terraform/components/sandbox/.tool-versions b/infrastructure/terraform/components/sandbox/.tool-versions
@@ -1 +1 @@
-terraform 1.9.2
+terraform 1.10.1
diff --git a/infrastructure/terraform/components/sandbox/README.md b/infrastructure/terraform/components/sandbox/README.md
@@ -6,7 +6,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10.1 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.50 |
 ## Inputs
 
@@ -18,7 +18,6 @@
 | <a name="input_environment"></a> [environment](#input\_environment) | The name of the tfscaffold environment | `string` | n/a | yes |
 | <a name="input_group"></a> [group](#input\_group) | The group variables are being inherited from (often synonymous with account short-name) | `string` | n/a | yes |
 | <a name="input_kms_deletion_window"></a> [kms\_deletion\_window](#input\_kms\_deletion\_window) | When a kms key is deleted, how long should it wait in the pending deletion state? | `string` | `"30"` | no |
-| <a name="input_letter_suppliers"></a> [letter\_suppliers](#input\_letter\_suppliers) | Letter suppliers enabled in the environment | <pre>map(object({<br/>    email_addresses  = list(string)<br/>    enable_polling   = bool<br/>    default_supplier = optional(bool)<br/>  }))</pre> | <pre>{<br/>  "WTMMOCK": {<br/>    "default_supplier": true,<br/>    "email_addresses": [],<br/>    "enable_polling": true<br/>  }<br/>}</pre> | no |
 | <a name="input_log_retention_in_days"></a> [log\_retention\_in\_days](#input\_log\_retention\_in\_days) | The retention period in days for the Cloudwatch Logs events to be retained, default of 0 is indefinite | `number` | `0` | no |
 | <a name="input_parent_acct_environment"></a> [parent\_acct\_environment](#input\_parent\_acct\_environment) | Name of the environment responsible for the acct resources used, affects things like DNS zone. Useful for named dev environments | `string` | `"main"` | no |
 | <a name="input_project"></a> [project](#input\_project) | The name of the tfscaffold project | `string` | n/a | yes |
@@ -47,8 +46,7 @@
 | <a name="output_sftp_poll_lambda_name"></a> [sftp\_poll\_lambda\_name](#output\_sftp\_poll\_lambda\_name) | n/a |
 | <a name="output_templates_table_name"></a> [templates\_table\_name](#output\_templates\_table\_name) | n/a |
 | <a name="output_test_email_bucket_name"></a> [test\_email\_bucket\_name](#output\_test\_email\_bucket\_name) | n/a |
-| <a name="output_test_proof_requested_email_prefix"></a> [test\_proof\_requested\_email\_prefix](#output\_test\_proof\_requested\_email\_prefix) | n/a |
-| <a name="output_test_template_submitted_email_prefix"></a> [test\_template\_submitted\_email\_prefix](#output\_test\_template\_submitted\_email\_prefix) | n/a |
+| <a name="output_test_email_bucket_prefix"></a> [test\_email\_bucket\_prefix](#output\_test\_email\_bucket\_prefix) | n/a |
 <!-- vale on -->
 <!-- markdownlint-enable -->
 <!-- END_TF_DOCS -->
diff --git a/infrastructure/terraform/components/sandbox/locals.tf b/infrastructure/terraform/components/sandbox/locals.tf
@@ -1,21 +1,6 @@
 locals {
-  mock_letter_supplier_name = "WTMMOCK"
-
-  use_sftp_letter_supplier_mock = lookup(var.letter_suppliers, local.mock_letter_supplier_name, null) != null
-
   email_domain                                           = "sandbox.${local.acct.dns_zone["name"]}"
   sandbox_letter_supplier_mock_proof_requested_sender    = "proof-requested-sender-${var.environment}@${local.email_domain}"
   sandbox_letter_supplier_mock_template_submitted_sender = "template-submitted-sender-${var.environment}@${local.email_domain}"
   sandbox_letter_supplier_mock_recipient                 = "supplier-recipient-${var.environment}@${local.email_domain}"
-
-  # var.letter_suppliers is defined at a point where we don't know what the environment is, so
-  # we need to add the environment-dependent test recipient separately here
-  letter_suppliers = local.use_sftp_letter_supplier_mock ? merge(
-    var.letter_suppliers,
-    { WTMMOCK = {
-      email_addresses  = concat(var.letter_suppliers.WTMMOCK.email_addresses, [local.sandbox_letter_supplier_mock_recipient])
-      enable_polling   = true
-      default_supplier = true
-    } }
-  ) : var.letter_suppliers
 }
diff --git a/infrastructure/terraform/components/sandbox/module_backend_api.tf b/infrastructure/terraform/components/sandbox/module_backend_api.tf
@@ -18,7 +18,13 @@ module "backend_api" {
   }
 
   enable_proofing  = true
-  letter_suppliers = local.letter_suppliers
+  letter_suppliers = {
+    WTMMOCK = {
+      email_addresses  = [local.sandbox_letter_supplier_mock_recipient]
+      enable_polling   = true
+      default_supplier = true
+    }
+  }
 
   kms_key_arn = data.aws_kms_key.sandbox.arn
 
diff --git a/infrastructure/terraform/components/sandbox/outputs.tf b/infrastructure/terraform/components/sandbox/outputs.tf
@@ -62,11 +62,6 @@ output "test_email_bucket_name" {
   value = local.acct["ses_testing_config"].bucket_name
 }
 
-output "test_proof_requested_email_prefix" {
-  value = "proof-requested-emails-${var.environment}"
-}
-
-
-output "test_template_submitted_email_prefix" {
-  value = "template-submitted-emails-${var.environment}"
+output "test_email_bucket_prefix" {
+  value = "emails-${var.environment}"
 }
diff --git a/infrastructure/terraform/components/sandbox/ses_receipt_rule.tf b/infrastructure/terraform/components/sandbox/ses_receipt_rule.tf
@@ -2,16 +2,15 @@ resource "aws_ses_receipt_rule" "proof_requested" {
   name          = "${local.csi}-store-email-proof-requested"
   rule_set_name = local.acct["ses_testing_config"].rule_set_name
 
-  # Despite being called "recipients", AWS appears to apply this check to the sender email
-  recipients    = [local.sandbox_letter_supplier_mock_proof_requested_sender]
+  recipients    = [local.sandbox_letter_supplier_mock_recipient]
   enabled       = true
   scan_enabled  = true
   tls_policy    = "Optional"
 
   s3_action {
     position          = 1
     bucket_name       = local.acct["ses_testing_config"].bucket_name
-    object_key_prefix = "proof-requested-emails-${var.environment}/"
+    object_key_prefix = "emails-${var.environment}/"
     iam_role_arn      = local.acct["ses_testing_config"].iam_role_arn
   }
 }
diff --git a/infrastructure/terraform/components/sandbox/ses_receipt_rule_template_submitted.tf b/infrastructure/terraform/components/sandbox/ses_receipt_rule_template_submitted.tf
diff --git a/infrastructure/terraform/components/sandbox/variables.tf b/infrastructure/terraform/components/sandbox/variables.tf
@@ -63,32 +63,6 @@ variable "kms_deletion_window" {
   default     = "30"
 }
 
-variable "letter_suppliers" {
-  type = map(object({
-    email_addresses  = list(string)
-    enable_polling   = bool
-    default_supplier = optional(bool)
-  }))
-
-  default = {
-    "WTMMOCK" = {
-      email_addresses  = []
-      enable_polling   = true
-      default_supplier = true
-    }
-  }
-
-  validation {
-    condition = (
-      length(var.letter_suppliers) == 0 ||
-      length([for s in values(var.letter_suppliers) : s if s.default_supplier]) == 1
-    )
-    error_message = "If letter suppliers are configured, exactly one must be default_supplier"
-  }
-
-  description = "Letter suppliers enabled in the environment"
-}
-
 variable "parent_acct_environment" {
   type        = string
   description = "Name of the environment responsible for the acct resources used, affects things like DNS zone. Useful for named dev environments"
diff --git a/infrastructure/terraform/components/sandbox/versions.tf b/infrastructure/terraform/components/sandbox/versions.tf
@@ -6,5 +6,5 @@ terraform {
     }
   }
 
-  required_version = ">= 1.9.0"
+  required_version = ">= 1.10.1"
 }
diff --git a/scripts/tests/accessibility.sh b/scripts/tests/accessibility.sh
@@ -4,20 +4,22 @@ set -euo pipefail
 
 # feature flag
 export NEXT_PUBLIC_ENABLE_PROOFING=true
-
 export INCLUDE_AUTH_PAGES=true
 
 npm run accessibility-test-setup -w tests/accessibility
-
 npm run build
-
 mkdir -p ./frontend/public/testing
 cp ./utils/utils/src/email-templates/* ./frontend/public/testing/
 
 npm run app:start --prefix frontend
-
 npm run app:wait --prefix frontend
 
-npm run test:accessibility -w tests/accessibility
+TEST_EXIT_CODE=0
+npm run test:accessibility -w tests/accessibility || TEST_EXIT_CODE=$?
+echo "TEST_EXIT_CODE=$TEST_EXIT_CODE"
 
+mkdir -p ./tests/acceptance-test-report
+cp -r ./tests/accessibility/.reports/accessibility ./tests/acceptance-test-report
 npm run accessibility-test-teardown  -w tests/accessibility
+
+exit $TEST_EXIT_CODE
diff --git a/scripts/tests/api.sh b/scripts/tests/api.sh
@@ -4,4 +4,12 @@ set -euo pipefail
 cd "$(git rev-parse --show-toplevel)"
 npx playwright install --with-deps > /dev/null
 cd tests/test-team
-npm run test:api
+TEST_EXIT_CODE=0
+npm run test:api || TEST_EXIT_CODE=$?
+echo "TEST_EXIT_CODE=$TEST_EXIT_CODE"
+
+mkdir -p ../acceptance-test-report
+cp -r ./playwright-report ../acceptance-test-report
+[[ -e test-results ]] && cp -r ./test-results ../acceptance-test-report
+
+exit $TEST_EXIT_CODE
diff --git a/scripts/tests/ui-component.sh b/scripts/tests/ui-component.sh
@@ -4,4 +4,12 @@ set -euo pipefail
 cd "$(git rev-parse --show-toplevel)"
 npx playwright install --with-deps > /dev/null
 cd tests/test-team
-npm run test:local-ui
+TEST_EXIT_CODE=0
+npm run test:local-ui || TEST_EXIT_CODE=$?
+echo "TEST_EXIT_CODE=$TEST_EXIT_CODE"
+
+mkdir -p ../acceptance-test-report
+cp -r ./playwright-report ../acceptance-test-report
+[[ -e test-results ]] && cp -r ./test-results ../acceptance-test-report
+
+exit $TEST_EXIT_CODE
diff --git a/scripts/tests/ui-e2e.sh b/scripts/tests/ui-e2e.sh
@@ -4,4 +4,12 @@ set -euo pipefail
 cd "$(git rev-parse --show-toplevel)"
 npx playwright install --with-deps > /dev/null
 cd tests/test-team
-npm run test:e2e
+TEST_EXIT_CODE=0
+npm run test:e2e || TEST_EXIT_CODE=$?
+echo "TEST_EXIT_CODE=$TEST_EXIT_CODE"
+
+mkdir -p ../acceptance-test-report
+cp -r ./playwright-report ../acceptance-test-report
+[[ -e test-results ]] && cp -r ./test-results ../acceptance-test-report
+
+exit $TEST_EXIT_CODE
diff --git a/tests/test-team/global.d.ts b/tests/test-team/global.d.ts
@@ -14,8 +14,7 @@ declare global {
       TEMPLATES_INTERNAL_BUCKET_NAME: string;
       TEMPLATES_QUARANTINE_BUCKET_NAME: string;
       TEMPLATES_DOWNLOAD_BUCKET_NAME: string;
-      TEST_TEMPLATE_SUBMITTED_EMAIL_PREFIX: string;
-      TEST_PROOF_REQUESTED_EMAIL_PREFIX: string;
+      TEST_EMAIL_BUCKET_PREFIX: string;
     }
   }
 
diff --git a/tests/test-team/helpers/email-helper.ts b/tests/test-team/helpers/email-helper.ts
@@ -54,7 +54,8 @@ export class EmailHelper {
   async getEmailForTemplateId(
     prefix: string,
     templateId: string,
-    dateCutoff: Date
+    dateCutoff: Date,
+    extraTextToSearch: string
   ) {
     const s3Items = await this.getAllS3Items(prefix);
 
@@ -82,7 +83,7 @@ export class EmailHelper {
 
       const content = await streamToString(Body);
 
-      if (content.includes(templateId)) {
+      if (content.includes(templateId) && content.includes(extraTextToSearch)) {
         return content;
       }
     }
diff --git a/tests/test-team/template-mgmt-api-tests/submit-template.api.spec.ts b/tests/test-team/template-mgmt-api-tests/submit-template.api.spec.ts
@@ -200,9 +200,10 @@ test.describe('POST /v1/template/:templateId/submit', () => {
 
       await expect(async () => {
         const emailContents = await emailHelper.getEmailForTemplateId(
-          process.env.TEST_TEMPLATE_SUBMITTED_EMAIL_PREFIX,
+          process.env.TEST_EMAIL_BUCKET_PREFIX,
           templateId,
-          start
+          start,
+          'template-submitted-sender'
         );
 
         expect(emailContents).toContain(templateId);
diff --git a/tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-full.e2e.spec.ts b/tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-full.e2e.spec.ts
diff --git a/utils/backend-config/src/backend-config.ts b/utils/backend-config/src/backend-config.ts

Original file line number	Diff line number	Diff line change
`@@ -599,7 +599,7 @@ readonly backend_config="terraform {`
`599`	`599`	`region = \"${region}\"`
`600`	`600`	`bucket = \"${bucket}\"`
`601`	`601`	`key = \"${backend_key}\"`
`602`		`- dynamodb_table = \"${bucket}\"`
	`602`	`+ use_lockfile = true`
`603`	`603`	`}`
`604`	`604`	`}";`
`605`	`605`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ terraform {`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`
`9`		`- required_version = ">= 1.9.0"`
	`9`	`+ required_version = ">= 1.10.1"`
`10`	`10`	`}`