Rename TeamApiClient to TeamClient

Kobzol · Kobzol · commit f8f205686c90 · 2025-06-08T10:07:26.000+02:00
diff --git a/src/actions.rs b/src/actions.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use tera::{Context, Tera};
 
 use crate::github::{self, GithubClient, Repository};
-use crate::team_data::TeamApiClient;
+use crate::team_data::TeamClient;
 
 #[async_trait]
 pub trait Action {
@@ -107,7 +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 = TeamApiClient::new_from_env();
+        let team_api = TeamClient::new_from_env();
 
         let mut context = Context::new();
         let mut results = HashMap::new();
diff --git a/src/bin/project_goals.rs b/src/bin/project_goals.rs
@@ -1,5 +1,5 @@
 use clap::Parser;
-use triagebot::team_data::TeamApiClient;
+use triagebot::team_data::TeamClient;
 use triagebot::zulip::client::ZulipClient;
 use triagebot::{github::GithubClient, handlers::project_goals};
 
@@ -25,7 +25,7 @@ async fn main() -> anyhow::Result<()> {
     let opt = Opt::parse();
     let gh = GithubClient::new_from_env();
     let zulip = ZulipClient::new_from_env();
-    let team_api = TeamApiClient::new_from_env();
+    let team_api = TeamClient::new_from_env();
     project_goals::ping_project_goals_owners(
         &gh,
         &zulip,
diff --git a/src/github.rs b/src/github.rs
@@ -1,4 +1,4 @@
-use crate::team_data::TeamApiClient;
+use crate::team_data::TeamClient;
 use anyhow::{anyhow, Context};
 use async_trait::async_trait;
 use bytes::Bytes;
@@ -241,7 +241,7 @@ impl User {
             .await
     }
 
-    pub async fn is_team_member<'a>(&'a self, client: &'a TeamApiClient) -> 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 = client.teams().await?;
         let map = permission.teams;
@@ -2014,7 +2014,7 @@ impl<'q> IssuesQuery for Query<'q> {
         include_fcp_details: bool,
         include_mcp_details: bool,
         gh_client: &'a GithubClient,
-        team_api_client: &'a TeamApiClient,
+        team_client: &'a TeamClient,
     ) -> anyhow::Result<Vec<crate::actions::IssueDecorator>> {
         let issues = repo
             .get_issues(&gh_client, self)
@@ -2030,7 +2030,7 @@ impl<'q> IssuesQuery for Query<'q> {
         };
 
         let zulip_map = if include_fcp_details {
-            Some(team_api_client.zulip_map().await?)
+            Some(team_client.zulip_map().await?)
         } else {
             None
         };
@@ -2841,7 +2841,7 @@ pub trait IssuesQuery {
         include_fcp_details: bool,
         include_mcp_details: bool,
         gh_client: &'a GithubClient,
-        team_api_client: &'a TeamApiClient,
+        team_client: &'a TeamClient,
     ) -> anyhow::Result<Vec<crate::actions::IssueDecorator>>;
 }
 
@@ -2854,7 +2854,7 @@ impl IssuesQuery for LeastRecentlyReviewedPullRequests {
         _include_fcp_details: bool,
         _include_mcp_details: bool,
         client: &'a GithubClient,
-        _team_api_client: &'a TeamApiClient,
+        _team_client: &'a TeamClient,
     ) -> anyhow::Result<Vec<crate::actions::IssueDecorator>> {
         use cynic::QueryBuilder;
         use github_graphql::queries;
@@ -3073,7 +3073,7 @@ impl IssuesQuery for DesignMeetings {
         _include_fcp_details: bool,
         _include_mcp_details: bool,
         client: &'a GithubClient,
-        _team_api_client: &'a TeamApiClient,
+        _team_client: &'a TeamClient,
     ) -> anyhow::Result<Vec<crate::actions::IssueDecorator>> {
         use github_graphql::project_items::ProjectV2ItemContent;
 
diff --git a/src/handlers.rs b/src/handlers.rs
@@ -1,7 +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::TeamApiClient;
+use crate::team_data::TeamClient;
 use crate::zulip::client::ZulipClient;
 use octocrab::Octocrab;
 use parser::command::{assign::AssignCommand, Command, Input};
@@ -375,7 +375,7 @@ command_handlers! {
 pub struct Context {
     pub github: GithubClient,
     pub zulip: ZulipClient,
-    pub team_api: TeamApiClient,
+    pub team: TeamClient,
     pub db: crate::db::ClientPool,
     pub username: String,
     pub octocrab: Octocrab,
diff --git a/src/handlers/assign.rs b/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 = &ctx.team_api.teams().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,12 +510,11 @@ 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.team_api).await {
-            false
-        } else {
-            true
-        };
+    let is_team_member = if let Err(_) | Ok(false) = event.user().is_team_member(&ctx.team).await {
+        false
+    } else {
+        true
+    };
 
     // Don't handle commands in comments from the bot. Some of the comments it
     // posts contain commands to instruct the user, not things that the bot
@@ -545,7 +544,7 @@ pub(super) async fn handle_command(
             return Ok(());
         }
 
-        let teams = ctx.team_api.teams().await?;
+        let teams = ctx.team.teams().await?;
 
         let assignee = match cmd {
             AssignCommand::Claim => event.user().login.clone(),
diff --git a/src/handlers/close.rs b/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.team_api)
+        .is_team_member(&ctx.team)
         .await
         .unwrap_or(false);
     if !is_team_member {
diff --git a/src/handlers/major_change.rs b/src/handlers/major_change.rs
@@ -247,7 +247,7 @@ pub(super) async fn handle_command(
 
     let is_team_member = event
         .user()
-        .is_team_member(&ctx.team_api)
+        .is_team_member(&ctx.team)
         .await
         .ok()
         .unwrap_or(false);
diff --git a/src/handlers/nominate.rs b/src/handlers/nominate.rs
@@ -14,12 +14,11 @@ 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.team_api).await {
-            false
-        } else {
-            true
-        };
+    let is_team_member = if let Err(_) | Ok(false) = event.user().is_team_member(&ctx.team).await {
+        false
+    } else {
+        true
+    };
 
     if !is_team_member {
         let cmnt = ErrorComment::new(
diff --git a/src/handlers/notification.rs b/src/handlers/notification.rs
@@ -68,11 +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 ctx
-        .team_api
-        .get_gh_id_from_username(&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());
         }
@@ -139,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 ctx.team_api.get_team_by_github_name(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
@@ -174,7 +170,7 @@ async fn id_from_user(
         )))
     } else {
         let id = ctx
-            .team_api
+            .team
             .get_gh_id_from_username(login)
             .await
             .with_context(|| format!("failed to get user {} ID", login))?;
diff --git a/src/handlers/ping.rs b/src/handlers/ping.rs
@@ -18,12 +18,11 @@ 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.team_api).await {
-            false
-        } else {
-            true
-        };
+    let is_team_member = if let Err(_) | Ok(false) = event.user().is_team_member(&ctx.team).await {
+        false
+    } else {
+        true
+    };
 
     if !is_team_member {
         let cmnt = ErrorComment::new(
@@ -49,7 +48,7 @@ pub(super) async fn handle_command(
             return Ok(());
         }
     };
-    let team = ctx.team_api.get_team(&gh_team).await?;
+    let team = ctx.team.get_team(&gh_team).await?;
     let team = match team {
         Some(team) => team,
         None => {
diff --git a/src/handlers/project_goals.rs b/src/handlers/project_goals.rs
@@ -4,7 +4,7 @@ use crate::github::{
 };
 use crate::github::{Event, Issue};
 use crate::jobs::Job;
-use crate::team_data::TeamApiClient;
+use crate::team_data::TeamClient;
 use crate::zulip::api::Recipient;
 use crate::zulip::client::ZulipClient;
 use anyhow::Context as _;
@@ -50,19 +50,16 @@ impl Job for ProjectGoalsUpdateJob {
     }
 
     async fn run(&self, ctx: &super::Context, _metadata: &serde_json::Value) -> anyhow::Result<()> {
-        ping_project_goals_owners_automatically(&ctx.github, &ctx.zulip, &ctx.team_api).await
+        ping_project_goals_owners_automatically(&ctx.github, &ctx.zulip, &ctx.team).await
     }
 }
 
 /// Returns true if the user with the given github id is allowed to ping all group people
 /// and do other "project group adminstrative" tasks.
-pub async fn check_project_goal_acl(
-    team_api_client: &TeamApiClient,
-    gh_id: u64,
-) -> anyhow::Result<bool> {
+pub async fn check_project_goal_acl(team_client: &TeamClient, gh_id: u64) -> anyhow::Result<bool> {
     const GOALS_TEAM: &str = "goals";
 
-    let team = match team_api_client.get_team(GOALS_TEAM).await {
+    let team = match team_client.get_team(GOALS_TEAM).await {
         Ok(Some(team)) => team,
         Ok(None) => {
             log::info!("team ({}) failed to resolve to a known team", GOALS_TEAM);
@@ -88,7 +85,7 @@ pub async fn check_project_goal_acl(
 async fn ping_project_goals_owners_automatically(
     gh: &GithubClient,
     zulip: &ZulipClient,
-    team_api: &TeamApiClient,
+    team_api: &TeamClient,
 ) -> anyhow::Result<()> {
     // Predicted schedule is to author a blog post on the 3rd week of the month.
     // We start pinging when the month starts until we see an update in this month
@@ -128,7 +125,7 @@ async fn ping_project_goals_owners_automatically(
 pub async fn ping_project_goals_owners(
     gh: &GithubClient,
     zulip: &ZulipClient,
-    team_api_client: &TeamApiClient,
+    team_client: &TeamClient,
     dry_run: bool,
     days_threshold: i64,
     next_update: &str,
@@ -164,7 +161,7 @@ pub async fn ping_project_goals_owners(
         }
 
         let zulip_topic_name = zulip_topic_name(&issue);
-        let Some(zulip_owners) = zulip_owners(team_api_client, &issue).await? else {
+        let Some(zulip_owners) = zulip_owners(team_client, &issue).await? else {
             log::debug!("no owners assigned");
             continue;
         };
@@ -219,32 +216,29 @@ fn zulip_topic_name(issue: &Issue) -> String {
     title
 }
 
-async fn zulip_owners(
-    team_api_client: &TeamApiClient,
-    issue: &Issue,
-) -> anyhow::Result<Option<String>> {
+async fn zulip_owners(team_client: &TeamClient, issue: &Issue) -> anyhow::Result<Option<String>> {
     use std::fmt::Write;
 
     Ok(match &issue.assignees[..] {
         [] => None,
-        [string0] => Some(owner_string(team_api_client, string0).await?),
+        [string0] => Some(owner_string(team_client, string0).await?),
         [string0, string1] => Some(format!(
             "{} and {}",
-            owner_string(team_api_client, string0).await?,
-            owner_string(team_api_client, string1).await?
+            owner_string(team_client, string0).await?,
+            owner_string(team_client, string1).await?
         )),
         [string0 @ .., string1] => {
             let mut out = String::new();
             for s in string0 {
-                write!(out, "{}, ", owner_string(team_api_client, s).await?).unwrap();
+                write!(out, "{}, ", owner_string(team_client, s).await?).unwrap();
             }
-            write!(out, "{}, ", owner_string(team_api_client, string1).await?).unwrap();
+            write!(out, "{}, ", owner_string(team_client, string1).await?).unwrap();
             Some(out)
         }
     })
 }
 
-async fn owner_string(team_api: &TeamApiClient, assignee: &User) -> anyhow::Result<String> {
+async fn owner_string(team_api: &TeamClient, assignee: &User) -> anyhow::Result<String> {
     if let Some(zulip_id) = team_api.github_to_zulip_id(assignee.id).await? {
         Ok(format!("@**|{zulip_id}**"))
     } else {
@@ -273,7 +267,7 @@ pub async fn handle(ctx: &Context, event: &Event) -> anyhow::Result<()> {
                 return Ok(());
             }
             let zulip_topic_name = zulip_topic_name(issue);
-            let zulip_owners = match zulip_owners(&ctx.team_api, issue).await? {
+            let zulip_owners = match zulip_owners(&ctx.team, issue).await? {
                 Some(names) => names,
                 None => format!("(no owners assigned)"),
             };
@@ -314,7 +308,7 @@ pub async fn handle(ctx: &Context, event: &Event) -> anyhow::Result<()> {
             let zulip_topic_name = zulip_topic_name(issue);
             let url = &comment.html_url;
             let text = &comment.body;
-            let zulip_author = owner_string(&ctx.team_api, &comment.user).await?;
+            let zulip_author = owner_string(&ctx.team, &comment.user).await?;
 
             let mut ticks = "````".to_string();
             while text.contains(&ticks) {
diff --git a/src/handlers/relabel.rs b/src/handlers/relabel.rs
@@ -8,7 +8,7 @@
 //! If the command was successful, there will be no feedback beyond the label change to reduce
 //! notification noise.
 
-use crate::team_data::TeamApiClient;
+use crate::team_data::TeamClient;
 use crate::{
     config::RelabelConfig,
     github::UnknownLabels,
@@ -28,7 +28,7 @@ pub(super) async fn handle_command(
     let mut to_add = vec![];
     for delta in &input.0 {
         let name = delta.label().as_str();
-        let err = match check_filter(name, config, is_member(&event.user(), &ctx.team_api).await) {
+        let err = match check_filter(name, config, is_member(&event.user(), &ctx.team).await) {
             Ok(CheckFilterResult::Allow) => None,
             Ok(CheckFilterResult::Deny) => Some(format!(
                 "Label {} can only be set by Rust team members",
@@ -106,7 +106,7 @@ enum TeamMembership {
     Unknown,
 }
 
-async fn is_member(user: &github::User, client: &TeamApiClient) -> TeamMembership {
+async fn is_member(user: &github::User, client: &TeamClient) -> TeamMembership {
     match user.is_team_member(client).await {
         Ok(true) => TeamMembership::Member,
         Ok(false) => TeamMembership::Outsider,
diff --git a/src/handlers/transfer.rs b/src/handlers/transfer.rs
@@ -19,7 +19,7 @@ pub(super) async fn handle_command(
     }
     if !event
         .user()
-        .is_team_member(&ctx.team_api)
+        .is_team_member(&ctx.team)
         .await
         .ok()
         .unwrap_or(false)
diff --git a/src/main.rs b/src/main.rs
diff --git a/src/team_data.rs b/src/team_data.rs
diff --git a/src/tests/mod.rs b/src/tests/mod.rs
diff --git a/src/zulip.rs b/src/zulip.rs
