add event mapping option

Author: alexnuttall

infrastructure/terraform/modules/backend-api/module_lambda_send_letter_proof.tf

@@ -7,8 +7,8 @@ module "lambda_send_letter_proof" {
   source_code_hash = module.build_sftp_letters_lambdas.zips["src/send-proof.ts"].base64sha256
   handler          = "send-proof.handler"
 
-  memory_size    = 512
-  timout_seconds = 20
+  memory_size = 512
+  timeout     = 20
 
   log_retention_in_days = var.log_retention_in_days
 
@@ -27,6 +27,14 @@ module "lambda_send_letter_proof" {
     TEMPLATES_TABLE_NAME    = aws_dynamodb_table.templates.name
   }
 
+  sqs_event_source_mapping = {
+    sqs_queue_arn = module.sqs_validate_letter_template_files.sqs_queue_arn
+    batch_size    = 5
+    scaling_config = {
+      maximum_concurrency = 5
+    }
+  }
+
   vpc = {
     id         = data.aws_vpc.account_vpc.id
     cidr_block = data.aws_vpc.account_vpc.cidr_block
@@ -146,17 +154,3 @@ data "aws_iam_policy_document" "send_letter_proof" {
     ]
   }
 }
-
-resource "aws_lambda_event_source_mapping" "trigger_send_proof" {
-  event_source_arn = module.sftp_upload_queue.sqs_queue_arn
-  enabled          = true
-  function_name    = "${local.csi}-send-letter-proof"
-  batch_size       = 10
-  function_response_types = [
-    "ReportBatchItemFailures"
-  ]
-
-  scaling_config {
-    maximum_concurrency = 5
-  }
-}

infrastructure/terraform/modules/backend-api/module_sqs_sftp_upload_queue.tf

@@ -10,7 +10,7 @@ module "sftp_upload_queue" {
 
   sqs_kms_key_arn = var.kms_key_arn
 
-  visibility_timeout_seconds = 60
+  visibility_timeout = 60
 
   create_dlq = true
 }

infrastructure/terraform/modules/lambda-function/lambda_event_source_mapping_sqs.tf

@@ -0,0 +1,19 @@
+resource "aws_lambda_event_source_mapping" "sqs" {
+  count = var.sqs_event_source_mapping != null ? 1 : 0
+
+  event_source_arn                   = var.sqs_event_source_mapping.sqs_queue_arn
+  function_name                      = aws_lambda_function.main.arn
+  batch_size                         = var.sqs_event_source_mapping.batch_size
+  maximum_batching_window_in_seconds = var.sqs_event_source_mapping.maximum_batching_window_in_seconds
+  function_response_types = [
+    "ReportBatchItemFailures"
+  ]
+
+  dynamic "scaling_config" {
+    for_each = var.sqs_event_source_mapping.scaling_config != null ? [var.sqs_event_source_mapping.scaling_config] : []
+
+    content {
+      maximum_concurrency = scaling_config.value.maximum_concurrency
+    }
+  }
+}

infrastructure/terraform/modules/lambda-function/lambda_function_main.tf

@@ -7,7 +7,7 @@ resource "aws_lambda_function" "main" {
   handler          = var.handler
   runtime          = var.runtime
   memory_size      = var.memory_size
-  timeout          = var.timeout_seconds
+  timeout          = var.timeout
 
   environment {
     variables = var.environment_variables

infrastructure/terraform/modules/lambda-function/variables.tf

@@ -35,7 +35,7 @@ variable "runtime" {
   default     = "nodejs20.x"
 }
 
-variable "timout_seconds" {
+variable "timeout" {
   type        = number
   description = "Maximum running time before timeout"
   default     = 3
@@ -79,3 +79,16 @@ variable "security_group_ids" {
   type    = list(string)
   default = []
 }
+
+variable "sqs_event_source_mapping" {
+  description = "Configuration for SQS event source mapping"
+  type = object({
+    sqs_queue_arn                      = string
+    batch_size                         = optional(number, 10)
+    maximum_batching_window_in_seconds = optional(number, 0)
+    scaling_config = optional(object({
+      maximum_concurrency = number
+    }), null)
+  })
+  default = null
+}

utils/entity-update-command-builder/src/types/template.ts

@@ -18,12 +18,13 @@ export type MergedTemplate = {
   id: string;
   language?: Language;
   letterType?: LetterType;
+  lockTime?: number;
   message?: string;
+  name: string;
   subject?: string;
   templateStatus: TemplateStatus;
   templateType: TemplateType;
   updatedAt: string;
-  lockTime?: number;
 };
 
 type AssertExtendsMerged<T extends MergedTemplate> = T;