Skip to content

fix: harden cloud run runtime guard #298

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 1 commit into from
Jul 3, 2026
Merged

fix: harden cloud run runtime guard #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions scripts/cloud_run_runtime_guard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,17 @@ def _load_services() -> list[str]:
return unique


def _cloud_run_log_filter(service: str, since_text: str, region: str = "") -> str:
parts = [
'resource.type="cloud_run_revision"',
f'resource.labels.service_name="{service}"',
f'timestamp >= "{since_text}"',
]
if region:
parts.append(f'resource.labels.location="{region}"')
return " AND ".join(parts)


def _service_job_aliases(service: str) -> list[str]:
service_name = str(service or "").strip()
if not service_name:
Expand Down Expand Up @@ -510,11 +521,7 @@ def main() -> int:
service_since = _cloud_run_log_since(project, service, since) if ignore_pre_ready_logs else since
service_since_by_name[service] = service_since
service_since_text = _format_timestamp(service_since)
log_filter = (
'resource.type="cloud_run_revision" '
f'AND resource.labels.service_name="{service}" '
f'AND timestamp >= "{service_since_text}"'
)
log_filter = _cloud_run_log_filter(service, service_since_text, _region_for_service(service))
try:
entries = _run_gcloud_logging(project, log_filter, limit)
except RuntimeError as exc:
Expand Down
12 changes: 12 additions & 0 deletions tests/test_cloud_run_runtime_guard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@
from scripts import cloud_run_runtime_guard as guard


def test_cloud_run_log_filter_includes_region_when_available():
log_filter = guard._cloud_run_log_filter(
"interactive-brokers-live-u1599-tqqq-service",
"2026-07-01T12:00:00Z",
"asia-east1",
)

assert 'resource.labels.service_name="interactive-brokers-live-u1599-tqqq-service"' in log_filter
assert 'resource.labels.location="asia-east1"' in log_filter
assert 'timestamp >= "2026-07-01T12:00:00Z"' in log_filter


def test_scheduler_job_pattern_includes_service_alias():
pattern = guard._scheduler_job_pattern_for_services(
["interactive-brokers-live-u1599-tqqq-service"]
Expand Down
Loading