From 5df2318bb5dfa5812835da530416b91932983fd9 Mon Sep 17 00:00:00 2001
From: Daniel Roth <daniel_roth@hotmail.co.uk>
Date: Wed, 8 Apr 2026 08:44:45 +0000
Subject: [PATCH] start defining infrastructure including ecr

---
 backend/ecmk_fetcher/handler/Dockerfile       |  4 +-
 .../terraform/lambda/ecmk_to_ara/main.tf      | 27 ++++++++++++++
 .../terraform/lambda/ecmk_to_ara/provider.tf  | 16 ++++++++
 .../terraform/lambda/ecmk_to_ara/variables.tf | 37 +++++++++++++++++++
 infrastructure/terraform/shared/main.tf       | 14 +++++++
 5 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 infrastructure/terraform/lambda/ecmk_to_ara/main.tf
 create mode 100644 infrastructure/terraform/lambda/ecmk_to_ara/provider.tf
 create mode 100644 infrastructure/terraform/lambda/ecmk_to_ara/variables.tf

diff --git a/backend/ecmk_fetcher/handler/Dockerfile b/backend/ecmk_fetcher/handler/Dockerfile
index 2b6007d9..fa2126fd 100644
--- a/backend/ecmk_fetcher/handler/Dockerfile
+++ b/backend/ecmk_fetcher/handler/Dockerfile
@@ -15,10 +15,10 @@ COPY backend/ backend/
 COPY datatypes/ datatypes/
 
 # Local lambda entrypoint 
-ENTRYPOINT ["/usr/local/bin/aws-lambda-rie", "python", "-m", "awslambdaric"]
+# ENTRYPOINT ["/usr/local/bin/aws-lambda-rie", "python", "-m", "awslambdaric"]
 
 #AWS lambda entrypoint
-# ENTRYPOINT ["python", "-m", "awslambdaric"]
+ENTRYPOINT ["python", "-m", "awslambdaric"]
 
 # -----------------------------
 # Lambda handler
diff --git a/infrastructure/terraform/lambda/ecmk_to_ara/main.tf b/infrastructure/terraform/lambda/ecmk_to_ara/main.tf
new file mode 100644
index 00000000..357c2f87
--- /dev/null
+++ b/infrastructure/terraform/lambda/ecmk_to_ara/main.tf
@@ -0,0 +1,27 @@
+data "terraform_remote_state" "shared" {
+  backend = "s3"
+  config = {
+    bucket = "assessment-model-terraform-state"
+    key = "env:/${var.stage}/terraform.tfstate"
+    region = "eu-west-2"
+  }
+}
+
+module "lambda" {
+  source = "../../modules/lambda_with_sqs"
+
+  name  = "ecmk_to_ara" #"address2uprn" for example
+  stage = var.stage
+
+  image_uri = local.image_uri
+
+  # Optional: Set maximum_concurrency to limit concurrent SQS-triggered invocations (2-1000)
+  maximum_concurrency = var.maximum_concurrency
+
+  batch_size = var.batch_size
+
+  environment = {
+    STAGE = var.stage
+    LOG_LEVEL = "info"
+  }
+}
diff --git a/infrastructure/terraform/lambda/ecmk_to_ara/provider.tf b/infrastructure/terraform/lambda/ecmk_to_ara/provider.tf
new file mode 100644
index 00000000..87a94150
--- /dev/null
+++ b/infrastructure/terraform/lambda/ecmk_to_ara/provider.tf
@@ -0,0 +1,16 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 5.0"
+    }
+  }
+
+  backend "s3" {
+    bucket = "ecmk-to-ara-terraform-state"
+    key    = "terraform.tfstate"
+    region = "eu-west-2"
+  }
+
+  required_version = ">= 1.2.0"
+}
\ No newline at end of file
diff --git a/infrastructure/terraform/lambda/ecmk_to_ara/variables.tf b/infrastructure/terraform/lambda/ecmk_to_ara/variables.tf
new file mode 100644
index 00000000..984e3908
--- /dev/null
+++ b/infrastructure/terraform/lambda/ecmk_to_ara/variables.tf
@@ -0,0 +1,37 @@
+variable "lambda_name" {
+  type        = string
+  description = "Logical name of the lambda (e.g. address2uprn)"
+}
+
+variable "stage" {
+  description = "Deployment stage (e.g. dev, prod)"
+  type        = string
+}
+variable "ecr_repo_url" {
+  type        = string
+  description = "ECR repository URL (no tag, no digest)"
+}
+
+variable "image_digest" {
+  type        = string
+  description = "Image digest (sha256:...)"
+}
+
+variable "maximum_concurrency" {
+  type        = number
+  default     = 2
+  description = "Maximum number of concurrent Lambda invocations from SQS (2-1000). null = no limit."
+}
+
+variable "batch_size" {
+  type    = number
+  default = 1
+}
+
+locals {
+  image_uri = "${var.ecr_repo_url}@${var.image_digest}"
+}
+
+output "resolved_image_uri" {
+  value = local.image_uri
+}
diff --git a/infrastructure/terraform/shared/main.tf b/infrastructure/terraform/shared/main.tf
index 9d272eb6..47866c92 100644
--- a/infrastructure/terraform/shared/main.tf
+++ b/infrastructure/terraform/shared/main.tf
@@ -538,6 +538,20 @@ module "pashub_to_ara_registry" {
   stage  = var.stage
 }
 
+################################################
+# ECMK to Ara – Lambda
+################################################
+module "ecmk_to_ara_state_bucket" {
+  source      = "../modules/tf_state_bucket"
+  bucket_name = "ecmk-to-ara-terraform-state"
+}
+
+module "ecmk_to_ara_registry" {
+  source = "../modules/container_registry"
+  name   = "ecmk_to_ara"
+  stage  = var.stage
+}
+
 ################################################
 # Engine – Lambda ECR
 ################################################