Skip to content

Commit a62930e

Browse files
authored
fix: correct service.tf conditional for adk_live and upgrade Node.js to 20 (#692)
* fix: correct service.tf conditional for adk_live and upgrade Node.js to 20 - Fix service.tf exclusion to only apply when adk_live AND agent_engine - Previously excluded service.tf for all adk_live deployments including cloud_run - Upgrade Node.js from deprecated 18.x to 20.x LTS in Dockerfile and docs workflow * refactor: extract shared lambda for service.tf conditional DRY up the repeated lambda by defining _exclude_adk_live_agent_engine helper.
1 parent e586d8d commit a62930e

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup Node.js
2828
uses: actions/setup-node@v4
2929
with:
30-
node-version: 18
30+
node-version: 20
3131
cache: 'npm'
3232
cache-dependency-path: docs/package-lock.json
3333

agent_starter_pack/cli/utils/template.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ def resolve_agent_alias(name: str | None) -> str | None:
8989
# The config dict contains: agent_name, cicd_runner, is_adk, is_adk_live, is_a2a
9090
# =============================================================================
9191

92+
# Helper: exclude service.tf only for adk_live + agent_engine combination
93+
_exclude_adk_live_agent_engine = lambda c: not (
94+
c.get("agent_name") == "adk_live" and c.get("deployment_target") == "agent_engine"
95+
)
96+
9297
CONDITIONAL_FILES = {
9398
# CI/CD runner conditional files (base_template)
9499
".cloudbuild": lambda c: c.get("cicd_runner") == "google_cloud_build",
@@ -108,10 +113,8 @@ def resolve_agent_alias(name: str | None) -> str | None:
108113
# Agent Engine deployment target conditionals
109114
"{agent_directory}/app_utils/expose_app.py": lambda c: c.get("is_adk_live"),
110115
"tests/helpers.py": lambda c: c.get("is_a2a"),
111-
"deployment/terraform/service.tf": (lambda c: c.get("agent_name") != "adk_live"),
112-
"deployment/terraform/dev/service.tf": (
113-
lambda c: c.get("agent_name") != "adk_live"
114-
),
116+
"deployment/terraform/service.tf": _exclude_adk_live_agent_engine,
117+
"deployment/terraform/dev/service.tf": _exclude_adk_live_agent_engine,
115118
}
116119

117120

agent_starter_pack/deployment_targets/cloud_run/python/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN pip install --no-cache-dir uv==0.8.13
2020
# Install Node.js for frontend build
2121
RUN apt-get update && apt-get install -y \
2222
curl \
23-
&& curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
23+
&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
2424
&& apt-get install -y nodejs \
2525
&& apt-get clean \
2626
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)