CCM-10283: Code cleanup

Author: chris-elliott-nhsd

infrastructure/terraform/components/app/locals.tf

@@ -6,4 +6,17 @@ locals {
   mock_letter_supplier_name = "WTMMOCK"
 
   use_sftp_letter_supplier_mock = lookup(var.letter_suppliers, local.mock_letter_supplier_name, null) != null
+
+  sandbox_letter_supplier_mock_recipient = "template-submitted-recipient@${module.ses.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
 }

infrastructure/terraform/components/sandbox/locals.tf

@@ -5,6 +5,8 @@ locals {
 
   sandbox_letter_supplier_mock_recipient = "template-submitted-recipient-${var.environment}@sandbox.${local.acct.dns_zone["name"]}"
 
+  # 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 = {

infrastructure/terraform/components/sandbox/module_backend_api.tf

@@ -26,7 +26,7 @@ module "backend_api" {
 
   enable_event_stream = true
 
-  email_domain             = "sandbox.${local.acct.dns_zone["name"]}"
+  email_domain = "sandbox.${local.acct.dns_zone["name"]}"
 
   mock_letter_supplier_name     = local.mock_letter_supplier_name
   use_sftp_letter_supplier_mock = local.use_sftp_letter_supplier_mock

infrastructure/terraform/modules/backend-api/locals.tf

@@ -57,5 +57,5 @@ locals {
   ][0], "")
 
   sftp_environment = "${var.group}-${var.environment}-${var.component}"
-  template_submitted_sender_email_address = "template-submitted-recipient@${var.email_domain}"
+  template_submitted_sender_email_address = "template-submitted@${var.email_domain}"
 }

infrastructure/terraform/modules/ses/iam_role_ses_receipts.tf

@@ -25,7 +25,7 @@ data "aws_iam_policy_document" "ses_assumerole" {
   }
 }
 
-resource "aws_iam_role_policy" "ses_to_s3_policy" {
+resource "aws_iam_role_policy" "ses_receipts" {
   count = var.use_sftp_letter_supplier_mock ? 1 : 0
   name  = "${local.csi}-ses-receipts"
   role  = aws_iam_role.ses_receipts.0.id

infrastructure/terraform/modules/ses/ses_receipt_rule_set.tf

@@ -9,13 +9,13 @@ resource "aws_ses_receipt_rule" "store_email" {
 
   name          = "${local.csi}-store-email"
   rule_set_name = aws_ses_receipt_rule_set.main.0.rule_set_name
-  recipients    = ["template-submitted-recipient@${aws_ses_domain_identity.main.domain}"]
+  recipients    = [aws_ses_domain_identity.main.domain]
   enabled       = true
   scan_enabled  = true
   tls_policy    = "Optional"
 
   s3_action {
-    position          = 1
+    position          = 10
     bucket_name       = module.s3bucket_ses.0.id
     object_key_prefix = "emails/"
     iam_role_arn      = aws_iam_role.ses_receipts.0.arn

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

@@ -23,7 +23,7 @@ export class EmailHelper {
 
   constructor() {}
 
-  // This will stop working if one environment ever ends up with 1,000 email on it.
+  // This will stop working if one environment ever ends up with 1,000 emails on it.
   // This seems very unlikely but if it happens we can revisit this and add pagination.
   async getEmailForTemplateId(templateId: string, dateCutoff: Date) {
     const command = new ListObjectsV2Command({