From f2a1a76735ee0261ab71a7945653b1b01e080e28 Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Thu, 5 Feb 2026 15:24:49 +0000 Subject: [PATCH] test environment variable --- .github/workflows/_build_image.yml | 22 ++++++++++++++++++++-- .github/workflows/deploy_terraform.yml | 3 +++ backend/condition/handler/Dockerfile | 16 +++++++++++++--- backend/condition/handler/handler.py | 20 +++++++++++--------- 4 files changed, 47 insertions(+), 14 deletions(-) diff --git a/.github/workflows/_build_image.yml b/.github/workflows/_build_image.yml index 6b6c4994..ddbf03ad 100644 --- a/.github/workflows/_build_image.yml +++ b/.github/workflows/_build_image.yml @@ -13,6 +13,9 @@ on: required: false default: "." type: string + build_args: + required: false + type: string outputs: image_digest: @@ -64,8 +67,23 @@ jobs: - name: Build & push image run: | IMAGE_URI="${{ steps.repo.outputs.ecr_repo_url }}:${GITHUB_SHA}" - docker build -f ${{ inputs.dockerfile_path }} -t $IMAGE_URI ${{ inputs.build_context }} - docker push $IMAGE_URI + + BUILD_ARGS="" + if [ -n "${{ inputs.build_args }}" ]; then + while read -r line; do + BUILD_ARGS="$BUILD_ARGS --build-arg $line" + done <<< "${{ inputs.build_args }}" + fi + + docker build \ + -f ${{ inputs.dockerfile_path }} \ + $BUILD_ARGS \ + -t $IMAGE_URI \ + ${{ inputs.build_context }} + + docker push $IMAGE_UR + docker build -f ${{ inputs.dockerfile_path }} -t $IMAGE_URI ${{ inputs.build_context }} + docker push $IMAGE_URI - name: Resolve image digest id: digest diff --git a/.github/workflows/deploy_terraform.yml b/.github/workflows/deploy_terraform.yml index 5612a8c5..c720ae47 100644 --- a/.github/workflows/deploy_terraform.yml +++ b/.github/workflows/deploy_terraform.yml @@ -140,6 +140,9 @@ jobs: ecr_repo: condition-etl-${{ needs.determine_stage.outputs.stage }} dockerfile_path: backend/condition/handler/Dockerfile build_context: . + build_args: | + JUNTE=best3 + secrets: AWS_ACCESS_KEY_ID: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }} diff --git a/backend/condition/handler/Dockerfile b/backend/condition/handler/Dockerfile index 69287146..ad0a11dd 100644 --- a/backend/condition/handler/Dockerfile +++ b/backend/condition/handler/Dockerfile @@ -1,5 +1,11 @@ FROM public.ecr.aws/lambda/python:3.11 -# FROM python:3.11.10-bullseye # For local running +# For local running: +# FROM python:3.11.10-bullseye + +# ARG EPC_AUTH_TOKEN + +ARG JUNTE +ENV JUNTE=${JUNTE} # Set working directory (Lambda task root) WORKDIR /var/task @@ -24,10 +30,14 @@ COPY backend/app/config.py backend/app/config.py COPY backend/__init__.py backend/__init__.py COPY backend/app/__init__.py backend/app/__init__.py -COPY backend/app/db/__init__.py backend/app/db/__init__.py +COPY backend/app/db/__init__.py backend/app/db/__init__.py + + +# ENV EPC_AUTH_TOKEN=${EPC_AUTH_TOKEN} # ----------------------------- # Lambda handler # ----------------------------- CMD ["backend/condition/handler/handler.handler"] -# CMD ["python", "-m", "backend.condition.handler.handler"] # For local running +# For local running +# CMD ["python", "-m", "backend.condition.handler.handler"] diff --git a/backend/condition/handler/handler.py b/backend/condition/handler/handler.py index 1f3580f3..ba1106c5 100644 --- a/backend/condition/handler/handler.py +++ b/backend/condition/handler/handler.py @@ -1,19 +1,21 @@ -import json +# import json from typing import Mapping, Any -from io import BytesIO +import os -from backend.condition.condition_trigger_request import ConditionTriggerRequest -from backend.condition.lookups.uprn_lookup_s3 import UprnLookupS3 -from backend.condition.processor import process_file -from utils.logger import setup_logger -from utils.s3 import read_io_from_s3 +# from io import BytesIO + +# from backend.condition.condition_trigger_request import ConditionTriggerRequest +# from backend.condition.lookups.uprn_lookup_s3 import UprnLookupS3 +# from backend.condition.processor import process_file +# from utils.logger import setup_logger +# from utils.s3 import read_io_from_s3 -logger = setup_logger() +# logger = setup_logger() def handler(event: Mapping[str, Any], context: Any) -> None: - print("hello world") + print("hello world", os.getenv("JUNTE", "empty")) # uprn_lookup = UprnLookupS3( # bucket="", key="" # ) # TODO: replace with postgres implementation