Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
268 changes: 202 additions & 66 deletions .github/workflows/sync-cloud-run-env.yml

Large diffs are not rendered by default.

19 changes: 18 additions & 1 deletion scripts/build_cloud_run_env_sync_plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ def _build_target_plan(
+ "\n".join(f" - {item}" for item in missing)
)

return {
target_plan = {
"service_name": service_name,
"strategy_profile": canonical_profile,
"env": env_values,
Expand All @@ -431,6 +431,16 @@ def _build_target_plan(
),
"remove_env_vars": sorted(set(remove_env_vars) - set(env_values)),
}
target_region = _first_non_empty(
*(_entry_field(target, name) for name in ("region", "cloud_run_region", "location")),
*(_entry_field(defaults, name) for name in ("region", "cloud_run_region", "location")),
runtime_target.get("region"),
runtime_target.get("cloud_run_region"),
runtime_target.get("location"),
)
if target_region is not None:
target_plan["region"] = str(target_region).strip()
return target_plan


def _build_scheduler_plan(
Expand Down Expand Up @@ -551,6 +561,13 @@ def _target_field(
return None


def _entry_field(entry: Mapping[str, object], name: str) -> object | None:
for source in (entry, _coerce_mapping(entry.get("env") or {})):
if name in source:
return source[name]
return None


def _coerce_mapping(value: object) -> Mapping[str, object]:
if not isinstance(value, Mapping):
raise ValueError("Expected a JSON object")
Expand Down
Loading