From 512f63b1729399d809746802217d43d0a734d85f Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison@bjss.com>
Date: Tue, 23 Dec 2025 12:30:17 +0000
Subject: [PATCH 1/2] CCM-13638: dlq retention on lambda and eventpub modules

---
 infrastructure/modules/eventpub/sqs_queue_dlq.tf | 2 ++
 infrastructure/modules/lambda/variables.tf       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/infrastructure/modules/eventpub/sqs_queue_dlq.tf b/infrastructure/modules/eventpub/sqs_queue_dlq.tf
index 91c10bc..9af9ddb 100644
--- a/infrastructure/modules/eventpub/sqs_queue_dlq.tf
+++ b/infrastructure/modules/eventpub/sqs_queue_dlq.tf
@@ -2,4 +2,6 @@ resource "aws_sqs_queue" "dlq" {
   name = "${local.csi}-dlq"
 
   kms_master_key_id = var.kms_key_arn
+
+  message_retention_seconds = 1209600
 }
diff --git a/infrastructure/modules/lambda/variables.tf b/infrastructure/modules/lambda/variables.tf
index ab25d92..1a103c9 100644
--- a/infrastructure/modules/lambda/variables.tf
+++ b/infrastructure/modules/lambda/variables.tf
@@ -186,7 +186,7 @@ variable "sns_destination_kms_key" {
 variable "lambda_dlq_message_retention_seconds" {
   type        = number
   description = "The number of seconds to retain messages in the Lambda DLQ SQS queue"
-  default     = 86400
+  default     = 1209600
 }
 
 variable "application_log_level" {

From 40afb00e98c77770b43c5627375f1f5cce59fc43 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison@bjss.com>
Date: Tue, 23 Dec 2025 12:32:28 +0000
Subject: [PATCH 2/2] CCM-13638: docs

---
 infrastructure/modules/lambda/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infrastructure/modules/lambda/README.md b/infrastructure/modules/lambda/README.md
index c7329c6..8e238e7 100644
--- a/infrastructure/modules/lambda/README.md
+++ b/infrastructure/modules/lambda/README.md
@@ -32,7 +32,7 @@
 | <a name="input_iam_policy_document"></a> [iam\_policy\_document](#input\_iam\_policy\_document) | n/a | <pre>object({<br/>    body = string<br/>  })</pre> | `null` | no |
 | <a name="input_kms_key_arn"></a> [kms\_key\_arn](#input\_kms\_key\_arn) | KMS key arn to use for this function | `string` | n/a | yes |
 | <a name="input_lambda_at_edge"></a> [lambda\_at\_edge](#input\_lambda\_at\_edge) | Whether this Lambda is a Lambda@Edge function | `bool` | `false` | no |
-| <a name="input_lambda_dlq_message_retention_seconds"></a> [lambda\_dlq\_message\_retention\_seconds](#input\_lambda\_dlq\_message\_retention\_seconds) | The number of seconds to retain messages in the Lambda DLQ SQS queue | `number` | `86400` | no |
+| <a name="input_lambda_dlq_message_retention_seconds"></a> [lambda\_dlq\_message\_retention\_seconds](#input\_lambda\_dlq\_message\_retention\_seconds) | The number of seconds to retain messages in the Lambda DLQ SQS queue | `number` | `1209600` | no |
 | <a name="input_lambda_env_vars"></a> [lambda\_env\_vars](#input\_lambda\_env\_vars) | Lambda environment parameters map | `map(string)` | `{}` | no |
 | <a name="input_layers"></a> [layers](#input\_layers) | Lambda layer arns to include | `list(any)` | `[]` | no |
 | <a name="input_log_destination_arn"></a> [log\_destination\_arn](#input\_log\_destination\_arn) | Destination ARN to use for the log subscription filter | `string` | `""` | no |