* ci(bazel): auto-push `make bazel-sync` fixes to PR branches bazel.yml's BUILD sync step now writes the BUILD.bazel / MODULE.bazel / MODULE.bazel.lock part of its drift as the bazel-sync-patch artifact (scripts/ci/bazel-sync-patch.sh) and still fails. The new bazel-autofix.yml workflow_run job (on "Bazel" and "PR") applies it with scripts/bazel-autofix-push.sh: a sync commit on same-repo PR branches, an idempotent apply-recipe comment on fork PRs. Same security model as docs-autofix: the write-permission side never checks out or runs PR code, extracts only the two expected regular files, and refuses any patch naming a path outside an anchored allowlist (no hidden or `..` segments, nothing under third_party/) or carrying a mode change, symlink, rename or binary hunk; `git apply --index` and a post-apply check back that up. Reuses the DOCS_AUTOFIX_TOKEN secret for the push. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * build(bazel): add bazel_autofix_push_test.go to scripts_test `make bazel-sync` output, produced by scripts/ci/bazel-sync-patch.sh and applied with scripts/bazel-autofix-push.sh as an end-to-end exercise of the new autofix path. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(ci): harden the bazel and docs autofix push scripts Addresses the security review of the autofix pipeline, identically in scripts/bazel-autofix-push.sh and scripts/docs-autofix-push.sh (the security-critical functions are now shared verbatim): - validate_patch refuses ANY "rename "/"copy " header (the legacy "rename old/new" form slipped past and, on docs-autofix, pushed a scripts.sh -> docs/cli-reference/x.md rename), checks every "index " line whatever its ids, takes creations/deletions/renames from `git apply --summary`, and reads names from `--numstat -z` (which names only the NEW path of a rename; the old comment was wrong). - docs-autofix gains the post-apply staged re-check and a --check mode. - The patch is applied to an index in a bare clone (read-tree + apply --cached + commit-tree): the PR tree never touches the disk. All git calls run with core.hooksPath=/dev/null, GIT_LFS_SKIP_SMUDGE=1. - Push is leased: --force-with-lease=refs/heads/$HEAD_BRANCH:$HEAD_SHA. - The PR must target this repo, and the head branch must be neither protected nor under a ruleset per the GitHub API (fail closed), on top of the name list. - Only a marker comment written by github-actions[bot] is ever edited. - bazel-autofix only pushes files in packages the PR changed (merge-base..head, computed from fetched refs), MODULE files only when go.mod/go.sum/MODULE changed; base-branch drift is left alone and listed, and a patch with nothing attributable gets a comment only. Tests cover each reviewer attack for both scripts (--check and the full flow against a local bare remote and fake gh), the staged check alone with the validator disabled, spoofed comments, protection/ruleset/API errors, the lease, main drift, and symlinked PR trees. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(ci): trigger bazel-autofix on Bazel only; share job-level concurrency - bazel-autofix.yml triggers only on "Bazel": pr.yml never calls bazel.yml, so "PR" runs never carry the artifact, and their completions cancelled real fixes through the workflow-level group. The policy test now requires the triggering workflow to run on pull_request and upload the consumed artifact instead of asserting the false claim. - Both autofix workflows use one job-level concurrency group per head branch (autofix-<head repo>-<head branch>) without cancel-in-progress: skipped runs take no part, and the two bots queue instead of racing. - Base checkouts use persist-credentials: false; docs-autofix extracts only cli-docs-freshness.patch, as a regular file, outside the workspace. - Policy tests for the trigger, concurrency scope, checkout, and the scripts' shared guards (rename/index checks, comment author, lease, protection lookup, index-only apply, hook-free git). Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(ci): tighten autofix attribution, circuit breaker and PR selection Re-review follow-ups for the bazel and docs autofix push scripts: - Root package: paths outside any Bazel package (docs/, .github/, README.md, ...) no longer count as changing //:. Only root-level Go and build inputs (*.go, *.s, *.c, *.h, *.bzl, go.mod, go.sum, BUILD.bazel, MODULE.bazel*) make root BUILD.bazel drift the PR's, so main's root drift is not pushed onto a docs-only PR. - Circuit breaker: the head subject is read from the fetched commit (no API), a failed read counts as non-convergent, and the check runs only once the PR's own staged fix is non-empty. A bot head whose remaining drift is main's now gets the "files this PR did not change" comment instead of a wrong "did not converge" one. Same in docs-autofix. - PR selection: several open PRs can share one head branch. bazel picks the one whose number matches the artifact metadata (among PRs already matching head repo/branch/base repo; head sha still verified); without a unique match both scripts skip instead of taking .[0]. - The privileged clone fetches only the head (and, for bazel, base) branch into an init'ed bare partial repo instead of cloning every branch. - docs-autofix job gets timeout-minutes: 10 (it shares a non-cancelling concurrency group with bazel-autofix). Tests: docs-only/README/workflow/Makefile PRs with root drift get no push, a root Go change gets root BUILD.bazel; breaker cases (bot head with own vs main drift, unreadable subject) for both scripts; PR selection by metadata and ambiguity; HEAD_SHA 40-hex guard; staged-check mode arm; a --summary-only validator copy; both workflows' download steps run as written against a fake gh (run-scoped artifact listing, only the named files extracted, symlinked entries refused); timeout asserted for both jobs. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(ci): bazel-autofix requires bash 4; skip its tests on macOS bash 3.2 Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * test(ci): skip every autofix script test on bash < 4 Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * build(bazel): sync internal/utils BUILD with main Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Gas City Adopt-PR <adopt-pr@gascity.local> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
73 lines
2.4 KiB
Bash
Executable file
73 lines
2.4 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# bazel-sync-patch.sh - capture the drift `make bazel-sync` left in the
|
|
# checkout as an apply-ready patch for the bazel-autofix workflow.
|
|
#
|
|
# Usage: scripts/ci/bazel-sync-patch.sh <out-dir>
|
|
#
|
|
# Writes <out-dir>/bazel-sync.patch (`git diff --binary`, new files included)
|
|
# restricted to the paths the privileged consumer accepts, plus
|
|
# <out-dir>/bazel-sync-meta.txt (PR number and head SHA from PR_NUMBER and
|
|
# PR_HEAD_SHA when set). Drift outside the allowlist (third_party/patches,
|
|
# go.mod, ...) is listed but never patched: a human has to look at it.
|
|
#
|
|
# The allowlist mirrors path_allowed() in scripts/bazel-autofix-push.sh, which
|
|
# re-validates everything; that copy runs from the base branch and is the one
|
|
# that counts (scripts/ci_workflow_test.go keeps the two regexes identical).
|
|
# The working tree and the real index are left as they are.
|
|
|
|
set -euo pipefail
|
|
export LC_ALL=C
|
|
|
|
out="${1:?usage: bazel-sync-patch.sh <out-dir>}"
|
|
mkdir -p "$out"
|
|
patch="$out/bazel-sync.patch"
|
|
meta="$out/bazel-sync-meta.txt"
|
|
|
|
BUILD_FILE_RE='^([A-Za-z0-9_+-][A-Za-z0-9_.+-]*/)*BUILD\.bazel$'
|
|
|
|
path_allowed() {
|
|
case "$1" in
|
|
MODULE.bazel | MODULE.bazel.lock) return 0 ;;
|
|
third_party/*) return 1 ;;
|
|
esac
|
|
[[ "$1" =~ $BUILD_FILE_RE ]]
|
|
}
|
|
|
|
# Stage everything in a throwaway index so new BUILD files (untracked) land
|
|
# in the diff without touching the checkout's own index.
|
|
index="$(mktemp)"
|
|
trap 'rm -f "$index"' EXIT
|
|
cp "$(git rev-parse --git-path index)" "$index"
|
|
GIT_INDEX_FILE="$index" git add -A -- .
|
|
|
|
allowed=()
|
|
rejected=()
|
|
while IFS= read -r path; do
|
|
[ -n "$path" ] || continue
|
|
if path_allowed "$path"; then
|
|
allowed+=("$path")
|
|
else
|
|
rejected+=("$path")
|
|
fi
|
|
done < <(GIT_INDEX_FILE="$index" git -c core.quotePath=true diff --cached --no-renames --name-only)
|
|
|
|
if [ "${#rejected[@]}" -gt 0 ]; then
|
|
echo "Drift outside the autofix allowlist (fix by hand, not patched):"
|
|
printf ' %s\n' "${rejected[@]}"
|
|
fi
|
|
|
|
if [ "${#allowed[@]}" -eq 0 ]; then
|
|
echo "No auto-fixable BUILD/MODULE drift; no patch written."
|
|
rm -f "$patch" "$meta"
|
|
exit 0
|
|
fi
|
|
|
|
GIT_INDEX_FILE="$index" git diff --cached --binary --no-renames -- "${allowed[@]}" > "$patch"
|
|
{
|
|
echo "pr=${PR_NUMBER:-}"
|
|
echo "head_sha=${PR_HEAD_SHA:-}"
|
|
echo "checkout_sha=$(git rev-parse HEAD)"
|
|
} > "$meta"
|
|
|
|
echo "Wrote $patch (${#allowed[@]} file(s)):"
|
|
printf ' %s\n' "${allowed[@]}"
|