Merge pull request #2055 from Kobzol/team-cache

Add team API client and cache team API calls

Author: Kobzol

src/actions.rs

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 use tera::{Context, Tera};
 
 use crate::github::{self, GithubClient, Repository};
+use crate::team_data::TeamClient;
 
 #[async_trait]
 pub trait Action {
@@ -106,6 +107,7 @@ impl<'a> Action for Step<'a> {
     async fn call(&self) -> anyhow::Result<String> {
         let mut gh = GithubClient::new_from_env();
         gh.set_retry_rate_limit(true);
+        let team_api = TeamClient::new_from_env();
 
         let mut context = Context::new();
         let mut results = HashMap::new();
@@ -130,6 +132,7 @@ impl<'a> Action for Step<'a> {
                     let kind = *kind;
                     let repository = repository.clone();
                     let gh = gh.clone();
+                    let team_api = team_api.clone();
                     let query = query.clone();
                     handles.push(tokio::task::spawn(async move {
                         let _permit = semaphore.acquire().await?;
@@ -148,6 +151,7 @@ impl<'a> Action for Step<'a> {
                                 mcps_groups.contains(&name.as_str())
                                     && repository.full_name.contains("rust-lang/compiler-team"),
                                 &gh,
+                                &team_api,
                             )
                             .await?;
                         Ok((name, kind, issues))

src/bin/project_goals.rs

@@ -1,4 +1,5 @@
 use clap::Parser;
+use triagebot::team_data::TeamClient;
 use triagebot::zulip::client::ZulipClient;
 use triagebot::{github::GithubClient, handlers::project_goals};
 
@@ -24,9 +25,11 @@ async fn main() -> anyhow::Result<()> {
     let opt = Opt::parse();
     let gh = GithubClient::new_from_env();
     let zulip = ZulipClient::new_from_env();
+    let team_api = TeamClient::new_from_env();
     project_goals::ping_project_goals_owners(
         &gh,
         &zulip,
+        &team_api,
         opt.dry_run,
         opt.days_threshold,
         &opt.next_meeting_date,

src/github.rs

@@ -1,3 +1,4 @@
+use crate::team_data::TeamClient;
 use anyhow::{anyhow, Context};
 use async_trait::async_trait;
 use bytes::Bytes;
@@ -240,9 +241,9 @@ impl User {
             .await
     }
 
-    pub async fn is_team_member<'a>(&'a self, client: &'a GithubClient) -> anyhow::Result<bool> {
+    pub async fn is_team_member<'a>(&'a self, client: &'a TeamClient) -> anyhow::Result<bool> {
         log::trace!("Getting team membership for {:?}", self.login);
-        let permission = crate::team_data::teams(client).await?;
+        let permission = client.teams().await?;
         let map = permission.teams;
         let is_triager = map
             .get("wg-triage")
@@ -262,49 +263,6 @@ impl User {
     }
 }
 
-// Returns the ID of the given user, if the user is in the `all` team.
-pub async fn get_id_for_username(
-    client: &GithubClient,
-    login: &str,
-) -> anyhow::Result<Option<u64>> {
-    let permission = crate::team_data::teams(client).await?;
-    let map = permission.teams;
-    let login = login.to_lowercase();
-    Ok(map["all"]
-        .members
-        .iter()
-        .find(|g| g.github.to_lowercase() == login)
-        .map(|u| u.github_id))
-}
-
-pub async fn get_team(
-    client: &GithubClient,
-    team: &str,
-) -> anyhow::Result<Option<rust_team_data::v1::Team>> {
-    let permission = crate::team_data::teams(client).await?;
-    let mut map = permission.teams;
-    Ok(map.swap_remove(team))
-}
-
-/// Fetches a Rust team via its GitHub team name.
-pub async fn get_team_by_github_name(
-    client: &GithubClient,
-    org: &str,
-    team: &str,
-) -> anyhow::Result<Option<rust_team_data::v1::Team>> {
-    let teams = crate::team_data::teams(client).await?;
-    for rust_team in teams.teams.into_values() {
-        if let Some(github) = &rust_team.github {
-            for gh_team in &github.teams {
-                if gh_team.org == org && gh_team.name == team {
-                    return Ok(Some(rust_team));
-                }
-            }
-        }
-    }
-    Ok(None)
-}
-
 #[derive(PartialEq, Eq, Debug, Clone, serde::Deserialize)]
 pub struct Label {
     pub name: String,
@@ -2055,10 +2013,11 @@ impl<'q> IssuesQuery for Query<'q> {
         repo: &'a Repository,
         include_fcp_details: bool,
         include_mcp_details: bool,
-        client: &'a GithubClient,
+        gh_client: &'a GithubClient,
+        team_client: &'a TeamClient,
     ) -> anyhow::Result<Vec<crate::actions::IssueDecorator>> {
         let issues = repo
-            .get_issues(&client, self)
+            .get_issues(&gh_client, self)
             .await
             .with_context(|| "Unable to get issues.")?;
 
@@ -2071,7 +2030,7 @@ impl<'q> IssuesQuery for Query<'q> {
         };
 
         let zulip_map = if include_fcp_details {
-            Some(crate::team_data::zulip_map(client).await?)
+            Some(team_client.zulip_map().await?)
         } else {
             None
         };
@@ -2101,7 +2060,7 @@ impl<'q> IssuesQuery for Query<'q> {
                     let fk_initiating_comment = fcp.fcp.fk_initiating_comment;
                     let (initiating_comment_html_url, initiating_comment_content) = {
                         let comment = issue
-                            .get_comment(&client, fk_initiating_comment)
+                            .get_comment(gh_client, fk_initiating_comment)
                             .await
                             .with_context(|| {
                                 format!(
@@ -2166,7 +2125,7 @@ impl<'q> IssuesQuery for Query<'q> {
             };
 
             let mcp_details = if include_mcp_details {
-                let first100_comments = issue.get_first100_comments(&client).await?;
+                let first100_comments = issue.get_first100_comments(&gh_client).await?;
                 let (zulip_link, concerns) = if !first100_comments.is_empty() {
                     let split = re_zulip_link
                         .split(&first100_comments[0].body)
@@ -2881,7 +2840,8 @@ pub trait IssuesQuery {
         repo: &'a Repository,
         include_fcp_details: bool,
         include_mcp_details: bool,
-        client: &'a GithubClient,
+        gh_client: &'a GithubClient,
+        team_client: &'a TeamClient,
     ) -> anyhow::Result<Vec<crate::actions::IssueDecorator>>;
 }
 
@@ -2894,6 +2854,7 @@ impl IssuesQuery for LeastRecentlyReviewedPullRequests {
         _include_fcp_details: bool,
         _include_mcp_details: bool,
         client: &'a GithubClient,
+        _team_client: &'a TeamClient,
     ) -> anyhow::Result<Vec<crate::actions::IssueDecorator>> {
         use cynic::QueryBuilder;
         use github_graphql::queries;
@@ -3112,6 +3073,7 @@ impl IssuesQuery for DesignMeetings {
         _include_fcp_details: bool,
         _include_mcp_details: bool,
         client: &'a GithubClient,
+        _team_client: &'a TeamClient,
     ) -> anyhow::Result<Vec<crate::actions::IssueDecorator>> {
         use github_graphql::project_items::ProjectV2ItemContent;
 

src/handlers.rs

@@ -1,6 +1,7 @@
 use crate::config::{self, Config, ConfigurationError};
 use crate::github::{Event, GithubClient, IssueCommentAction, IssuesAction, IssuesEvent};
 use crate::handlers::pr_tracking::ReviewerWorkqueue;
+use crate::team_data::TeamClient;
 use crate::zulip::client::ZulipClient;
 use octocrab::Octocrab;
 use parser::command::{assign::AssignCommand, Command, Input};
@@ -374,6 +375,7 @@ command_handlers! {
 pub struct Context {
     pub github: GithubClient,
     pub zulip: ZulipClient,
+    pub team: TeamClient,
     pub db: crate::db::ClientPool,
     pub username: String,
     pub octocrab: Octocrab,

src/handlers/assign.rs

@@ -331,7 +331,7 @@ async fn determine_assignee(
     diff: &[FileDiff],
 ) -> anyhow::Result<(Option<ReviewerSelection>, bool)> {
     let mut db_client = ctx.db.get().await;
-    let teams = crate::team_data::teams(&ctx.github).await?;
+    let teams = &ctx.team.teams().await?;
     if let Some(name) = assign_command {
         // User included `r?` in the opening PR body.
         match find_reviewer_from_names(
@@ -510,8 +510,7 @@ pub(super) async fn handle_command(
     event: &Event,
     cmd: AssignCommand,
 ) -> anyhow::Result<()> {
-    let is_team_member = if let Err(_) | Ok(false) = event.user().is_team_member(&ctx.github).await
-    {
+    let is_team_member = if let Err(_) | Ok(false) = event.user().is_team_member(&ctx.team).await {
         false
     } else {
         true
@@ -545,7 +544,7 @@ pub(super) async fn handle_command(
             return Ok(());
         }
 
-        let teams = crate::team_data::teams(&ctx.github).await?;
+        let teams = ctx.team.teams().await?;
 
         let assignee = match cmd {
             AssignCommand::Claim => event.user().login.clone(),

src/handlers/close.rs

@@ -12,7 +12,7 @@ pub(super) async fn handle_command(
     let issue = event.issue().unwrap();
     let is_team_member = event
         .user()
-        .is_team_member(&ctx.github)
+        .is_team_member(&ctx.team)
         .await
         .unwrap_or(false);
     if !is_team_member {

src/handlers/major_change.rs

@@ -256,7 +256,7 @@ pub(super) async fn handle_command(
 
     let is_team_member = event
         .user()
-        .is_team_member(&ctx.github)
+        .is_team_member(&ctx.team)
         .await
         .ok()
         .unwrap_or(false);

src/handlers/nominate.rs

@@ -14,8 +14,7 @@ pub(super) async fn handle_command(
     event: &Event,
     cmd: NominateCommand,
 ) -> anyhow::Result<()> {
-    let is_team_member = if let Err(_) | Ok(false) = event.user().is_team_member(&ctx.github).await
-    {
+    let is_team_member = if let Err(_) | Ok(false) = event.user().is_team_member(&ctx.team).await {
         false
     } else {
         true

src/handlers/notification.rs

@@ -5,7 +5,6 @@
 //! Parsing is done in the `parser::command::ping` module.
 
 use crate::db::{notifications, users};
-use crate::github::get_id_for_username;
 use crate::{
     github::{self, Event},
     handlers::Context,
@@ -69,7 +68,7 @@ pub(super) async fn handle(ctx: &Context, event: &Event) -> anyhow::Result<()> {
     //
     // If the user intended to ping themselves, they can add the GitHub comment
     // via the Zulip interface.
-    match get_id_for_username(&ctx.github, &event.user().login).await {
+    match ctx.team.get_gh_id_from_username(&event.user().login).await {
         Ok(Some(id)) => {
             users_notified.insert(id.try_into().unwrap());
         }
@@ -136,7 +135,7 @@ async fn id_from_user(
         //
         // We may also want to be able to categorize into these buckets
         // *after* the ping occurs and is initially processed.
-        let team = match github::get_team_by_github_name(&ctx.github, org, team).await {
+        let team = match ctx.team.get_team_by_github_name(org, team).await {
             Ok(Some(team)) => team,
             Ok(None) => {
                 // If the team is in rust-lang*, then this is probably an error (potentially user
@@ -170,7 +169,9 @@ async fn id_from_user(
             Some(team.name),
         )))
     } else {
-        let id = get_id_for_username(&ctx.github, login)
+        let id = ctx
+            .team
+            .get_gh_id_from_username(login)
             .await
             .with_context(|| format!("failed to get user {} ID", login))?;
         let Some(id) = id else {

src/handlers/ping.rs

@@ -18,8 +18,7 @@ pub(super) async fn handle_command(
     event: &Event,
     team_name: PingCommand,
 ) -> anyhow::Result<()> {
-    let is_team_member = if let Err(_) | Ok(false) = event.user().is_team_member(&ctx.github).await
-    {
+    let is_team_member = if let Err(_) | Ok(false) = event.user().is_team_member(&ctx.team).await {
         false
     } else {
         true
@@ -49,7 +48,7 @@ pub(super) async fn handle_command(
             return Ok(());
         }
     };
-    let team = github::get_team(&ctx.github, &gh_team).await?;
+    let team = ctx.team.get_team(&gh_team).await?;
     let team = match team {
         Some(team) => team,
         None => {