Skip to content

fix(ops): fail closed before manual VM reset #97

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 12, 2026
Merged

fix(ops): fail closed before manual VM reset #97

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
12 changes: 12 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ on:
options:
- keepalive
- full
allow_vm_reset:
description: permit automatic VM reset after SSH/SCP/deploy failure
required: false
default: false
type: boolean
sync_github_secrets_to_secret_manager:
description: write current GitHub secrets into Secret Manager before deploy
required: false
Expand Down Expand Up @@ -223,6 +228,7 @@ jobs:
VNC_SERVER_PASSWORD_SECRET_NAME: ${{ matrix.target.vnc_server_password_secret_name }}
WORKFLOW_DISPATCH_MODE: ${{ github.event.inputs.deploy_mode }}
WORKFLOW_DISPATCH_TARGET: ${{ github.event.inputs.target }}
WORKFLOW_DISPATCH_ALLOW_VM_RESET: ${{ github.event.inputs.allow_vm_reset }}
steps:
- name: Checkout code
uses: actions/checkout@v6
Expand Down Expand Up @@ -511,6 +517,12 @@ jobs:
)

reset_instance_and_wait_for_ssh() {
if [ "${DEPLOY_EVENT_NAME}" = "workflow_dispatch" ] \
&& [ "${WORKFLOW_DISPATCH_ALLOW_VM_RESET:-false}" != "true" ]; then
echo "Manual workflow VM reset is disabled; failing closed." >&2
return 1
fi

log_step "Resetting ${GCE_INSTANCE_NAME} after SSH/SCP failure"
gcloud compute instances reset "${GCE_INSTANCE_NAME}" \
--project "${GCP_PROJECT_ID}" \
Expand Down
2 changes: 2 additions & 0 deletions tests/test_workflow_shared_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ grep -Fq 'workload_identity_provider: ${{ env.GCP_WORKLOAD_IDENTITY_PROVIDER }}'
grep -Fq 'service_account: ${{ env.GCP_WORKLOAD_IDENTITY_SERVICE_ACCOUNT }}' "$workflow_file"
grep -Fq "DEPLOY_EVENT_NAME: \${{ github.event_name }}" "$workflow_file"
grep -Fq "WORKFLOW_DISPATCH_MODE: \${{ github.event.inputs.deploy_mode }}" "$workflow_file"
grep -Fq "WORKFLOW_DISPATCH_ALLOW_VM_RESET: \${{ github.event.inputs.allow_vm_reset }}" "$workflow_file"
grep -Fq 'vars.IB_GATEWAY_INSTANCE_NAME' "$workflow_file"
grep -Fq 'vars.IB_GATEWAY_ZONE' "$workflow_file"
grep -Fq 'vars.IB_GATEWAY_MODE' "$workflow_file"
Expand Down Expand Up @@ -64,6 +65,7 @@ grep -Fq 'elif [ "${DEPLOY_EVENT_NAME}" = "workflow_dispatch" ]; then' "$workflo
grep -Fq 'DEPLOY_MODE="${WORKFLOW_DISPATCH_MODE:-keepalive}"' "$workflow_file"
grep -Fq 'Scheduled keepalive mode: skip docker build' "$workflow_file"
grep -Fq 'reset_instance_and_wait_for_ssh()' "$workflow_file"
grep -Fq 'Manual workflow VM reset is disabled; failing closed.' "$workflow_file"
grep -Fq 'run_remote_ssh()' "$workflow_file"
grep -Fq 'copy_remote_file()' "$workflow_file"
grep -Fq 'git archive --format=tar.gz' "$workflow_file"
Expand Down
Loading