From 1d8fbdc4a825eea4c6d3d9d0c669d140f6f9a620 Mon Sep 17 00:00:00 2001
From: Jun-te Kim <junte.kim@mealcraft.com>
Date: Tue, 3 Feb 2026 16:09:08 +0000
Subject: [PATCH] ecr_repo_url was empty for some reason

---
 .github/workflows/_deploy_lambda.yml          | 10 +++++---
 .github/workflows/deploy_terraform.yml        |  5 +++-
 .../terraform/lambda/address2UPRN/main.tf     |  3 ++-
 .../lambda/address2UPRN/variables.tf          | 23 +++++++++++++++----
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/_deploy_lambda.yml b/.github/workflows/_deploy_lambda.yml
index 8161dbbf..07bfe331 100644
--- a/.github/workflows/_deploy_lambda.yml
+++ b/.github/workflows/_deploy_lambda.yml
@@ -15,8 +15,11 @@ on:
         required: true
         type: string
 
-      image_uri:
-        description: "Full ECR image URI including digest"
+      ecr_repo_url:
+        required: true
+        type: string
+
+      image_digest:
         required: true
         type: string
 
@@ -59,7 +62,8 @@ jobs:
           terraform plan \
             -var="stage=${{ inputs.stage }}" \
             -var="lambda_name=${{ inputs.lambda_name }}" \
-            -var="image_uri=${{ inputs.image_uri }}" \
+            -var="ecr_repo_url=${{ inputs.ecr_repo_url }}" \
+            -var="image_digest=${{ inputs.image_digest }}" \
             -out=lambdaplan
 
       - name: Terraform Apply
diff --git a/.github/workflows/deploy_terraform.yml b/.github/workflows/deploy_terraform.yml
index eede1048..38f841e7 100644
--- a/.github/workflows/deploy_terraform.yml
+++ b/.github/workflows/deploy_terraform.yml
@@ -20,8 +20,10 @@ jobs:
 
           if [[ "$BRANCH" == "prod" ]]; then
             echo "stage=prod" >> "$GITHUB_OUTPUT"
+
           elif [[ "$BRANCH" == "dev" ]]; then
             echo "stage=dev" >> "$GITHUB_OUTPUT"
+
           else
             echo "stage=dev" >> "$GITHUB_OUTPUT"
           fi
@@ -88,7 +90,8 @@ jobs:
       lambda_name: address2uprn
       lambda_path: infrastructure/terraform/lambda/address2UPRN
       stage: ${{ needs.determine_stage.outputs.stage }}
-      image_uri: ${{ needs.address2uprn_image.outputs.ecr_repo_url }}@${{ needs.address2uprn_image.outputs.image_digest }}
+      ecr_repo_url: ${{ needs.address2uprn_image.outputs.ecr_repo_url }}
+      image_digest: ${{ needs.address2uprn_image.outputs.image_digest }}
     secrets:
       AWS_ACCESS_KEY_ID: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
diff --git a/infrastructure/terraform/lambda/address2UPRN/main.tf b/infrastructure/terraform/lambda/address2UPRN/main.tf
index 8d8e489f..46b193f2 100644
--- a/infrastructure/terraform/lambda/address2UPRN/main.tf
+++ b/infrastructure/terraform/lambda/address2UPRN/main.tf
@@ -4,7 +4,8 @@ module "address2uprn" {
   name  = "address2uprn"
   stage = var.stage
 
-  image_uri = var.image_uri
+  image_uri = local.image_uri
+
 
   environment = {
     STAGE     = var.stage
diff --git a/infrastructure/terraform/lambda/address2UPRN/variables.tf b/infrastructure/terraform/lambda/address2UPRN/variables.tf
index 41a99950..e4bab243 100644
--- a/infrastructure/terraform/lambda/address2UPRN/variables.tf
+++ b/infrastructure/terraform/lambda/address2UPRN/variables.tf
@@ -3,12 +3,25 @@ variable "lambda_name" {
   description = "Logical name of the lambda (e.g. address2uprn)"
 }
 
-variable "image_uri" {
-  type        = string
-  description = "Full ECR image URI including digest"
-}
-
 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:...)"
+}
+
+
+locals {
+  image_uri = "${var.ecr_repo_url}@${var.image_digest}"
+}
+
+output "resolved_image_uri" {
+  value = local.image_uri
+}