use rulesets by default

Author: marcoieni

config.toml

@@ -83,89 +83,6 @@ members-without-zulip-id = [
     "rust-timer",
 ]
 
-enable-rulesets-repos = [
-   "rust-analyzer/expect-test",
-   "rust-lang-nursery/rust-toolstate",
-   "rust-lang/annotate-snippets-rs",
-   "rust-lang/arewewebyet",
-   "rust-lang/async-fundamentals-initiative",
-   "rust-lang/backtrace-rs",
-   "rust-lang/beyond-refs",
-   "rust-lang/blog.rust-lang.org",
-   "rust-lang/book",
-   "rust-lang/bors",
-   "rust-lang/calendar-generation",
-   "rust-lang/calendar",
-   "rust-lang/cargo-bisect-rustc",
-   "rust-lang/cargo",
-   "rust-lang/cc-rs",
-   "rust-lang/ci-mirrors",
-   "rust-lang/cmake-rs",
-   "rust-lang/compiler-builtins",
-   "rust-lang/compiler-team",
-   "rust-lang/crater",
-   "rust-lang/crates_io_og_image",
-   "rust-lang/crates-build-env",
-   "rust-lang/crates-io-auth-action",
-   "rust-lang/crates.io",
-   "rust-lang/crates.io-index-archive",
-   "rust-lang/crates.io-index",
-   "rust-lang/docs.rs",
-   "rust-lang/edition-guide",
-   "rust-lang/ena",
-   "rust-lang/enzyme",
-   "rust-lang/flate2-rs",
-   "rust-lang/fls",
-   "rust-lang/futures-rs",
-   "rust-lang/gha-self-hosted",
-   "rust-lang/git2-rs",
-   "rust-lang/gll",
-   "rust-lang/glob",
-   "rust-lang/hashbrown",
-   "rust-lang/impl-trait-utils",
-   "rust-lang/infra-smoke-tests",
-   "rust-lang/josh-sync",
-   "rust-lang/leadership-council",
-   "rust-lang/libc",
-   "rust-lang/llvm-project",
-   "rust-lang/mdBook",
-   "rust-lang/measureme",
-   "rust-lang/miri",
-   "rust-lang/miri-test-libstd",
-   "rust-lang/nomicon",
-   "rust-lang/odht",
-   "rust-lang/portable-simd",
-   "rust-lang/project-stable-mir",
-   "rust-lang/project-exploit-mitigations",
-   "rust-lang/promote-release",
-   "rust-lang/reference",
-   "rust-lang/relnotes",
-   "rust-lang/rfcs",
-   "rust-lang/rust-analyzer",
-   "rust-lang/rust-bindgen",
-   "rust-lang/rust-clippy",
-   "rust-lang/rust-forge",
-   "rust-lang/rust-log-analyzer",
-   "rust-lang/rust-playground",
-   "rust-lang/rustc_codegen_c",
-   "rust-lang/rustc_codegen_gcc",
-   "rust-lang/rustc-demangle",
-   "rust-lang/rustc-dev-guide",
-   "rust-lang/rustc-hash",
-   "rust-lang/rustc-perf",
-   "rust-lang/rustc-stable-hash",
-   "rust-lang/rustfmt",
-   "rust-lang/rustup",
-   "rust-lang/simpleinfra",
-   "rust-lang/socket2",
-   "rust-lang/staging.crates.io-index",
-   "rust-lang/std-dev-guide",
-   "rust-lang/stdarch",
-   "rust-lang/team",
-   "rust-lang/this-week-in-rust",
-   "rust-lang/thorin",
-   "rust-lang/triagebot",
-   "rust-lang/wg-async",
-   "rust-lang/wg-macros",
-   "rust-lang/www.rust-lang.org",
+disable-rulesets-repos = [
+    "rust-lang/rust",
 ]

src/data.rs

@@ -242,7 +242,7 @@ impl Data {
         Ok(sync::Config {
             special_org_members,
             independent_github_orgs: self.config.independent_github_orgs().clone(),
-            enable_rulesets_repos: self.config.enable_rulesets_repos().clone(),
+            disable_rulesets_repos: self.config.disable_rulesets_repos().clone(),
         })
     }
 }

src/schema.rs

@@ -17,7 +17,7 @@ pub(crate) struct Config {
     special_org_members: BTreeSet<String>,
     members_without_zulip_id: BTreeSet<String>,
     #[serde(default)]
-    enable_rulesets_repos: BTreeSet<String>,
+    disable_rulesets_repos: BTreeSet<String>,
 }
 
 impl Config {
@@ -49,8 +49,8 @@ impl Config {
         &self.members_without_zulip_id
     }
 
-    pub(crate) fn enable_rulesets_repos(&self) -> &BTreeSet<String> {
-        &self.enable_rulesets_repos
+    pub(crate) fn disable_rulesets_repos(&self) -> &BTreeSet<String> {
+        &self.disable_rulesets_repos
     }
 }
 

src/sync/github/api/mod.rs

@@ -414,7 +414,7 @@ where
 }
 
 /// An object with a `login` field
-#[derive(Deserialize, Debug, Clone, PartialEq, Eq)]
+#[derive(Deserialize, Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) struct Login {
     pub(crate) login: String,
 }
@@ -456,7 +456,7 @@ fn team_node_id(id: u64) -> String {
     BASE64_STANDARD.encode(format!("04:Team{id}"))
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, serde::Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct BranchProtection {
     pub(crate) pattern: String,
@@ -501,7 +501,7 @@ where
 }
 
 /// Entities that can be allowed to push to a branch in a repo
-#[derive(Clone, Deserialize, Debug, PartialEq, Eq)]
+#[derive(Clone, Deserialize, Debug, PartialEq, Eq, PartialOrd, Ord)]
 #[serde(untagged)]
 pub(crate) enum PushAllowanceActor {
     User(UserPushAllowanceActor),
@@ -510,20 +510,20 @@ pub(crate) enum PushAllowanceActor {
 }
 
 /// User who can be allowed to push to a branch in a repo
-#[derive(Clone, Deserialize, Debug, PartialEq, Eq)]
+#[derive(Clone, Deserialize, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) struct UserPushAllowanceActor {
     pub(crate) login: String,
 }
 
 /// Team that can be allowed to push to a branch in a repo
-#[derive(Clone, Deserialize, Debug, PartialEq, Eq)]
+#[derive(Clone, Deserialize, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) struct TeamPushAllowanceActor {
     pub(crate) organization: Login,
     pub(crate) name: String,
 }
 
 /// GitHub app that can be allowed to push to a branch in a repo
-#[derive(Clone, Deserialize, Debug, PartialEq, Eq)]
+#[derive(Clone, Deserialize, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) struct AppPushAllowanceActor {
     pub(crate) name: String,
     /// Node ID, which can be used as a push actor ID

src/sync/github/mod.rs

@@ -444,7 +444,7 @@ impl SyncGitHub {
     /// Check if a repository should use rulesets instead of branch protections
     fn should_use_rulesets(&self, repo: &rust_team_data::v1::Repo) -> bool {
         let repo_full_name = format!("{}/{}", repo.org, repo.name);
-        self.config.enable_rulesets_repos.contains(&repo_full_name)
+        !self.config.disable_rulesets_repos.contains(&repo_full_name)
     }
 
     async fn diff_repo(
@@ -609,15 +609,15 @@ impl SyncGitHub {
         &self,
         actual_repo: &api::Repo,
         expected_repo: &rust_team_data::v1::Repo,
-    ) -> anyhow::Result<Vec<BranchProtectionDiff>> {
+    ) -> anyhow::Result<BTreeSet<BranchProtectionDiff>> {
         // The rust-lang/rust repository uses GitHub apps push allowance actors for its branch
         // protections, which cannot be read without a PAT.
         // To avoid errors, we simply return an empty diff here.
         if !self.github.uses_pat() && actual_repo.org == "rust-lang" && actual_repo.name == "rust" {
-            return Ok(vec![]);
+            return Ok(BTreeSet::new());
         }
 
-        let mut branch_protection_diffs = Vec::new();
+        let mut branch_protection_diffs = BTreeSet::new();
         let mut actual_protections = self
             .github
             .branch_protections(&actual_repo.org, &actual_repo.name)
@@ -668,10 +668,10 @@ impl SyncGitHub {
                     Some(_) => continue,
                 }
             };
-            branch_protection_diffs.push(BranchProtectionDiff {
+            branch_protection_diffs.insert(BranchProtectionDiff {
                 pattern: branch_protection.pattern.clone(),
                 operation,
-            })
+            });
         }
 
         // `actual_branch_protections` now contains the branch protections that were not expected
@@ -1569,7 +1569,7 @@ struct UpdateRepoDiff {
     // old, new
     settings_diff: (RepoSettings, RepoSettings),
     permission_diffs: Vec<RepoPermissionAssignmentDiff>,
-    branch_protection_diffs: Vec<BranchProtectionDiff>,
+    branch_protection_diffs: BTreeSet<BranchProtectionDiff>,
     ruleset_diffs: Vec<RulesetDiff>,
     environment_diffs: Vec<EnvironmentDiff>,
     app_installation_diffs: Vec<AppInstallationDiff>,
@@ -1898,7 +1898,7 @@ enum RepoCollaborator {
     User(String),
 }
 
-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
 struct BranchProtectionDiff {
     pattern: String,
     operation: BranchProtectionDiffOperation,
@@ -2452,7 +2452,7 @@ fn log_ruleset(
     Ok(())
 }
 
-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
 enum BranchProtectionDiffOperation {
     Create(api::BranchProtection),
     Update(String, api::BranchProtection, api::BranchProtection),