Merge branch 'main' into CCM-14044_AddingAnomalyAlarm

aidenvaines-cgi · web-flow · commit 06aa14f0633d · 2026-03-04T20:55:44.000Z
diff --git a/infrastructure/terraform/components/api/README.md b/infrastructure/terraform/components/api/README.md
@@ -66,7 +66,6 @@ No requirements.
 | <a name="module_lambda_alarms"></a> [lambda\_alarms](#module\_lambda\_alarms) | ../../modules/alarms-lambda | n/a |
 | <a name="module_letter_status_updates_queue"></a> [letter\_status\_updates\_queue](#module\_letter\_status\_updates\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
 | <a name="module_letter_updates_transformer"></a> [letter\_updates\_transformer](#module\_letter\_updates\_transformer) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
-| <a name="module_logging_bucket"></a> [logging\_bucket](#module\_logging\_bucket) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
 | <a name="module_mi_updates_transformer"></a> [mi\_updates\_transformer](#module\_mi\_updates\_transformer) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip | n/a |
 | <a name="module_patch_letter"></a> [patch\_letter](#module\_patch\_letter) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_post_letters"></a> [post\_letters](#module\_post\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
diff --git a/infrastructure/terraform/components/api/module_domain_truststore.tf b/infrastructure/terraform/components/api/module_domain_truststore.tf
@@ -1,5 +1,5 @@
 module "domain_truststore" {
-  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip"
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.4/terraform-s3bucket.zip"
 
   name           = "truststore"
   aws_account_id = var.aws_account_id
@@ -12,11 +12,9 @@ module "domain_truststore" {
   kms_key_arn  = module.kms.key_id
 
   bucket_logging_target = {
-    bucket = module.logging_bucket.bucket
-    prefix = "truststore/"
+    bucket = local.acct.s3_buckets["access_logs"]["id"]
   }
 
   policy_documents = [
   ]
-
 }
diff --git a/infrastructure/terraform/components/api/module_logging_bucket.tf b/infrastructure/terraform/components/api/module_logging_bucket.tf
diff --git a/infrastructure/terraform/components/api/module_sqs_amendments.tf b/infrastructure/terraform/components/api/module_sqs_amendments.tf
@@ -1,6 +1,6 @@
 # Queue to transport letter status amendment messages
 module "amendments_queue" {
-  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip"
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.5/terraform-sqs.zip"
 
   name = "amendments_queue"
 
diff --git a/infrastructure/terraform/components/api/module_sqs_letter_status_updates.tf b/infrastructure/terraform/components/api/module_sqs_letter_status_updates.tf
@@ -1,7 +1,7 @@
 # Queue to transport update letter status messages. Now replaced by module.amendments_queue.
 # This queue will not be removed just yet, to allow it to be drained following the release in which module.amendments_queue replaces it.
 module "letter_status_updates_queue" {
-  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip"
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.5/terraform-sqs.zip"
 
   name = "letter_status_updates_queue"
 
diff --git a/infrastructure/terraform/components/api/module_sqs_letter_updates.tf b/infrastructure/terraform/components/api/module_sqs_letter_updates.tf
@@ -1,5 +1,5 @@
 module "sqs_letter_updates" {
-  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-sqs.zip"
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.5/terraform-sqs.zip"
 
   aws_account_id = var.aws_account_id
   component      = var.component
diff --git a/infrastructure/terraform/components/api/module_sqs_supplier_allocator.tf b/infrastructure/terraform/components/api/module_sqs_supplier_allocator.tf
@@ -1,5 +1,5 @@
 module "sqs_supplier_allocator" {
-  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-sqs.zip"
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.5/terraform-sqs.zip"
 
   aws_account_id = var.aws_account_id
   component      = var.component
diff --git a/infrastructure/terraform/components/api/modules_eventpub.tf b/infrastructure/terraform/components/api/modules_eventpub.tf
@@ -28,6 +28,8 @@ module "eventpub" {
   data_plane_bus_arn      = var.eventpub_data_plane_bus_arn
   control_plane_bus_arn   = var.eventpub_control_plane_bus_arn
 
+  access_logging_bucket = local.acct.s3_buckets["access_logs"]["id"]
+
   additional_policies_for_event_cache_bucket = [
     data.aws_iam_policy_document.eventcache[0].json
   ]
diff --git a/infrastructure/terraform/components/api/modules_eventsub.tf b/infrastructure/terraform/components/api/modules_eventsub.tf
@@ -27,4 +27,6 @@ module "eventsub" {
   enable_event_cache      = var.enable_event_cache
 
   shared_infra_account_id = var.shared_infra_account_id
+
+  access_logging_bucket = local.acct.s3_buckets["access_logs"]["id"]
 }
diff --git a/infrastructure/terraform/modules/eventsub/README.md b/infrastructure/terraform/modules/eventsub/README.md
@@ -11,6 +11,7 @@
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_access_logging_bucket"></a> [access\_logging\_bucket](#input\_access\_logging\_bucket) | Name of S3 bucket to use for access logging | `string` | `""` | no |
 | <a name="input_aws_account_id"></a> [aws\_account\_id](#input\_aws\_account\_id) | The AWS Account ID (numeric) | `string` | n/a | yes |
 | <a name="input_component"></a> [component](#input\_component) | The name of the terraformscaffold component calling this module | `string` | n/a | yes |
 | <a name="input_default_tags"></a> [default\_tags](#input\_default\_tags) | Default tag map for application to all taggable resources in the module | `map(string)` | `{}` | no |
@@ -39,7 +40,7 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_s3bucket_event_cache"></a> [s3bucket\_event\_cache](#module\_s3bucket\_event\_cache) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
+| <a name="module_s3bucket_event_cache"></a> [s3bucket\_event\_cache](#module\_s3bucket\_event\_cache) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.4/terraform-s3bucket.zip | n/a |
 ## Outputs
 
 | Name | Description |
diff --git a/infrastructure/terraform/modules/eventsub/module_s3bucket_event_cache.tf b/infrastructure/terraform/modules/eventsub/module_s3bucket_event_cache.tf
@@ -1,5 +1,5 @@
 module "s3bucket_event_cache" {
-  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip"
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.4/terraform-s3bucket.zip"
 
   count = var.enable_event_cache ? 1 : 0
 
@@ -40,6 +40,10 @@ module "s3bucket_event_cache" {
     data.aws_iam_policy_document.s3bucket_event_cache[0].json
   ]
 
+  bucket_logging_target = {
+    bucket = "${var.access_logging_bucket}"
+  }
+
   public_access = {
     block_public_acls       = true
     block_public_policy     = true
diff --git a/infrastructure/terraform/modules/eventsub/variables.tf b/infrastructure/terraform/modules/eventsub/variables.tf
@@ -152,3 +152,9 @@ variable "glue_role_arn" {
   type        = string
   description = "ARN of the Glue execution role from the parent"
 }
+
+variable "access_logging_bucket" {
+  type        = string
+  description = "Name of S3 bucket to use for access logging"
+  default     = ""
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`module "domain_truststore" {`
`2`		`- source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip"`
	`2`	`+ source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.4/terraform-s3bucket.zip"`
`3`	`3`
`4`	`4`	`name = "truststore"`
`5`	`5`	`aws_account_id = var.aws_account_id`
`@@ -12,11 +12,9 @@ module "domain_truststore" {`
`12`	`12`	`kms_key_arn = module.kms.key_id`
`13`	`13`
`14`	`14`	`bucket_logging_target = {`
`15`		`- bucket = module.logging_bucket.bucket`
`16`		`- prefix = "truststore/"`
	`15`	`+ bucket = local.acct.s3_buckets["access_logs"]["id"]`
`17`	`16`	`}`
`18`	`17`
`19`	`18`	`policy_documents = [`
`20`	`19`	`]`
`21`		`-`
`22`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ module "eventpub" {`
`28`	`28`	`data_plane_bus_arn = var.eventpub_data_plane_bus_arn`
`29`	`29`	`control_plane_bus_arn = var.eventpub_control_plane_bus_arn`
`30`	`30`
	`31`	`+ access_logging_bucket = local.acct.s3_buckets["access_logs"]["id"]`
	`32`	`+`
`31`	`33`	`additional_policies_for_event_cache_bucket = [`
`32`	`34`	`data.aws_iam_policy_document.eventcache[0].json`
`33`	`35`	`]`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,6 @@ module "eventsub" {`
`27`	`27`	`enable_event_cache = var.enable_event_cache`
`28`	`28`
`29`	`29`	`shared_infra_account_id = var.shared_infra_account_id`
	`30`	`+`
	`31`	`+ access_logging_bucket = local.acct.s3_buckets["access_logs"]["id"]`
`30`	`32`	`}`