Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 2 deletions checks.tf
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,15 @@ check "zero_bypass_actors" {
assert {
condition = alltrue([
for name, gate in module.repository_policy.ruleset_enforcement :
length(gate.bypass_actors) == 0
length(gate.bypass_actors) == 0 || (
name == "velnor-new" &&
length(gate.bypass_actors) == 1 &&
one(gate.bypass_actors).actor_id == 5 &&
one(gate.bypass_actors).actor_type == "RepositoryRole" &&
one(gate.bypass_actors).bypass_mode == "pull_request"
)
])
error_message = "No repository may declare bypass actors on its protect-main ruleset."
error_message = "No repository may declare bypass actors on its protect-main ruleset, except the repository-admin pull_request bypass on tailrocks/velnor-new (owner approved 2026-11-19)."
}
}

Expand Down
12 changes: 11 additions & 1 deletion modules/repository-policy/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,19 @@ resource "github_repository_ruleset" "protect_main" {
}
}

# MANDATORY INVARIANT: Zero standing bypasses on core protections.
# MANDATORY INVARIANT: Zero standing bypasses on core protections,
# except the explicit admin_pull_request_bypass opt-in (pull_request mode only: no direct pushes).
# Direct pushes, non-squash integration, force pushes, and deletion are blocked for all actors.

dynamic "bypass_actors" {
for_each = var.repository_policies[each.value].admin_pull_request_bypass ? [1] : []
content {
actor_id = 5 # RepositoryRole: repository admin
actor_type = "RepositoryRole"
bypass_mode = "pull_request"
}
}

rules {
deletion = true
non_fast_forward = true
Expand Down
2 changes: 2 additions & 0 deletions modules/repository-policy/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ variable "repository_policies" {
include = list(string)
bypass_user_ids = list(number)
})), {})
# Let repository admins bypass protect-main, only through a pull request (admin merge).
admin_pull_request_bypass = optional(bool, false)
# Merge queue on the default branch. null (the default) leaves the queue off.
merge_queue = optional(object({
grouping_strategy = string
Expand Down
10 changes: 7 additions & 3 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ variable "repository_policies" {
include = list(string)
bypass_user_ids = list(number)
})), {})
# Let repository admins bypass protect-main, only through a pull request (admin merge).
admin_pull_request_bypass = optional(bool, false)
# Merge queue on the default branch. null (the default) leaves the queue off.
merge_queue = optional(object({
grouping_strategy = string
Expand Down Expand Up @@ -282,9 +284,11 @@ variable "repository_policies" {
required_checks = ["DCO", "Required"]
}
"velnor-new" = {
visibility = "public"
required_checks = ["Required", "Required verdict"]
protect_tags_update = true
visibility = "public"
required_checks = ["Required", "Required verdict"]
# Owner approved 2026-11-19: admin merges for rare critical-path cases.
admin_pull_request_bypass = true
protect_tags_update = true
# Batched queue (owner decision 2026-11-18): 13 runners fit about one full CI run,
# so only the newest entry of a group must pass and up to 10 PRs merge per run.
merge_queue = {
Expand Down