Skip to content

fix(applier): drop the GNU-only grep -P, and name the credential the cure needs #1029

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
hyperpolymath merged 1 commit into from
Sep 22, 2026
Merged

fix(applier): drop the GNU-only grep -P, and name the credential the cure needs #1029

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
10 changes: 6 additions & 4 deletions scripts/apply-branch-gates.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,16 +349,18 @@ while IFS= read -r R; do
|| { emit "$R" "UNKNOWN" "rulesets GET failed"; continue; }
jq -r '.[]|select(.target=="branch" and .enforcement=="active")
|[(.source_type // "MISSING"), (.id|tostring)]|@tsv' "$WORK/rs.json" > "$WORK/active"
command grep -P '^Repository\t' "$WORK/active" | cut -f2 > "$WORK/ids"
command grep -vP '^(Repository|MISSING)\t' "$WORK/active" | cut -f2 > "$WORK/inherited"
NMISS=$(command grep -cP '^MISSING\t' "$WORK/active" || true)
# awk, not grep -P: -P is a GNU extension and this script must not depend on
# which grep the runner ships.
awk -F'\t' '$1=="Repository"{print $2}' "$WORK/active" > "$WORK/ids"
awk -F'\t' '$1!="Repository" && $1!="MISSING"{print $2}' "$WORK/active" > "$WORK/inherited"
NMISS=$(awk -F'\t' '$1=="MISSING"{c++} END{print c+0}' "$WORK/active")
NIDS=$(wc -l < "$WORK/ids")
NINH=$(wc -l < "$WORK/inherited")

# An absent discriminator REFUSES; it never defaults to the writable arm.
[ "${NMISS:-0}" -gt 0 ] && { emit "$R" "UNKNOWN" "$DETAIL — $NMISS active branch ruleset(s) carry no .source_type; cannot tell repo-level from org-inherited, refusing to guess"; continue; }
if [ "$NIDS" -eq 0 ] && [ "$NINH" -gt 0 ]; then
emit "$R" "ORG-INHERITED" "$DETAIL — the only active branch ruleset(s) here are org-level ($(paste -sd, "$WORK/inherited")); writable ONLY at /orgs/{org}/rulesets/{id}, cured once at the org, never per repo"
emit "$R" "ORG-INHERITED" "$DETAIL — the only active branch ruleset(s) here are org-level ($(paste -sd, "$WORK/inherited")); writable ONLY at /orgs/{org}/rulesets/{id} with an admin:org credential (a repo token reads it and cannot write it), cured once at the org, never per repo"
continue
fi
[ "$NIDS" -eq 0 ] && { emit "$R" "NORULESET" "$DETAIL — no active branch ruleset; this script never creates one"; continue; }
Expand Down
2 changes: 1 addition & 1 deletion scripts/tests/branch-gates-apply-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ S=$(state_of "$OUT")
# ---- MUTANT F: delete the source_type filter, restoring the original defect. --
# The pre-fix line selected every active branch ruleset regardless of ownership.
MUTF="$WORK/mutant-f.sh"
sed 's|^ command grep -P .\^Repository.*> "\$WORK/ids"$| cut -f2 "$WORK/active" > "$WORK/ids"|' "$APPLIER" > "$MUTF"
sed 's|^ awk -F.\\t. ..1=="Repository".*> "\$WORK/ids"$| cut -f2 "$WORK/active" > "$WORK/ids"|' "$APPLIER" > "$MUTF"
chmod +x "$MUTF"
if ! cmp -s "$MUTF" "$APPLIER" && bash -n "$MUTF" 2>/dev/null; then
reset_fix
Expand Down
Loading