diff --git a/infrastructure/terraform/lambda/_template/README.md b/infrastructure/terraform/lambda/_template/README.md index 2ae9f9af..0a2f07af 100644 --- a/infrastructure/terraform/lambda/_template/README.md +++ b/infrastructure/terraform/lambda/_template/README.md @@ -5,3 +5,6 @@ - [ ] Add ECR repo in shared/main.tf - [ ] Add shared output for repo name/url - [ ] Push to GitHub (CI will deploy) + + +Note: By default this does a sqs to lamba. Configure the terraform file for other connections between sqs->lambda \ No newline at end of file diff --git a/infrastructure/terraform/lambda/address2UPRN/main.tf b/infrastructure/terraform/lambda/address2UPRN/main.tf index a0c4d3af..a5978186 100644 --- a/infrastructure/terraform/lambda/address2UPRN/main.tf +++ b/infrastructure/terraform/lambda/address2UPRN/main.tf @@ -12,48 +12,18 @@ data "terraform_remote_state" "shared" { } ############################################ -# IAM role +# Address2UPRN Lambda (via reusable module) ############################################ -module "role" { - source = "../../modules/lambda_execution_role" - name = "address2uprn-lambda-${var.stage}" -} +module "address2uprn" { + source = "../modules/lambda_with_sqs" -############################################ -# SQS queue -############################################ -module "queue" { - source = "../../modules/sqs_queue" - name = "address2uprn-queue-${var.stage}" -} - -############################################ -# Lambda (image-based) -############################################ -module "lambda" { - source = "../../modules/lambda_service" - - name = "address2uprn-${var.stage}" - role_arn = module.role.role_arn + name = "address2uprn" + stage = var.stage image_uri = "${data.terraform_remote_state.shared.outputs.address2uprn_repository_url}@${var.image_digest}" - timeout = 60 - memory_size = 1024 - environment = { STAGE = var.stage LOG_LEVEL = "info" } } - -############################################ -# SQS → Lambda trigger -############################################ -module "sqs_trigger" { - source = "../../modules/lambda_sqs_trigger" - - lambda_arn = module.lambda.lambda_arn - lambda_role_name = module.role.role_name - queue_arn = module.queue.queue_arn -}