Merge pull request #128 from rust-lang/remove-ability-to-sync-github-apps

remove ability to sync GitHub apps

Author: marcoieni

sync-team/src/github/api/mod.rs

@@ -261,23 +261,9 @@ impl fmt::Display for RepoPermission {
     }
 }
 
-#[derive(serde::Deserialize, Debug)]
-pub(crate) struct OrgAppInstallation {
-    #[serde(rename = "id")]
-    pub(crate) installation_id: u64,
-    pub(crate) app_id: u64,
-}
-
-#[derive(serde::Deserialize, Debug)]
-pub(crate) struct RepoAppInstallation {
-    pub(crate) name: String,
-}
-
 #[derive(serde::Deserialize, Debug, Clone)]
 pub(crate) struct Repo {
     pub(crate) node_id: String,
-    #[serde(rename = "id")]
-    pub(crate) repo_id: u64,
     pub(crate) name: String,
     #[serde(alias = "owner", deserialize_with = "repo_owner")]
     pub(crate) org: String,

sync-team/src/github/api/read.rs

@@ -1,9 +1,7 @@
 use crate::github::api::{
-    BranchProtection, GraphNode, GraphNodes, GraphPageInfo, HttpClient, Login, OrgAppInstallation,
-    Repo, RepoAppInstallation, RepoTeam, RepoUser, Team, TeamMember, TeamRole, team_node_id,
-    url::GitHubUrl, user_node_id,
+    BranchProtection, GraphNode, GraphNodes, GraphPageInfo, HttpClient, Login, Repo, RepoTeam,
+    RepoUser, Team, TeamMember, TeamRole, team_node_id, url::GitHubUrl, user_node_id,
 };
-use anyhow::Context;
 use reqwest::Method;
 use std::collections::{HashMap, HashSet};
 
@@ -14,16 +12,6 @@ pub(crate) trait GithubRead {
     /// Get the owners of an org
     fn org_owners(&self, org: &str) -> anyhow::Result<HashSet<u64>>;
 
-    /// Get the app installations of an org
-    fn org_app_installations(&self, org: &str) -> anyhow::Result<Vec<OrgAppInstallation>>;
-
-    /// Get the repositories enabled for an app installation.
-    fn app_installation_repos(
-        &self,
-        installation_id: u64,
-        org: &str,
-    ) -> anyhow::Result<Vec<RepoAppInstallation>>;
-
     /// Get all teams associated with a org
     ///
     /// Returns a list of tuples of team name and slug
@@ -124,56 +112,6 @@ impl GithubRead for GitHubApiRead {
         Ok(owners)
     }
 
-    fn org_app_installations(&self, org: &str) -> anyhow::Result<Vec<OrgAppInstallation>> {
-        #[derive(serde::Deserialize, Debug)]
-        struct InstallationPage {
-            installations: Vec<OrgAppInstallation>,
-        }
-
-        let mut installations = Vec::new();
-        self.client.rest_paginated(
-            &Method::GET,
-            &GitHubUrl::orgs(org, "installations")?,
-            |response: InstallationPage| {
-                installations.extend(response.installations);
-                Ok(())
-            },
-        )?;
-        Ok(installations)
-    }
-
-    fn app_installation_repos(
-        &self,
-        installation_id: u64,
-        org: &str,
-    ) -> anyhow::Result<Vec<RepoAppInstallation>> {
-        #[derive(serde::Deserialize, Debug)]
-        struct InstallationPage {
-            repositories: Vec<RepoAppInstallation>,
-        }
-
-        let mut installations = Vec::new();
-        let url = if self.client.github_tokens.is_pat() {
-            // we are using a PAT
-            format!("user/installations/{installation_id}/repositories")
-        } else {
-            // we are using a GitHub App
-            "installation/repositories".to_string()
-        };
-
-        self.client
-            .rest_paginated(
-                &Method::GET,
-                &GitHubUrl::new(&url, org),
-                |response: InstallationPage| {
-                    installations.extend(response.repositories);
-                    Ok(())
-                },
-            )
-            .with_context(|| format!("failed to send rest paginated request to {url}"))?;
-        Ok(installations)
-    }
-
     fn org_teams(&self, org: &str) -> anyhow::Result<Vec<(String, String)>> {
         let mut teams = Vec::new();
 
@@ -308,7 +246,6 @@ impl GithubRead for GitHubApiRead {
             query($owner: String!, $name: String!) {
                 repository(owner: $owner, name: $name) {
                     id
-                    databaseId
                     autoMergeAllowed
                     description
                     homepageUrl
@@ -328,7 +265,6 @@ impl GithubRead for GitHubApiRead {
             // Equivalent of `node_id` of the Rest API
             id: String,
             // Equivalent of `id` of the Rest API
-            database_id: u64,
             auto_merge_allowed: Option<bool>,
             description: Option<String>,
             homepage_url: Option<String>,
@@ -345,7 +281,6 @@ impl GithubRead for GitHubApiRead {
         )?;
 
         let repo = result.repository.map(|repo_response| Repo {
-            repo_id: repo_response.database_id,
             node_id: repo_response.id,
             name: repo.to_string(),
             description: repo_response.description.unwrap_or_default(),

sync-team/src/github/api/tokens.rs

@@ -46,10 +46,6 @@ impl GitHubTokens {
             GitHubTokens::Pat(pat) => Ok(pat),
         }
     }
-
-    pub fn is_pat(&self) -> bool {
-        matches!(self, GitHubTokens::Pat(_))
-    }
 }
 
 fn org_name_from_env_var(env_var: &str) -> Option<String> {

sync-team/src/github/api/write.rs

@@ -237,7 +237,6 @@ impl GitHubWrite {
         if self.dry_run {
             Ok(Repo {
                 node_id: String::from("ID"),
-                repo_id: 0,
                 name: name.to_string(),
                 org: org.to_string(),
                 description: settings.description.clone(),
@@ -280,54 +279,6 @@ impl GitHubWrite {
         Ok(())
     }
 
-    pub(crate) fn add_repo_to_app_installation(
-        &self,
-        installation_id: u64,
-        repository_id: u64,
-        org: &str,
-    ) -> anyhow::Result<()> {
-        debug!("Adding repository {repository_id} to installation {installation_id}");
-        if !self.dry_run {
-            self.client
-                .req(
-                    Method::PUT,
-                    &GitHubUrl::new(
-                        &format!(
-                            "user/installations/{installation_id}/repositories/{repository_id}"
-                        ),
-                        org,
-                    ),
-                )?
-                .send()?
-                .custom_error_for_status()?;
-        }
-        Ok(())
-    }
-
-    pub(crate) fn remove_repo_from_app_installation(
-        &self,
-        installation_id: u64,
-        repository_id: u64,
-        org: &str,
-    ) -> anyhow::Result<()> {
-        debug!("Removing repository {repository_id} from installation {installation_id}");
-        if !self.dry_run {
-            self.client
-                .req(
-                    Method::DELETE,
-                    &GitHubUrl::new(
-                        &format!(
-                            "user/installations/{installation_id}/repositories/{repository_id}"
-                        ),
-                        org,
-                    ),
-                )?
-                .send()?
-                .custom_error_for_status()?;
-        }
-        Ok(())
-    }
-
     /// Update a team's permissions to a repo
     pub(crate) fn update_team_repo_permissions(
         &self,