Watch
0
0
Fork
You've already forked hyperhive
0

swarm-controller, swarm-ci-metrics: build forge clients through forge-client

This commit is contained in:
atlas 2026-11-15 23:02:54 +01:00
commit a77131ca3f
8 changed files with 75 additions and 28 deletions

View file

@ -18,8 +18,9 @@ use std::collections::BTreeSet;
use std::sync::Arc;
use anyhow::{Context, Result, bail};
use forge_client::{StaticToken, async_client};
use forgejo_api::structs::{AccessToken, CreateAccessTokenOption};
use forgejo_api::{ApiErrorKind, Auth, Forgejo, ForgejoError};
use forgejo_api::{ApiErrorKind, ForgejoError};
use reqwest::StatusCode;
use swarm_secret_client::{client::DEFAULT_CERT_MOUNT, forge, policy};
@ -242,7 +243,7 @@ impl Client {
)
.await?;
let as_agent = Forgejo::new(Auth::Token(&credential.value), self.url.clone())
let as_agent = async_client(self.url.clone(), &StaticToken::new(&credential.value))
.context("building a forge client with the new token")?;
let me = as_agent
.user_get_current()

View file

@ -9,7 +9,8 @@
use std::sync::{Arc, Mutex};
use forgejo_api::{ApiErrorKind, Auth, Forgejo, ForgejoError};
use forge_client::{StaticToken, async_client};
use forgejo_api::{ApiErrorKind, Forgejo, ForgejoError};
use futures_util::future::BoxFuture;
use reqwest::StatusCode;
use swarm_secret_client::stored_secret::StoredSecret;
@ -32,7 +33,7 @@ impl Api {
/// `url` is not http(s), or the token is not ASCII.
pub(crate) fn new(url: url::Url, token: StoredSecret) -> Result<Self, ForgejoError> {
let current = token.current();
let api = Arc::new(Forgejo::new(Auth::Token(&current), url.clone())?);
let api = Arc::new(async_client(url.clone(), &StaticToken::new(&current))?);
Ok(Self {
url,
token,
@ -45,7 +46,7 @@ impl Api {
let token = self.token.current();
let mut built = self.built.lock().expect("unpoisoned");
if built.0 != token {
let api = Arc::new(Forgejo::new(Auth::Token(&token), self.url.clone())?);
let api = Arc::new(async_client(self.url.clone(), &StaticToken::new(&token))?);
*built = (token.clone(), api);
}
Ok((token, Arc::clone(&built.1)))
@ -237,6 +238,38 @@ pub(crate) mod tests {
assert_eq!(served.load(Ordering::SeqCst), 4);
}
#[tokio::test(start_paused = true)]
async fn an_unchanged_token_keeps_the_client() {
let (url, served) = forge_accepting("old", None).await;
let (token, reads) = token("old", "new");
let api = Api::new(url, token).unwrap();
let (first_token, first) = api.current().unwrap();
let (second_token, second) = api.current().unwrap();
assert_eq!(
(first_token.as_str(), second_token.as_str()),
("old", "old")
);
assert!(Arc::ptr_eq(&first, &second));
first.user_get_current().await.expect("sends the old token");
assert_eq!(reads.load(Ordering::SeqCst), 0);
assert_eq!(served.load(Ordering::SeqCst), 1);
}
#[tokio::test(start_paused = true)]
async fn a_changed_token_builds_a_client_sending_the_new_one() {
let (url, _) = forge_accepting("new", None).await;
let (token, _) = token("old", "new");
let api = Api::new(url, token).unwrap();
let (_, before) = api.current().unwrap();
api.token.after_refusal("old").await.expect("a new token");
let (token, after) = api.current().unwrap();
assert_eq!(token, "new");
assert!(!Arc::ptr_eq(&before, &after));
after.user_get_current().await.expect("sends the new token");
let err = before.user_get_current().await.expect_err("still the old");
assert!(refuses_the_token(&err), "{err}");
}
#[test]
fn only_a_401_counts_as_refusing_the_token() {
let unauthorized = forgejo_api::ApiError {

View file

@ -15,8 +15,8 @@
use std::sync::Arc;
use anyhow::{Context, Result, bail};
use forge_client::{StaticToken, async_client};
use forgejo_api::structs::RepoSearchQuery;
use forgejo_api::{Auth, Forgejo};
use swarm_secret_client::builder::forge_token_path;
use swarm_secret_client::forge;
@ -93,7 +93,7 @@ impl Client {
.replace_token(&store, LOGIN, TOKEN_NAME, TOKEN_SCOPES, &listed, &path)
.await?;
Forgejo::new(Auth::Token(&credential.value), self.url.clone())
async_client(self.url.clone(), &StaticToken::new(&credential.value))
.context("building a forge client with the new token")?
.repo_search(RepoSearchQuery::default())
.await

View file

@ -17,11 +17,11 @@
use std::sync::Arc;
use anyhow::{Context, Result, bail};
use forge_client::{StaticToken, async_client};
use forgejo_api::structs::{
CreateTeamOption, CreateTeamOptionPermission, EditTeamOption, EditTeamOptionPermission,
RepoSearchQuery, Team, TeamPermission,
};
use forgejo_api::{Auth, Forgejo};
use swarm_secret_client::ci_metrics::forge_token_path;
use swarm_secret_client::forge;
@ -124,7 +124,7 @@ impl Client {
.replace_token(&store, LOGIN, TOKEN_NAME, TOKEN_SCOPES, &listed, &path)
.await?;
Forgejo::new(Auth::Token(&credential.value), self.url.clone())
async_client(self.url.clone(), &StaticToken::new(&credential.value))
.context("building a forge client with the new token")?
.repo_search(RepoSearchQuery::default())
.await

View file

@ -20,11 +20,12 @@
use std::sync::Arc;
use anyhow::{Context, Result, bail};
use forge_client::{StaticToken, async_client};
use forgejo_api::Forgejo;
use forgejo_api::structs::{
ChangeFileOperation, ChangeFileOperationOperation, ChangeFilesOptions, CreatePullReviewOptions,
Identity, RepoSearchQuery,
};
use forgejo_api::{Auth, Forgejo};
use swarm_secret_client::forge;
use swarm_secret_client::review_classifier::forge_token_path;
@ -122,7 +123,7 @@ impl Client {
.replace_token(&store, LOGIN, TOKEN_NAME, TOKEN_SCOPES, &listed, &path)
.await?;
Forgejo::new(Auth::Token(&credential.value), self.url.clone())
async_client(self.url.clone(), &StaticToken::new(&credential.value))
.context("building a forge client with the new token")?
.repo_search(RepoSearchQuery::default())
.await
@ -221,7 +222,7 @@ impl Client {
else {
bail!("nothing at {path}: the classifier's forge token is not minted yet");
};
Forgejo::new(Auth::Token(&credential.value), self.url.clone())
async_client(self.url.clone(), &StaticToken::new(&credential.value))
.context("building a forge client with the classifier's token")
}
@ -462,7 +463,7 @@ mod tests {
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let url = url::Url::parse(&format!("http://{}/", listener.local_addr().unwrap())).unwrap();
tokio::spawn(async move { axum::serve(listener, app).await });
let forge = Forgejo::new(Auth::Token("stub-token"), url).unwrap();
let forge = async_client(url, &StaticToken::new("stub-token")).unwrap();
let commit = BranchCommit {
base: "main".to_owned(),
branch: "review-classifier/alice-0a1b2c3d".to_owned(),

View file

@ -19,11 +19,11 @@
use std::sync::Arc;
use anyhow::{Context, Result, bail};
use forge_client::{StaticToken, async_client};
use forgejo_api::structs::{
AccessToken, CreateTeamOption, CreateTeamOptionPermission, EditTeamOption,
EditTeamOptionPermission, RepoSearchQuery, Team, TeamPermission,
};
use forgejo_api::{Auth, Forgejo};
use swarm_secret_client::forge;
use super::agent_token::{Decision, Observed, classify_named, is_not_found};
@ -175,7 +175,7 @@ impl Client {
)
.await?;
Forgejo::new(Auth::Token(&credential.value), self.url.clone())
async_client(self.url.clone(), &StaticToken::new(&credential.value))
.context("building a forge client with the new token")?
.repo_search(RepoSearchQuery::default())
.await

View file

@ -21,8 +21,8 @@ use std::time::Duration;
use anyhow::{Context, Result};
use base64::Engine as _;
use forge_client::{StaticToken, async_client};
use forgejo_api::structs::{CreateAccessTokenOption, UpdateUserAvatarOption};
use forgejo_api::{Auth, Forgejo};
use sha2::{Digest as _, Sha256};
use super::agent_token::is_not_found;
@ -177,7 +177,7 @@ impl Client {
.sha1
.filter(|v| !v.is_empty())
.with_context(|| format!("the forge created {login}'s token but returned no value"))?;
let uploaded = Forgejo::new(Auth::Token(&token), self.url.clone())
let uploaded = async_client(self.url.clone(), &StaticToken::new(&token))
.context("building a forge client with the avatar token")?
.user_update_avatar(UpdateUserAvatarOption {
image: Some(base64::engine::general_purpose::STANDARD.encode(image)),

View file

@ -2542,7 +2542,8 @@ mod tests {
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let url = url::Url::parse(&format!("http://{}/", listener.local_addr().unwrap())).unwrap();
drop(listener);
let forge = forgejo_api::Forgejo::new(forgejo_api::Auth::Token("stub-token"), url).unwrap();
let forge =
forge_client::async_client(url, &forge_client::StaticToken::new("stub-token")).unwrap();
forge.user_get_current().await.expect_err("nothing listens")
}