From e9ac489e42424d75fd41a3b482ac6f5ecbd82b85 Mon Sep 17 00:00:00 2001
From: chrischristiansen-glitch <chris.christiansen@vauco.no>
Date: Sat, 23 May 2026 16:29:18 +0200
Subject: [PATCH] fix: add PATH and auto-source .env so adk works when called
 via bash

---
 infrastructure/05-cloudrun-deploy.sh | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/infrastructure/05-cloudrun-deploy.sh b/infrastructure/05-cloudrun-deploy.sh
index b6fc69a..1cf602b 100644
--- a/infrastructure/05-cloudrun-deploy.sh
+++ b/infrastructure/05-cloudrun-deploy.sh
@@ -2,14 +2,24 @@
 # 05-cloudrun-deploy.sh — Deploy ADK agent to Cloud Run using `adk deploy cloud_run`
 # Run in: local VS Code terminal OR Cloud Shell
 # Requires: ADK installed (pip install google-adk), gcloud CLI
-# Source .env before running: source .env
 
 set -euo pipefail
 
-: "${PROJECT_ID:?Set PROJECT_ID}"
-: "${REGION:?Set REGION}"
-: "${CLOUD_RUN_SERVICE:?Set CLOUD_RUN_SERVICE}"
-: "${AGENT_SA:?Set AGENT_SA}"
+# Ensure pip-installed tools (adk) are on PATH
+export PATH="$HOME/.local/bin:$PATH"
+
+# Auto-source .env if not already sourced
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+ENV_FILE="${SCRIPT_DIR}/../.env"
+if [ -f "${ENV_FILE}" ]; then
+  # shellcheck disable=SC1090
+  set -a; source "${ENV_FILE}"; set +a
+fi
+
+: "${PROJECT_ID:?Set PROJECT_ID in .env}"
+: "${REGION:?Set REGION in .env}"
+: "${CLOUD_RUN_SERVICE:?Set CLOUD_RUN_SERVICE in .env}"
+: "${AGENT_SA:?Set AGENT_SA in .env}"
 
 APP_NAME="core-logic"
 AGENT_PATH="agents/core-logic"
@@ -40,9 +50,6 @@ export GOOGLE_CLOUD_PROJECT="${PROJECT_ID}"
 export GOOGLE_CLOUD_LOCATION="${REGION}"
 export GOOGLE_GENAI_USE_VERTEXAI="True"
 
-# Deploy via ADK CLI
-# --with_ui includes the ADK dev UI (remove for API-only production deployments)
-# --no-allow-unauthenticated requires an identity token to call the service
 echo "Deploying ${CLOUD_RUN_SERVICE} to Cloud Run in ${REGION}..."
 adk deploy cloud_run \
   --project="${PROJECT_ID}" \