Merge branch 'main' of https://github.com/NHSDigital/nhs-notify-web-template-management into feature/CCM-10917-submit-template-page-updates

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

@@ -1,5 +1,5 @@
 module "ses_testing" {
-  count = local.use_sftp_letter_supplier_mock ? 1 : 0
+  count = local.use_sftp_letter_supplier_mock && var.support_sandbox_environments ? 1 : 0
 
   source = "../../modules/acct-ses-testing"
 

infrastructure/terraform/components/acct/module_ses_testing.tf

@@ -1,6 +1,5 @@
 resource "aws_sns_topic" "costs" {
-  name              = "${local.csi}-costs"
-  kms_master_key_id = module.kms.key_id
+  name = "${local.csi}-costs"
 }
 
 resource "aws_sns_topic_policy" "costs" {

infrastructure/terraform/components/acct/sns_topic_costs.tf

@@ -40,6 +40,7 @@
 | <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> | `{}` | 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_observability_account_id"></a> [observability\_account\_id](#input\_observability\_account\_id) | The Observability Account ID that needs access | `string` | n/a | yes |
+| <a name="input_override_log_destination_arn"></a> [override\_log\_destination\_arn](#input\_override\_log\_destination\_arn) | Override the log destination ARN for this component. | `string` | `""` | 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 |
 | <a name="input_region"></a> [region](#input\_region) | The AWS Region | `string` | n/a | yes |

infrastructure/terraform/components/app/README.md

@@ -7,6 +7,6 @@ resource "aws_cloudwatch_log_subscription_filter" "amplify" {
   name            = "${local.csi}-amplify-${aws_amplify_app.main.id}"
   log_group_name  = aws_cloudwatch_log_group.amplify.name
   filter_pattern  = ""
-  destination_arn = "arn:aws:logs:${var.region}:${var.observability_account_id}:destination:nhs-notify-main-acct-firehose-logs"
+  destination_arn = local.log_destination_arn
   role_arn        = local.acct.log_subscription_role_arn
 }

infrastructure/terraform/components/app/cloudwatch_log_group_amplify.tf

@@ -2,4 +2,5 @@ locals {
   cloudfront_files_domain_name = "files.${local.root_domain_name}"
   root_domain_name             = "${var.environment}.${local.acct.dns_zone["name"]}"
   lambdas_source_code_dir      = "../../../../lambdas"
+  log_destination_arn          = var.override_log_destination_arn != "" ? var.override_log_destination_arn : "arn:aws:logs:${var.region}:${var.observability_account_id}:destination:nhs-main-obs-firehose-logs" # TODO CCM-10579 Please remove this after we do dev/nonprod cutover for this BC
 }

infrastructure/terraform/components/app/locals.tf

@@ -23,11 +23,12 @@ module "backend_api" {
 
   enable_proofing           = var.enable_proofing
   letter_suppliers          = var.letter_suppliers
-  log_destination_arn       = "arn:aws:logs:${var.region}:${var.observability_account_id}:destination:nhs-notify-main-acct-firehose-logs"
+  log_destination_arn       = local.log_destination_arn
   log_subscription_role_arn = local.acct.log_subscription_role_arn
 
   send_to_firehose = true
 
   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

@@ -218,3 +218,10 @@ variable "external_email_domain" {
   default     = null
   description = "Externally managed domain used to create an SES identity for sending emails from. Validation DNS records will need to be manually configured in the DNS provider."
 }
+
+variable "override_log_destination_arn" {
+  type        = string
+  description = "Override the log destination ARN for this component."
+  default     = ""
+}
+

infrastructure/terraform/components/app/variables.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 -->