CCM-10442: Test fixes

Author: chris-elliott-nhsd

infrastructure/terraform/components/sandbox/README.md

@@ -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 |

infrastructure/terraform/components/sandbox/module_backend_api.tf

@@ -20,7 +20,7 @@ module "backend_api" {
   enable_proofing  = true
   letter_suppliers = {
     WTMMOCK = {
-      email_addresses  = concat(var.letter_suppliers.WTMMOCK.email_addresses, [local.sandbox_letter_supplier_mock_recipient])
+      email_addresses  = [local.sandbox_letter_supplier_mock_recipient]
       enable_polling   = true
       default_supplier = true
     }

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"

tests/test-team/helpers/email-helper.ts

@@ -55,7 +55,7 @@ export class EmailHelper {
     prefix: string,
     templateId: string,
     dateCutoff: Date,
-    extraTextToSearch: string,
+    extraTextToSearch: string
   ) {
     const s3Items = await this.getAllS3Items(prefix);
 

tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-full.e2e.spec.ts

@@ -261,15 +261,15 @@ function checkEmail(
   expandedTemplateId: string,
   testStart: Date,
   emailTitle: string,
-  extraTextToSearch: string,
+  extraTextToSearch: string
 ) {
   return test.step('check email', async () => {
     await expect(async () => {
       const emailContents = await emailHelper.getEmailForTemplateId(
         process.env.TEST_EMAIL_BUCKET_PREFIX,
         expandedTemplateId,
         testStart,
-        extraTextToSearch,
+        extraTextToSearch
       );
 
       expect(emailContents).toContain(expandedTemplateId);
@@ -325,7 +325,7 @@ test.describe('letter complete e2e journey', () => {
       expandedTemplateId,
       testStart,
       'Proof Requested',
-      'proof-requested-sender',
+      'proof-requested-sender'
     );
 
     await submit(page, templateStorageHelper, templateKey);
@@ -334,7 +334,7 @@ test.describe('letter complete e2e journey', () => {
       expandedTemplateId,
       testStart,
       'Template Submitted',
-      'template-submitted-sender',
+      'template-submitted-sender'
     );
   });
 

utils/backend-config/src/backend-config.ts

@@ -38,8 +38,7 @@ export const BackendConfigHelper = {
       userPoolClientId: process.env.USER_POOL_CLIENT_ID ?? '',
       sftpPollLambdaName: process.env.SFTP_POLL_LAMBDA_NAME ?? '',
       testEmailBucketName: process.env.TEST_EMAIL_BUCKET_NAME ?? '',
-      testEmailBucketPrefix:
-        process.env.TEST_EMAIL_BUCKET_PREFIX ?? '',
+      testEmailBucketPrefix: process.env.TEST_EMAIL_BUCKET_PREFIX ?? '',
     };
   },
 
@@ -60,8 +59,7 @@ export const BackendConfigHelper = {
       config.templatesDownloadBucketName;
     process.env.SFTP_POLL_LAMBDA_NAME = config.sftpPollLambdaName;
     process.env.TEST_EMAIL_BUCKET_NAME = config.testEmailBucketName;
-    process.env.TEST_EMAIL_BUCKET_PREFIX =
-      config.testEmailBucketPrefix;
+    process.env.TEST_EMAIL_BUCKET_PREFIX = config.testEmailBucketPrefix;
   },
 
   fromTerraformOutputsFile(filepath: string): BackendConfig {