try getting all db vars from github secrets

This commit is contained in:
Daniel Roth 2026-02-06 11:16:34 +00:00
parent 9c7678865f
commit b8283abc45
5 changed files with 61 additions and 68 deletions

View file

@ -34,13 +34,20 @@ on:
required: true
DEV_DB_HOST:
required: false
REAL_DB_HOST:
DEV_DB_PORT:
required: false
DEV_DB_NAME:
required: false
jobs:
build:
runs-on: ubuntu-latest
env:
DEV_DB_HOST: ${{ secrets.DEV_DB_HOST }}
DEV_DB_PORT: ${{ secrets.DEV_DB_PORT }}
DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }}
outputs:
image_digest: ${{ steps.digest.outputs.image_digest }}
ecr_repo_url: ${{ steps.repo.outputs.ecr_repo_url }}
@ -82,8 +89,8 @@ jobs:
done <<< "${{ inputs.build_args }}"
echo "dev db host: $DEV_DB_HOST"
echo "real db host: $REAL_DB_HOST"
echo "aws_key_id: $AWS_ACCESS_KEY_ID"
echo "dev db port: $DEV_DB_PORT"
echo "dev db name: $DEV_DB_NAME"
docker build \
-f ${{ inputs.dockerfile_path }} \

View file

@ -142,17 +142,16 @@ jobs:
dockerfile_path: backend/condition/handler/Dockerfile
build_context: .
build_args: |
JUNTE=best
DEV_DB_HOST=$DEV_DB_HOST
REAL_DB_HOST=$REAL_DB_HOST
AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
AWS_REGION=$AWS_REGION
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 }}
REAL_DB_HOST: ${{ secrets.dev_DB_HOST }}
DEV_DB_PORT: ${{ secrets.DEV_DB_PORT }}
DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }}
# ============================================================
# Deploy Condition ETL Lambda

View file

@ -6,35 +6,35 @@ DB_PASSWORD=makingwarmerhomes
#not used
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"
API_KEY="test"
SECRET_KEY="test"
ENVIRONMENT="test"
DATA_BUCKET="test"
PLAN_TRIGGER_BUCKET="test"
ENGINE_SQS_URL="test"
GOOGLE_SOLAR_API_KEY="test"
DB_HOST="test"
DB_PASSWORD="test"
DB_USERNAME="test"
DB_PORT="test"
DB_NAME="test"
SAP_PREDICTIONS_BUCKET="test"
CARBON_PREDICTIONS_BUCKET="test"
HEAT_PREDICTIONS_BUCKET="test"
HEATING_KWH_PREDICTIONS_BUCKET="test"
HOTWATER_KWH_PREDICTIONS_BUCKET="test"
ENERGY_ASSESSMENTS_BUCKET="test"
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
API_KEY=test
SECRET_KEY=test
ENVIRONMENT=test
DATA_BUCKET=test
PLAN_TRIGGER_BUCKET=test
ENGINE_SQS_URL=test
GOOGLE_SOLAR_API_KEY=test
DB_HOST=test
DB_PASSWORD=test
DB_USERNAME=test
DB_PORT=test
DB_NAME=test
SAP_PREDICTIONS_BUCKET=test
CARBON_PREDICTIONS_BUCKET=test
HEAT_PREDICTIONS_BUCKET=test
HEATING_KWH_PREDICTIONS_BUCKET=test
HOTWATER_KWH_PREDICTIONS_BUCKET=test
ENERGY_ASSESSMENTS_BUCKET=test

View file

@ -2,28 +2,21 @@ FROM public.ecr.aws/lambda/python:3.11
# For local running:
# FROM python:3.11.10-bullseye
# ARG EPC_AUTH_TOKEN
# ARG DEV_DB_HOST
ARG JUNTE
ENV JUNTE=${JUNTE}
ARG DEV_DB_HOST
ENV DEV_DB_HOST=${DEV_DB_HOST}
ARG DEV_DB_PORT
ARG DEV_DB_NAME
ARG REAL_DB_HOST
ENV REAL_DB_HOST=${REAL_DB_HOST}
ARG AWS_ACCESS_KEY_ID
ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
ARG AWS_REGION
ENV AWS_REGION=${AWS_REGION}
# Set working directory (Lambda task root)
WORKDIR /var/task
# Environment
ENV DB_HOST=${DEV_DB_HOST}
ENV DB_PORT=${DEV_DB_PORT}
ENV DB_NAME=${DEV_DB_NAME}
COPY backend/.env.local backend/.env.local
# -----------------------------
# Copy requirements FIRST (for Docker layer caching)
# -----------------------------
@ -47,8 +40,6 @@ COPY backend/app/__init__.py backend/app/__init__.py
COPY backend/app/db/__init__.py backend/app/db/__init__.py
# ENV EPC_AUTH_TOKEN=${EPC_AUTH_TOKEN}
# -----------------------------
# Lambda handler
# -----------------------------

View file

@ -16,20 +16,16 @@ import os
def handler(event: Mapping[str, Any], context: Any) -> None:
print(
"hello Jun-te",
os.getenv("JUNTE", "empty junte"),
"hello DB HOST:",
os.getenv("DB_HOST", "empty db host"),
)
print(
"hello DEV DB HOST:",
os.getenv("DEV_DB_HOST", "empty db"),
"hello DB PORT:",
os.getenv("DB_PORT", "empty db port"),
)
print(
"hello REAL DB HOST:",
os.getenv("REAL_DB_HOST", "empty db"),
)
print(
"hello access key",
os.getenv("AWS_ACCESS_KEY_ID", "empty key"),
"hello DB NAME:",
os.getenv("DB_NAME", "empty name"),
)
print(
"hello region",