CCM-13562 Component tests for ttl-create (#222)

Author: Ian-Hodges

infrastructure/terraform/components/dl/README.md

@@ -43,6 +43,7 @@ No requirements.
 | <a name="input_region"></a> [region](#input\_region) | The AWS Region | `string` | n/a | yes |
 | <a name="input_report_scheduler_schedule"></a> [report\_scheduler\_schedule](#input\_report\_scheduler\_schedule) | Schedule to trigger sender reports | `string` | `"cron(30 4 * * ? *)"` | no |
 | <a name="input_shared_infra_account_id"></a> [shared\_infra\_account\_id](#input\_shared\_infra\_account\_id) | The AWS Shared Infra Account ID (numeric) | `string` | n/a | yes |
+| <a name="input_sqs_max_receive_count"></a> [sqs\_max\_receive\_count](#input\_sqs\_max\_receive\_count) | Maximum number of times a message can be received before being sent to the DLQ | `string` | `"3"` | no |
 | <a name="input_ttl_poll_schedule"></a> [ttl\_poll\_schedule](#input\_ttl\_poll\_schedule) | Schedule to poll for any overdue TTL records | `string` | `"rate(10 minutes)"` | no |
 ## Modules
 

infrastructure/terraform/components/dl/module_sqs_ttl.tf

@@ -1,20 +1,17 @@
 module "sqs_ttl" {
   source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.30/terraform-sqs.zip"
 
-  aws_account_id = var.aws_account_id
-  component      = local.component
-  environment    = var.environment
-  project        = var.project
-  region         = var.region
-  name           = "ttl"
-
-  sqs_kms_key_arn = module.kms.key_arn
-
+  aws_account_id             = var.aws_account_id
+  component                  = local.component
+  environment                = var.environment
+  project                    = var.project
+  region                     = var.region
+  name                       = "ttl"
+  sqs_kms_key_arn            = module.kms.key_arn
   visibility_timeout_seconds = 60
-
-  create_dlq = true
-
-  sqs_policy_overload = data.aws_iam_policy_document.sqs_ttl.json
+  create_dlq                 = true
+  max_receive_count          = var.sqs_max_receive_count
+  sqs_policy_overload        = data.aws_iam_policy_document.sqs_ttl.json
 }
 
 data "aws_iam_policy_document" "sqs_ttl" {

infrastructure/terraform/components/dl/variables.tf

@@ -219,3 +219,9 @@ variable "metadata_refresh_schedule" {
   description = "Schedule for refreshing reporting metadata."
   default     = "cron(10 6-22 * * ? *)" # 10 minutes past the hour, between 06:00 - 22:00
 }
+
+variable "sqs_max_receive_count" {
+  type        = string
+  description = "Maximum number of times a message can be received before being sent to the DLQ"
+  default     = "3"
+}

lambdas/ttl-create-lambda/src/__tests__/infra/ttl-repository.test.ts

@@ -100,15 +100,15 @@ describe('TtlRepository', () => {
     expect(gsiPk).toMatch(/^\d{4}-\d{2}-\d{2}#\d{1,2}$/);
   });
 
-  it('throws and logs error when sender not found', async () => {
+  it('throws and logs error when sender not retrieved', async () => {
     senderRepository.getSender.mockResolvedValue(null);
 
     await expect(repo.insertTtlRecord(messageDownloadedEvent)).rejects.toThrow(
-      `Sender not found for sender ID ${messageDownloadedEvent.data.senderId}`,
+      `Sender ${messageDownloadedEvent.data.senderId} could not be retrieved`,
     );
 
     expect(logger.error).toHaveBeenCalledWith({
-      description: `Sender not found for sender ID ${messageDownloadedEvent.data.senderId}`,
+      description: `Sender ${messageDownloadedEvent.data.senderId} could not be retrieved`,
     });
   });
 });

lambdas/ttl-create-lambda/src/infra/ttl-repository.ts

@@ -22,9 +22,9 @@ export class TtlRepository {
     });
     if (!sender) {
       this.logger.error({
-        description: `Sender not found for sender ID ${item.data.senderId}`,
+        description: `Sender ${item.data.senderId} could not be retrieved`,
       });
-      throw new Error(`Sender not found for sender ID ${item.data.senderId}`);
+      throw new Error(`Sender ${item.data.senderId} could not be retrieved`);
     }
 
     const ttlTime =

package-lock.json

@@ -38,12 +38,12 @@
   "overrides": {
     "brace-expansion": "^5.0.2",
     "fast-xml-parser": "^5.3.7",
-    "minimatch": "^10.2.2",
+    "minimatch": "^10.2.4",
     "pretty-format": {
       "react-is": "^19.0.0"
     },
     "react": "^19.0.0",
-    "test-exclude": "^7.0.0"
+    "test-exclude": "^8.0.0"
   },
   "scripts": {
     "build-schemas": "make -C src/cloudevents/domains/digital-letters build-no-bundle publish-bundled-json",

package.json

@@ -22,8 +22,8 @@
   "main": "tools/generator/example-generator/generate-example.ts",
   "name": "digital-letters-cloudevents-schemas",
   "overrides": {
-    "glob": "13.0.3",
-    "minimatch": "^10.2.2"
+    "glob": "^13.0.6",
+    "minimatch": "^10.2.4"
   },
   "scripts": {
     "build": "tsx tools/builder/build-schema.ts",

src/cloudevents/package.json

@@ -7,7 +7,7 @@
   },
   "name": "digital-letters",
   "overrides": {
-    "minimatch": "^10.2.2"
+    "minimatch": "^10.2.4"
   },
   "private": true,
   "scripts": {

src/eventcatalog/package.json

@@ -26,6 +26,7 @@ export const CORE_NOTIFIER_DLQ_NAME = `${CSI}-core-notifier-dlq`;
 export const FILE_SCANNER_DLQ_NAME = `${CSI}-scanner-dlq`;
 export const PRINT_STATUS_HANDLER_DLQ_NAME = `${CSI}-print-status-handler-dlq`;
 export const HANDLE_TTL_DLQ_NAME = `${CSI}-ttl-handle-expiry-errors-queue`;
+export const CREATE_TTL_DLQ_NAME = `${CSI}-ttl-dlq`;
 export const PRINT_ANALYSER_DLQ_NAME = `${CSI}-print-analyser-dlq`;
 export const PRINT_SENDER_DLQ_NAME = `${CSI}-print-sender-dlq`;
 export const MOVE_SCANNED_FILES_NAME = `${CSI}-move-scanned-files-queue`;
@@ -63,3 +64,4 @@ export const PRINT_STATUS_HANDLER_LAMBDA_LOG_GROUP_NAME = `/aws/lambda/${CSI}-pr
 export const PRINT_ANALYSER_LAMBDA_LOG_GROUP_NAME = `/aws/lambda/${CSI}-print-analyser`;
 export const PRINT_SENDER_LAMBDA_LOG_GROUP_NAME = `/aws/lambda/${CSI}-print-sender`;
 export const MOVE_SCANNED_FILES_LAMBDA_LOG_GROUP_NAME = `/aws/lambda/${CSI}-move-scanned-files`;
+export const CREATE_TTL_LAMBDA_LOG_GROUP_NAME = `/aws/lambda/${CSI}-ttl-create`;