CCM-14783: SQS Module Update to Include Alarms

infrastructure/terraform/components/api/README.md

@@ -51,7 +51,7 @@ No requirements.
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_amendment_event_transformer"></a> [amendment\_event\_transformer](#module\_amendment\_event\_transformer) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
-| <a name="module_amendments_queue"></a> [amendments\_queue](#module\_amendments\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-sqs.zip | n/a |
+| <a name="module_amendments_queue"></a> [amendments\_queue](#module\_amendments\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip | n/a |
 | <a name="module_authorizer_lambda"></a> [authorizer\_lambda](#module\_authorizer\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_ddb_alarms_idempotency"></a> [ddb\_alarms\_idempotency](#module\_ddb\_alarms\_idempotency) | ../../modules/alarms-ddb | n/a |
 | <a name="module_ddb_alarms_letter_queue"></a> [ddb\_alarms\_letter\_queue](#module\_ddb\_alarms\_letter\_queue) | ../../modules/alarms-ddb | n/a |
@@ -67,16 +67,16 @@ No requirements.
 | <a name="module_get_status"></a> [get\_status](#module\_get\_status) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_kms"></a> [kms](#module\_kms) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-kms.zip | n/a |
 | <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/3.0.6/terraform-sqs.zip | 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/3.1.5/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_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 |
 | <a name="module_post_mi"></a> [post\_mi](#module\_post\_mi) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_s3bucket_test_letters"></a> [s3bucket\_test\_letters](#module\_s3bucket\_test\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
 | <a name="module_sqs_alarms"></a> [sqs\_alarms](#module\_sqs\_alarms) | ../../modules/alarms-sqs | n/a |
-| <a name="module_sqs_letter_updates"></a> [sqs\_letter\_updates](#module\_sqs\_letter\_updates) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-sqs.zip | n/a |
-| <a name="module_sqs_supplier_allocator"></a> [sqs\_supplier\_allocator](#module\_sqs\_supplier\_allocator) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-sqs.zip | n/a |
+| <a name="module_sqs_letter_updates"></a> [sqs\_letter\_updates](#module\_sqs\_letter\_updates) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip | n/a |
+| <a name="module_sqs_supplier_allocator"></a> [sqs\_supplier\_allocator](#module\_sqs\_supplier\_allocator) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip | n/a |
 | <a name="module_supplier_allocator"></a> [supplier\_allocator](#module\_supplier\_allocator) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_supplier_ssl"></a> [supplier\_ssl](#module\_supplier\_ssl) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-ssl.zip | n/a |
 | <a name="module_update_letter_queue"></a> [update\_letter\_queue](#module\_update\_letter\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |

infrastructure/terraform/components/api/module_sqs_alarms.tf

@@ -2,8 +2,7 @@ module "sqs_alarms" {
   for_each = local.alarms_enabled ? local.sqs_alarm_targets : {}
   source   = "../../modules/alarms-sqs"
 
-  alarm_prefix   = local.csi
-  queue_name     = each.value
-  dlq_queue_name = replace(each.value, "-queue", "-dlq")
-  tags           = local.default_tags
+  alarm_prefix = local.csi
+  queue_name   = each.value
+  tags         = local.default_tags
 }

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/3.0.6/terraform-sqs.zip"
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip"
 
   name = "amendments_queue"
 
@@ -12,5 +12,6 @@ module "amendments_queue" {
 
   sqs_kms_key_arn = module.kms.key_arn
 
-  create_dlq = true
+  create_dlq                        = true
+  enable_queue_oldest_message_alarm = false
 }

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/3.0.6/terraform-sqs.zip"
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip"
 
   name = "letter_status_updates_queue"
 
@@ -13,5 +13,6 @@ module "letter_status_updates_queue" {
 
   sqs_kms_key_arn = module.kms.key_arn
 
-  create_dlq = true
+  create_dlq                        = true
+  enable_queue_oldest_message_alarm = false
 }

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/3.0.6/terraform-sqs.zip"
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip"
 
   aws_account_id = var.aws_account_id
   component      = var.component
@@ -12,8 +12,9 @@ module "sqs_letter_updates" {
 
   visibility_timeout_seconds = 60
 
-  create_dlq          = true
-  sqs_policy_overload = data.aws_iam_policy_document.letter_updates_queue_policy.json
+  create_dlq                        = true
+  enable_queue_oldest_message_alarm = false
+  sqs_policy_overload               = data.aws_iam_policy_document.letter_updates_queue_policy.json
 }
 
 data "aws_iam_policy_document" "letter_updates_queue_policy" {

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/3.0.6/terraform-sqs.zip"
+  source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip"
 
   aws_account_id = var.aws_account_id
   component      = var.component
@@ -12,8 +12,9 @@ module "sqs_supplier_allocator" {
 
   visibility_timeout_seconds = 60
 
-  create_dlq          = true
-  sqs_policy_overload = data.aws_iam_policy_document.supplier_allocator_queue_policy.json
+  create_dlq                        = true
+  enable_queue_oldest_message_alarm = false
+  sqs_policy_overload               = data.aws_iam_policy_document.supplier_allocator_queue_policy.json
 }
 
 data "aws_iam_policy_document" "supplier_allocator_queue_policy" {

infrastructure/terraform/modules/alarms-sqs/README.md

@@ -16,8 +16,6 @@
 | <a name="input_age_anomaly_sensitivity"></a> [age\_anomaly\_sensitivity](#input\_age\_anomaly\_sensitivity) | n/a | `number` | `3` | no |
 | <a name="input_age_period_seconds"></a> [age\_period\_seconds](#input\_age\_period\_seconds) | n/a | `number` | `900` | no |
 | <a name="input_alarm_prefix"></a> [alarm\_prefix](#input\_alarm\_prefix) | n/a | `string` | n/a | yes |
-| <a name="input_dlq_queue_name"></a> [dlq\_queue\_name](#input\_dlq\_queue\_name) | n/a | `string` | `null` | no |
-| <a name="input_dlq_visible_threshold"></a> [dlq\_visible\_threshold](#input\_dlq\_visible\_threshold) | n/a | `number` | `0` | no |
 | <a name="input_queue_name"></a> [queue\_name](#input\_queue\_name) | n/a | `string` | n/a | yes |
 | <a name="input_tags"></a> [tags](#input\_tags) | n/a | `map(string)` | `{}` | no |
 ## Modules

infrastructure/terraform/modules/alarms-sqs/variables.tf

@@ -6,11 +6,6 @@ variable "queue_name" {
   type = string
 }
 
-variable "dlq_queue_name" {
-  type    = string
-  default = null
-}
-
 variable "tags" {
   type    = map(string)
   default = {}
@@ -35,8 +30,3 @@ variable "age_anomaly_datapoints_to_alarm" {
   type    = number
   default = 3
 }
-
-variable "dlq_visible_threshold" {
-  type    = number
-  default = 0
-}