Skip to content

Commit 5e8c137

Browse files
Pigbibicodex
andcommitted
fix: prefer matching environment runtime target
Co-Authored-By: Codex <noreply@openai.com>
1 parent 26539da commit 5e8c137

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

scripts/build_cloud_run_env_sync_plan.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,20 @@ def _resolve_runtime_target(
554554
env: Mapping[str, str],
555555
per_service_mode: bool,
556556
) -> dict[str, object]:
557-
raw = _first_non_empty(
557+
configured_service = str(_first_non_empty(
558+
_target_field(target, defaults, "service"),
559+
_target_field(target, defaults, "service_name"),
560+
_target_field(target, defaults, "cloud_run_service"),
561+
) or "").strip()
562+
current_service = str(env.get("CLOUD_RUN_SERVICE", "") or "").strip()
563+
environment_target = str(env.get("RUNTIME_TARGET_JSON", "") or "").strip()
564+
565+
# An environment-scoped switch is the desired state for its exact service.
566+
# It must not be silently replaced by a legacy repository service inventory;
567+
# sibling services continue to use their own inventory entries.
568+
raw = environment_target if (
569+
per_service_mode and environment_target and configured_service == current_service
570+
) else _first_non_empty(
558571
_target_field(target, defaults, "runtime_target"),
559572
_target_field(target, defaults, "runtime_target_json"),
560573
)

0 commit comments

Comments
 (0)