Skip to content

fix: re-enable pull_request rule, remove push_allowances - #188

Merged
omer-vishlitzky merged 1 commit into
osac-project:mainfrom
omer-vishlitzky:fix/pull-request-rule-with-auto-dismiss
Aug 12, 2026
Merged

fix: re-enable pull_request rule, remove push_allowances#188
omer-vishlitzky merged 1 commit into
osac-project:mainfrom
omer-vishlitzky:fix/pull-request-rule-with-auto-dismiss

Conversation

@omer-vishlitzky

@omer-vishlitzky omer-vishlitzky commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Summary

Dependencies

🤖 Generated with Claude Code

Summary by CodeRabbit

  • New Features

    • Added merge queue compatibility for repository status checks.
    • Pull requests processed through the merge queue now follow an explicit zero-approval review rule.
  • Changes

    • Updated repository access settings by removing legacy push-allowance restrictions from selected repositories.
    • All other repository configuration remains unchanged.

The pull_request ruleset rule blocks direct pushes to main. Previously
it also blocked on CodeRabbit CHANGES_REQUESTED reviews, but the
auto-queue workflow now auto-dismisses all CHANGES_REQUESTED reviews
on every PR event (osac-project/osac#279).

- Re-add pull_request rule to ruleset (conditional on merge_queue)
- Remove push_allowances from osac and osac-test-infra — classic branch
  protection restrict_pushes conflicts with the merge queue bot

Assisted-by: Claude Code <noreply@anthropic.com>
Signed-off-by: omer-vishlitzky <omer.vishlitzky@gmail.com>
@coderabbitai

coderabbitai Bot commented Aug 12, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: osac-project/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 7540974b-65b9-44a0-9290-a0c2c7e0aac3

📥 Commits

Reviewing files that changed from the base of the PR and between bf9e7a5 and e0b5d05.

📒 Files selected for processing (2)
  • modules/common_repository/main.tf
  • repositories.tf
💤 Files with no reviewable changes (1)
  • repositories.tf

Walkthrough

The ruleset conditionally adds a zero-approval pull-request rule when merge queues are enabled. The repo_osac and repo_osac_test_infra modules no longer define push allowances.

Changes

Merge queue protection

Layer / File(s) Summary
Conditional pull-request rule
modules/common_repository/main.tf
When var.merge_queue is configured, the status-check ruleset adds a pull_request rule that requires zero approving reviews.
Repository push allowance cleanup
repositories.tf
The repo_osac and repo_osac_test_infra modules no longer configure push allowances.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

Suggested reviewers: eliorerz, eranco74

🚥 Pre-merge checks | ✅ 11
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes both main changes in the pull request.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
No-Hardcoded-Secrets ✅ Passed The PR adds only ruleset logic and removes repository push allowances; scans found no API keys, tokens, passwords, private keys, credential URLs, or long encoded literals.
No-Weak-Crypto ✅ Passed The PR adds only GitHub ruleset logic and removes push allowances; the committed diff contains no MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, custom crypto, or secret comparisons.
No-Injection-Vectors ✅ Passed The verified diff adds only a Terraform pull_request ruleset block gated by var.merge_queue and removes push_allowances literals; it introduces no listed injection vector.
Container-Privileges ✅ Passed The diff changes only GitHub repository rules and module inputs. It adds no container/Kubernetes manifests or privileged settings such as privileged, hostPID, SYS_ADMIN, or allowPrivilegeEscalation.
No-Sensitive-Data-In-Logs ✅ Passed The diff adds only Terraform ruleset configuration and removes inputs; it introduces no logging, output, or sensitive-data emission.
Ai-Attribution ✅ Passed AI use is stated in the PR and HEAD; the PR commit includes an Assisted-by: Claude Code trailer, with no Generated-by or Co-Authored-By trailer.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@omer-vishlitzky
omer-vishlitzky merged commit 1685cbf into osac-project:main Aug 12, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant