Merge pull request #124 from rust-lang/improve-how-to-determine-if-we-are-using-a-pat

improve how to determine if we are using a pat

Author: marcoieni

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

@@ -153,7 +153,7 @@ impl GithubRead for GitHubApiRead {
         }
 
         let mut installations = Vec::new();
-        let url = if std::env::var("GITHUB_TOKEN").is_ok() {
+        let url = if self.client.github_tokens.is_pat() {
             // we are using a PAT
             format!("user/installations/{installation_id}/repositories")
         } else {

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

@@ -8,7 +8,7 @@ pub enum GitHubTokens {
     /// One token per organization (used with GitHub App).
     Orgs(HashMap<String, SecretString>),
     /// One token for all API calls (used with Personal Access Token).
-    All(SecretString),
+    Pat(SecretString),
 }
 
 impl GitHubTokens {
@@ -28,7 +28,7 @@ impl GitHubTokens {
         if tokens.is_empty() {
             let pat_token = std::env::var("GITHUB_TOKEN")
                 .context("failed to get any GitHub token environment variable")?;
-            Ok(GitHubTokens::All(SecretString::from(pat_token)))
+            Ok(GitHubTokens::Pat(SecretString::from(pat_token)))
         } else {
             Ok(GitHubTokens::Orgs(tokens))
         }
@@ -43,9 +43,13 @@ impl GitHubTokens {
                     "failed to get the GitHub token environment variable for organization {org}"
                 )
             }),
-            GitHubTokens::All(pat) => Ok(pat),
+            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> {