diff --git a/.github/workflows/invoke-cloud-run.yml b/.github/workflows/invoke-cloud-run.yml index 7e4da92..b584334 100644 --- a/.github/workflows/invoke-cloud-run.yml +++ b/.github/workflows/invoke-cloud-run.yml @@ -141,7 +141,6 @@ jobs: scheduler_location="" scheduler_expected_path="" restore_probe_uri="" - pause_after_run="false" ensure_invoke_bridge_job() { local bridge_job="$1" local bridge_uri="$2" @@ -353,12 +352,11 @@ jobs: ensure_invoke_bridge_job "${scheduler_job}" "${service_url}/dry-run" "${scheduler_location}" ;; /session-renew) - # Manual-only forced read-only session renewal. Dedicated bridge job, kept PAUSED - # between manual invokes so its placeholder schedule never fires on its own. + # Manual-only forced read-only session renewal via a dedicated bridge job (same + # placeholder-schedule pattern as the probe/precheck bridges). scheduler_job="${CLOUD_RUN_SERVICE}-session-renew-scheduler" scheduler_expected_path="/session-renew" ensure_invoke_bridge_job "${scheduler_job}" "${service_url}/session-renew" "${scheduler_location}" - pause_after_run="true" ;; /account-facts-sync) # Dedicated scheduler: OIDC for Cloud Run IAM (X-Serverless-Authorization) plus @@ -428,7 +426,6 @@ jobs: echo "scheduler_job=${scheduler_job}" echo "scheduler_location=${scheduler_location}" echo "restore_probe_uri=${restore_probe_uri}" - echo "pause_after_run=${pause_after_run}" } >> "$GITHUB_OUTPUT" - name: Authenticate for service invocation @@ -456,7 +453,6 @@ jobs: if: steps.service.outputs.invoke_method == 'scheduler' env: RESTORE_PROBE_URI: ${{ steps.service.outputs.restore_probe_uri }} - PAUSE_AFTER_RUN: ${{ steps.service.outputs.pause_after_run }} SERVICE_URL: ${{ steps.service.outputs.url }} run: | set -euo pipefail @@ -466,13 +462,6 @@ jobs: scheduler_location="${{ steps.service.outputs.scheduler_location }}" restore_probe_scheduler() { - if [ "${PAUSE_AFTER_RUN:-false}" = "true" ]; then - echo "Pausing manual-only bridge job ${scheduler_job}." - gcloud scheduler jobs pause "${scheduler_job}" \ - --project="${GCP_PROJECT_ID}" \ - --location="${scheduler_location}" \ - --quiet || echo "::warning::Could not pause ${scheduler_job}; pause it manually." - fi if [ -z "${RESTORE_PROBE_URI:-}" ]; then return 0 fi @@ -487,12 +476,6 @@ jobs: --quiet || true } trap restore_probe_scheduler EXIT - if [ "${PAUSE_AFTER_RUN:-false}" = "true" ]; then - gcloud scheduler jobs resume "${scheduler_job}" \ - --project="${GCP_PROJECT_ID}" \ - --location="${scheduler_location}" \ - --quiet - fi echo "Triggering ${scheduler_job} at ${started_at}." gcloud scheduler jobs run "${scheduler_job}" \ diff --git a/tests/test_invoke_cloud_run_workflow.py b/tests/test_invoke_cloud_run_workflow.py index 5a43698..a0fff38 100644 --- a/tests/test_invoke_cloud_run_workflow.py +++ b/tests/test_invoke_cloud_run_workflow.py @@ -16,11 +16,10 @@ def test_invoke_cloud_run_workflow_ensures_probe_and_dry_run_scheduler_bridges() assert '--schedule="0 0 1 1 *"' in workflow -def test_invoke_cloud_run_workflow_session_renew_bridge_is_paused_after_run(): +def test_invoke_cloud_run_workflow_session_renew_bridge(): workflow_path = Path(__file__).resolve().parents[1] / ".github/workflows/invoke-cloud-run.yml" workflow = workflow_path.read_text(encoding="utf-8") assert 'scheduler_job="${CLOUD_RUN_SERVICE}-session-renew-scheduler"' in workflow assert 'ensure_invoke_bridge_job "${scheduler_job}" "${service_url}/session-renew"' in workflow - assert 'gcloud scheduler jobs pause "${scheduler_job}"' in workflow - assert 'pause_after_run="true"' in workflow + assert "scheduler jobs resume" not in workflow