env variables added

.github/workflows/deploy_terraform.yml

@@ -90,10 +90,17 @@ jobs:
       ecr_repo: address2uprn-${{ needs.determine_stage.outputs.stage }}
       dockerfile_path: backend/address2UPRN/handler/Dockerfile
       build_context: .
+      build_args: |
+        DEV_DB_HOST=$DEV_DB_HOST
+        DEV_DB_PORT=$DEV_DB_PORT
+        DEV_DB_NAME=$DEV_DB_NAME
     secrets:
       AWS_ACCESS_KEY_ID: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
       AWS_REGION: ${{ secrets.DEV_AWS_REGION }}
+      DEV_DB_HOST: ${{ secrets.DEV_DB_HOST }}
+      DEV_DB_PORT: ${{ secrets.DEV_DB_PORT }}
+      DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }}
 
   # ============================================================
   # 3️⃣ Deploy Address 2 UPRN Lambda

backend/address2UPRN/handler/Dockerfile

@@ -1,6 +1,16 @@
 FROM public.ecr.aws/lambda/python:3.10
 # FROM python:3.11.10-bullseye
 
+
+ARG DEV_DB_HOST
+ARG DEV_DB_PORT
+ARG DEV_DB_NAME
+
+ENV DB_HOST=${DEV_DB_HOST}
+ENV DB_PORT=${DEV_DB_PORT}
+ENV DB_NAME=${DEV_DB_NAME}
+
+
 # Set working directory (Lambda task root)
 WORKDIR /var/task
 
@@ -13,10 +23,13 @@ COPY backend/address2UPRN/handler/requirements.txt .
 # Install dependencies into Lambda runtime
 RUN pip install --no-cache-dir -r requirements.txt
 
-# -----------------------------
+
-# Copy application code
+# Copy necessary files for database and utility imports
-# -----------------------------
 COPY utils/ utils/
+COPY backend/ backend/
+COPY datatypes/ datatypes/
+
+# Copy the handler
 COPY backend/address2UPRN/main.py .
 
 # -----------------------------

backend/address2UPRN/main.py

@@ -821,3 +821,4 @@ def handler(event, context, local=False):
 # TODO:
 # Don't add results to return messages as its too verbose
 # capture the exepection as e, into s3, to find the logs go to s3
+# Upload results to s3 as well as csv

infrastructure/terraform/lambda/address2UPRN/main.tf

@@ -1,3 +1,19 @@
+data "terraform_remote_state" "shared" {
+  backend = "s3"
+  config = {
+    bucket = "assessment-model-terraform-state"
+    key = "env:/${var.stage}/terraform.tfstate" # TODO: dont hardcode this
+    region = "eu-west-2"
+  }
+}
+data "aws_secretsmanager_secret_version" "db_credentials" {
+  secret_id = "${var.stage}/assessment_model/db_credentials"
+}
+
+locals {
+  db_credentials = jsondecode(data.aws_secretsmanager_secret_version.db_credentials.secret_string)
+}
+
 module "address2uprn" {
   source = "../modules/lambda_with_sqs"
 
@@ -6,9 +22,26 @@ module "address2uprn" {
 
   image_uri = local.image_uri
 
-
+  environment = merge(
-  environment = {
+    {
-    STAGE     = var.stage
+      STAGE     = var.stage
-    LOG_LEVEL = "info"
+      LOG_LEVEL = "info"
-  }
+      DB_USERNAME = local.db_credentials.db_assessment_model_username
+      DB_PASSWORD = local.db_credentials.db_assessment_model_password
+      GOOGLE_SOLAR_API_KEY = "test"
+      SAP_PREDICTIONS_BUCKET = "test"
+      CARBON_PREDICTIONS_BUCKET = "test"
+      HEAT_PREDICTIONS_BUCKET = "test"
+      HEATING_KWH_PREDICTIONS_BUCKET = "test"
+      HOTWATER_KWH_PREDICTIONS_BUCKET = "test"
+      API_KEY = "test"
+      ENVIRONMENT = "test"
+      SECRET_KEY = "test"
+      PLAN_TRIGGER_BUCKET = "test"
+      DATA_BUCKET = "test"
+      EPC_AUTH_TOKEN = "test"
+      ENGINE_SQS_URL = "test"
+      ENERGY_ASSESSMENTS_BUCKET = "test"
+    },
+  )
 }