Merge branch 'main' of https://github.com/NHSDigital/nhs-notify-web-template-management into feature/CCM-10424-error-for-missing-client-campaign-id

Author: nicki-nhs

frontend/src/__tests__/components/forms/NhsAppTemplateForm/__snapshots__/NhsAppTemplateForm.test.tsx.snap

@@ -18,6 +18,8 @@ const messageFormattingMap: Record<TemplateType, JSX.Element[]> = {
   NHS_APP: [
     LineBreaksAndParagraphs(),
     Headings(),
+    BulletList(),
+    NumberedList(),
     BoldText(),
     LinksAndUrlsMarkdown(),
   ],

frontend/src/components/molecules/MessageFormatting/MessageFormatting.tsx

@@ -30,4 +30,5 @@ module "backend_api" {
 
   email_domain                            = module.ses.domain
   template_submitted_sender_email_address = "template-submitted@${module.ses.domain}"
+  proof_requested_sender_email_address    = "proof-requested@${module.ses.domain}"
 }

infrastructure/terraform/components/app/module_backend_api.tf

@@ -41,13 +41,14 @@
 | <a name="output_download_bucket_name"></a> [download\_bucket\_name](#output\_download\_bucket\_name) | n/a |
 | <a name="output_internal_bucket_name"></a> [internal\_bucket\_name](#output\_internal\_bucket\_name) | n/a |
 | <a name="output_quarantine_bucket_name"></a> [quarantine\_bucket\_name](#output\_quarantine\_bucket\_name) | n/a |
-| <a name="output_send_proof_queue_url"></a> [send\_proof\_queue\_url](#output\_send\_proof\_queue\_url) | n/a |
+| <a name="output_request_proof_queue_url"></a> [request\_proof\_queue\_url](#output\_request\_proof\_queue\_url) | n/a |
 | <a name="output_sftp_environment"></a> [sftp\_environment](#output\_sftp\_environment) | n/a |
 | <a name="output_sftp_mock_credential_path"></a> [sftp\_mock\_credential\_path](#output\_sftp\_mock\_credential\_path) | n/a |
 | <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_email_prefix"></a> [test\_email\_prefix](#output\_test\_email\_prefix) | 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 |
 <!-- vale on -->
 <!-- markdownlint-enable -->
 <!-- END_TF_DOCS -->

infrastructure/terraform/components/sandbox/README.md

@@ -3,9 +3,10 @@ locals {
 
   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_sender    = "template-submitted-sender-${var.environment}@${local.email_domain}"
-  sandbox_letter_supplier_mock_recipient = "template-submitted-recipient-${var.environment}@${local.email_domain}"
+  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

infrastructure/terraform/components/sandbox/locals.tf

@@ -27,5 +27,6 @@ module "backend_api" {
   enable_event_stream = true
 
   email_domain                            = local.email_domain
-  template_submitted_sender_email_address = local.sandbox_letter_supplier_mock_sender
+  template_submitted_sender_email_address = local.sandbox_letter_supplier_mock_template_submitted_sender
+  proof_requested_sender_email_address    = local.sandbox_letter_supplier_mock_proof_requested_sender
 }

infrastructure/terraform/components/sandbox/module_backend_api.tf

@@ -22,8 +22,8 @@ output "internal_bucket_name" {
   value = module.backend_api.internal_bucket_name
 }
 
-output "send_proof_queue_url" {
-  value = module.backend_api.send_proof_queue_url
+output "request_proof_queue_url" {
+  value = module.backend_api.request_proof_queue_url
 }
 
 output "sftp_mock_credential_path" {
@@ -62,6 +62,11 @@ output "test_email_bucket_name" {
   value = local.acct["ses_testing_config"].bucket_name
 }
 
-output "test_email_prefix" {
-  value = "emails-${var.environment}"
+output "test_proof_requested_email_prefix" {
+  value = "proof-requested-emails-${var.environment}"
+}
+
+
+output "test_template_submitted_email_prefix" {
+  value = "template-submitted-emails-${var.environment}"
 }

infrastructure/terraform/components/sandbox/outputs.tf

@@ -1,17 +1,17 @@
-resource "aws_ses_receipt_rule" "main" {
-  name          = "${local.csi}-store-email-sandbox"
+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_sender]
+  recipients    = [local.sandbox_letter_supplier_mock_proof_requested_sender]
   enabled       = true
   scan_enabled  = true
   tls_policy    = "Optional"
 
   s3_action {
     position          = 1
     bucket_name       = local.acct["ses_testing_config"].bucket_name
-    object_key_prefix = "emails-${var.environment}/"
+    object_key_prefix = "proof-requested-emails-${var.environment}/"
     iam_role_arn      = local.acct["ses_testing_config"].iam_role_arn
   }
 }

…m/components/sandbox/ses_receipt_rule.tf …dbox/ses_receipt_rule_proof_requested.tfinfrastructure/terraform/components/sandbox/ses_receipt_rule.tf renamed to infrastructure/terraform/components/sandbox/ses_receipt_rule_proof_requested.tf infrastructure/terraform/components/sandbox/ses_receipt_rule.tf renamed to infrastructure/terraform/components/sandbox/ses_receipt_rule_proof_requested.tf

@@ -0,0 +1,17 @@
+resource "aws_ses_receipt_rule" "template_submitted" {
+  name          = "${local.csi}-store-email-template-submitted"
+  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_template_submitted_sender]
+  enabled       = true
+  scan_enabled  = true
+  tls_policy    = "Optional"
+
+  s3_action {
+    position          = 1
+    bucket_name       = local.acct["ses_testing_config"].bucket_name
+    object_key_prefix = "template-submitted-emails-${var.environment}/"
+    iam_role_arn      = local.acct["ses_testing_config"].iam_role_arn
+  }
+}

infrastructure/terraform/components/sandbox/ses_receipt_rule_template_submitted.tf

@@ -29,6 +29,7 @@ No requirements.
 | <a name="input_module"></a> [module](#input\_module) | The variable encapsulating the name of this module | `string` | `"api"` | 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 | `string` | n/a | yes |
 | <a name="input_project"></a> [project](#input\_project) | The name of the tfscaffold project | `string` | n/a | yes |
+| <a name="input_proof_requested_sender_email_address"></a> [proof\_requested\_sender\_email\_address](#input\_proof\_requested\_sender\_email\_address) | Proof requested sender email address | `string` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | The AWS Region | `string` | n/a | yes |
 | <a name="input_send_to_firehose"></a> [send\_to\_firehose](#input\_send\_to\_firehose) | Flag indicating whether logs should be sent to firehose | `bool` | n/a | yes |
 | <a name="input_template_submitted_sender_email_address"></a> [template\_submitted\_sender\_email\_address](#input\_template\_submitted\_sender\_email\_address) | Template submitted sender email address | `string` | n/a | yes |
@@ -45,9 +46,9 @@ No requirements.
 | <a name="module_lambda_copy_scanned_object_to_internal"></a> [lambda\_copy\_scanned\_object\_to\_internal](#module\_lambda\_copy\_scanned\_object\_to\_internal) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.4 |
 | <a name="module_lambda_delete_failed_scanned_object"></a> [lambda\_delete\_failed\_scanned\_object](#module\_lambda\_delete\_failed\_scanned\_object) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.4 |
 | <a name="module_lambda_process_proof"></a> [lambda\_process\_proof](#module\_lambda\_process\_proof) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.4 |
-| <a name="module_lambda_send_letter_proof"></a> [lambda\_send\_letter\_proof](#module\_lambda\_send\_letter\_proof) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.4 |
 | <a name="module_lambda_set_file_virus_scan_status_for_upload"></a> [lambda\_set\_file\_virus\_scan\_status\_for\_upload](#module\_lambda\_set\_file\_virus\_scan\_status\_for\_upload) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.4 |
 | <a name="module_lambda_sftp_poll"></a> [lambda\_sftp\_poll](#module\_lambda\_sftp\_poll) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.4 |
+| <a name="module_lambda_sftp_request_proof"></a> [lambda\_sftp\_request\_proof](#module\_lambda\_sftp\_request\_proof) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.4 |
 | <a name="module_lambda_validate_letter_template_files"></a> [lambda\_validate\_letter\_template\_files](#module\_lambda\_validate\_letter\_template\_files) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.4 |
 | <a name="module_list_template_lambda"></a> [list\_template\_lambda](#module\_list\_template\_lambda) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.4 |
 | <a name="module_request_proof_lambda"></a> [request\_proof\_lambda](#module\_request\_proof\_lambda) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.4 |
@@ -70,7 +71,7 @@ No requirements.
 | <a name="output_download_bucket_regional_domain_name"></a> [download\_bucket\_regional\_domain\_name](#output\_download\_bucket\_regional\_domain\_name) | n/a |
 | <a name="output_internal_bucket_name"></a> [internal\_bucket\_name](#output\_internal\_bucket\_name) | n/a |
 | <a name="output_quarantine_bucket_name"></a> [quarantine\_bucket\_name](#output\_quarantine\_bucket\_name) | n/a |
-| <a name="output_send_proof_queue_url"></a> [send\_proof\_queue\_url](#output\_send\_proof\_queue\_url) | n/a |
+| <a name="output_request_proof_queue_url"></a> [request\_proof\_queue\_url](#output\_request\_proof\_queue\_url) | n/a |
 | <a name="output_sftp_environment"></a> [sftp\_environment](#output\_sftp\_environment) | n/a |
 | <a name="output_sftp_mock_credential_path"></a> [sftp\_mock\_credential\_path](#output\_sftp\_mock\_credential\_path) | n/a |
 | <a name="output_sftp_poll_lambda_name"></a> [sftp\_poll\_lambda\_name](#output\_sftp\_poll\_lambda\_name) | n/a |