Implement sync of "PR required" property

rust-lang · Sep 27, 2024 · e9d3dcb · e9d3dcb
1 parent f235bd8
commit e9d3dcb
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/github/api/mod.rs b/src/github/api/mod.rs
@@ -338,6 +338,7 @@ pub(crate) struct BranchProtection {
     pub(crate) required_status_check_contexts: Vec<String>,
     #[serde(deserialize_with = "allowances")]
     pub(crate) push_allowances: Vec<PushAllowanceActor>,
+    pub(crate) requires_approving_reviews: bool,
 }
 
 fn nullable<'de, D, T>(deserializer: D) -> Result<T, D::Error>

diff --git a/src/github/api/write.rs b/src/github/api/write.rs
@@ -409,6 +409,8 @@ impl GitHubWrite {
             dismiss_stale: bool,
             review_count: u8,
             restricts_pushes: bool,
+            // Is a PR required to push into this branch?
+            requires_approving_reviews: bool,
             push_actor_ids: &'a [String],
         }
         let mutation_name = match op {
@@ -424,7 +426,7 @@ impl GitHubWrite {
             BranchProtectionOp::UpdateBranchProtection(id) => id,
         };
         let query = format!("
-        mutation($id: ID!, $pattern:String!, $contexts: [String!], $dismissStale: Boolean, $reviewCount: Int, $pushActorIds: [ID!], $restrictsPushes: Boolean) {{
+        mutation($id: ID!, $pattern:String!, $contexts: [String!], $dismissStale: Boolean, $reviewCount: Int, $pushActorIds: [ID!], $restrictsPushes: Boolean, $requiresApprovingReviews: Boolean) {{
             {mutation_name}(input: {{
                 {id_field}: $id, 
                 pattern: $pattern, 
@@ -433,7 +435,7 @@ impl GitHubWrite {
                 isAdminEnforced: true, 
                 requiredApprovingReviewCount: $reviewCount, 
                 dismissesStaleReviews: $dismissStale, 
-                requiresApprovingReviews:true,
+                requiresApprovingReviews: $requiresApprovingReviews,
                 restrictsPushes: $restrictsPushes,
                 pushActorIds: $pushActorIds
             }}) {{
@@ -470,6 +472,7 @@ impl GitHubWrite {
                     // to merge *or* we only allow those in `push_actor_ids`)
                     restricts_pushes: !push_actor_ids.is_empty(),
                     push_actor_ids: &push_actor_ids,
+                    requires_approving_reviews: branch_protection.requires_approving_reviews,
                 },
             )?;
         }

diff --git a/src/github/mod.rs b/src/github/mod.rs
@@ -5,7 +5,7 @@ mod tests;
 use self::api::{BranchProtectionOp, TeamPrivacy, TeamRole};
 use crate::github::api::{GithubRead, Login, PushAllowanceActor, RepoPermission, RepoSettings};
 use log::debug;
-use rust_team_data::v1::Bot;
+use rust_team_data::v1::{Bot, BranchProtectionMode};
 use std::collections::{HashMap, HashSet};
 use std::fmt::{Display, Formatter, Write};
 
@@ -606,10 +606,14 @@ fn construct_branch_protection(
     let required_approving_review_count: u8 = if uses_bors {
         0
     } else {
-        branch_protection
-            .required_approvals
-            .try_into()
-            .expect("Too large required approval count")
+        match branch_protection.mode {
+            BranchProtectionMode::PrRequired {
+                required_approvals, ..
+            } => required_approvals
+                .try_into()
+                .expect("Too large required approval count"),
+            BranchProtectionMode::PrNotRequired => 0,
+        }
     };
     let mut push_allowances: Vec<PushAllowanceActor> = branch_protection
         .allowed_merge_teams
@@ -634,8 +638,17 @@ fn construct_branch_protection(
         is_admin_enforced: true,
         dismisses_stale_reviews: branch_protection.dismiss_stale_review,
         required_approving_review_count,
-        required_status_check_contexts: branch_protection.ci_checks.clone(),
+        required_status_check_contexts: match &branch_protection.mode {
+            BranchProtectionMode::PrRequired { ci_checks, .. } => ci_checks.clone(),
+            BranchProtectionMode::PrNotRequired => {
+                vec![]
+            }
+        },
         push_allowances,
+        requires_approving_reviews: matches!(
+            branch_protection.mode,
+            BranchProtectionMode::PrRequired { .. }
+        ),
     }
 }