Merge pull request #983 from Turbo87/crates-io-discord-bot

crates-io: Remove obsolete `crates-io-ops-bot.staging-crates-io` permission

Author: rylev

config.toml

@@ -46,8 +46,3 @@ permissions-bools = [
     "dev-desktop",
     "sync-team-confirmation",
 ]
-
-permissions-crates-io-ops-bot-apps = [
-    "crates-io",
-    "staging-crates-io",
-]

src/permissions.rs

@@ -27,8 +27,6 @@ impl BorsAcl {
 pub(crate) struct Permissions {
     #[serde(default)]
     bors: HashMap<String, BorsAcl>,
-    #[serde(default)]
-    crates_io_ops_bot: HashMap<String, bool>,
     #[serde(flatten)]
     booleans: HashMap<String, bool>,
 }
@@ -52,19 +50,6 @@ impl Permissions {
             result.push(format!("bors.{}.review", repo));
             result.push(format!("bors.{}.try", repo));
         }
-        for app in config.permissions_crates_io_ops_bot_apps() {
-            result.push(format!("crates-io-ops-bot.{}", app));
-        }
-
-        result
-    }
-
-    pub(crate) fn requires_discord(config: &Config) -> Vec<String> {
-        let mut result = Vec::new();
-
-        for app in config.permissions_crates_io_ops_bot_apps() {
-            result.push(format!("crates-io-ops-bot.{}", app));
-        }
 
         result
     }
@@ -78,7 +63,6 @@ impl Permissions {
             [boolean] => self.booleans.get(*boolean).cloned(),
             ["bors", repo, "review"] => self.bors.get(*repo).map(|repo| repo.review),
             ["bors", repo, "try"] => self.bors.get(*repo).map(|repo| repo.try_),
-            ["crates-io-ops-bot", app] => self.crates_io_ops_bot.get(*app).cloned(),
             _ => None,
         }
         .unwrap_or(false)
@@ -103,11 +87,6 @@ impl Permissions {
                 return true;
             }
         }
-        for app in self.crates_io_ops_bot.values() {
-            if *app {
-                return true;
-            }
-        }
         false
     }
 
@@ -136,14 +115,6 @@ impl Permissions {
                 );
             }
         }
-        for app in self.crates_io_ops_bot.keys() {
-            if !config.permissions_crates_io_ops_bot_apps().contains(app) {
-                bail!(
-                    "unknown crates-io-ops-bot app: {} (maybe add it to config.toml?)",
-                    app
-                );
-            }
-        }
         Ok(())
     }
 }

src/schema.rs

@@ -10,7 +10,6 @@ pub(crate) struct Config {
     allowed_github_orgs: HashSet<String>,
     permissions_bors_repos: HashSet<String>,
     permissions_bools: HashSet<String>,
-    permissions_crates_io_ops_bot_apps: HashSet<String>,
 }
 
 impl Config {
@@ -29,10 +28,6 @@ impl Config {
     pub(crate) fn permissions_bools(&self) -> &HashSet<String> {
         &self.permissions_bools
     }
-
-    pub(crate) fn permissions_crates_io_ops_bot_apps(&self) -> &HashSet<String> {
-        &self.permissions_crates_io_ops_bot_apps
-    }
 }
 
 // This is an enum to allow two kinds of values for the email field:

src/validate.rs

@@ -37,7 +37,6 @@ static CHECKS: &[Check<fn(&Data, &mut Vec<String>)>] = checks![
     validate_rfcbot_exclude_members,
     validate_team_names,
     validate_github_teams,
-    validate_discord_permissions,
     validate_zulip_stream_name,
     validate_project_groups_have_parent_teams,
     validate_discord_team_members_have_discord_ids,
@@ -518,46 +517,6 @@ fn validate_github_usernames(data: &Data, github: &GitHubApi, errors: &mut Vec<S
     }
 }
 
-/// Ensure all users with a Discord permission have a Discord ID.
-fn validate_discord_permissions(data: &Data, errors: &mut Vec<String>) {
-    wrapper(
-        Permissions::requires_discord(data.config()).iter(),
-        errors,
-        |permission, errors| {
-            wrapper(data.people(), errors, |person, _| {
-                if person.permissions().has(permission) && person.discord_id().is_none() {
-                    bail!(
-                        "person `{}` has a Discord permission (`{}`) but no Discord ID",
-                        person.github(),
-                        permission
-                    );
-                }
-                Ok(())
-            });
-            wrapper(data.teams(), errors, |team, errors| {
-                if !team.permissions().has(permission) {
-                    return Ok(());
-                }
-                wrapper(team.members(data).iter(), errors, |member, _| {
-                    let person = data
-                        .person(member)
-                        .ok_or_else(|| failure::format_err!("missing person {}", member))?;
-                    if person.discord_id().is_none() {
-                        bail!(
-                            "person `{}` has a Discord permission (`{}`) but no Discord ID",
-                            person.github(),
-                            permission
-                        );
-                    }
-                    Ok(())
-                });
-                Ok(())
-            });
-            Ok(())
-        },
-    );
-}
-
 /// Ensure the user doens't put an URL as the Zulip stream name.
 fn validate_zulip_stream_name(data: &Data, errors: &mut Vec<String>) {
     wrapper(data.teams(), errors, |team, _| {

teams/crates-io.toml

@@ -27,7 +27,6 @@ alumni = [
 
 [permissions]
 bors.crates-io.review = true
-crates-io-ops-bot.staging-crates-io = true
 
 [[github]]
 orgs = ["rust-lang", "conduit-rust"]

tests/static-api/_expected/v1/permissions/crates_io_ops_bot.app.json

@@ -14,8 +14,3 @@ permissions-bors-repos = [
 permissions-bools = [
     "crater",
 ]
-
-permissions-crates-io-ops-bot-apps = [
-    "app",
-    "crates-io",
-]

tests/static-api/_expected/v1/permissions/crates_io_ops_bot.crates_io.json

@@ -9,4 +9,3 @@ zulip-id = 2
 crater = true
 bors.crates-io.review = true
 bors.crater.try = true
-crates-io-ops-bot.crates-io = true

tests/static-api/config.toml

@@ -8,7 +8,6 @@ members = ["user-0", "user-1"]
 crater = true
 bors.crates-io.review = true
 bors.crater.try = true
-crates-io-ops-bot.crates-io = true
 
 [rfcbot]
 label = "T-foo"