Skip to content

fix: prefer matching environment runtime target #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pigbibi merged 2 commits into from
Aug 30, 2026
Merged

fix: prefer matching environment runtime target #283

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e8c137
fix: prefer matching environment runtime target
Pigbibi Aug 30, 2026
ca024ee
Merge remote-tracking branch 'origin/main' into codex/per-service-run…
Pigbibi Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion scripts/build_cloud_run_env_sync_plan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,20 @@ def _resolve_runtime_target(
env: Mapping[str, str],
per_service_mode: bool,
) -> dict[str, object]:
raw = _first_non_empty(
configured_service = str(_first_non_empty(
_target_field(target, defaults, "service"),
_target_field(target, defaults, "service_name"),
_target_field(target, defaults, "cloud_run_service"),
) or "").strip()
current_service = str(env.get("CLOUD_RUN_SERVICE", "") or "").strip()
environment_target = str(env.get("RUNTIME_TARGET_JSON", "") or "").strip()

# An environment-scoped switch is the desired state for its exact service.
# It must not be silently replaced by a legacy repository service inventory;
# sibling services continue to use their own inventory entries.
raw = environment_target if (
per_service_mode and environment_target and configured_service == current_service
) else _first_non_empty(
_target_field(target, defaults, "runtime_target"),
_target_field(target, defaults, "runtime_target_json"),
)
Expand Down