Deuxfleurs/garage
32
59
Fork 80
Code Issues 100 Pull requests 17 Releases 30 Wiki Activity

admin refactoring: refactor CLI to use Admin API requests (step 2) #943

Merged
lx merged 9 commits from refactor-admin into next-v2 2025-01-30 16:18:39 +00:00
Conversation 0 Commits 9 Files changed 19 +6 -6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ebc0e9319e - Show all commits

12
src/garage/cli_v2/mod.rs
View file

@ -47,11 +47,11 @@ impl Cli {
AdminRpc::LaunchRepair(ro),
)
.await
.ok_or_message("xoxo"),
.ok_or_message("cli_v1"),
Command::Stats(so) => {
cli_v1::cmd_admin(&self.admin_rpc_endpoint, self.rpc_host, AdminRpc::Stats(so))
.await
.ok_or_message("xoxo")
.ok_or_message("cli_v1")
}
Command::Worker(wo) => cli_v1::cmd_admin(
&self.admin_rpc_endpoint,
@ -59,21 +59,21 @@ impl Cli {
AdminRpc::Worker(wo),
)
.await
.ok_or_message("xoxo"),
.ok_or_message("cli_v1"),
Command::Block(bo) => cli_v1::cmd_admin(
&self.admin_rpc_endpoint,
self.rpc_host,
AdminRpc::BlockOperation(bo),
)
.await
.ok_or_message("xoxo"),
.ok_or_message("cli_v1"),
Command::Meta(mo) => cli_v1::cmd_admin(
&self.admin_rpc_endpoint,
self.rpc_host,
AdminRpc::MetaOperation(mo),
)
.await
.ok_or_message("xoxo"),
.ok_or_message("cli_v1"),
_ => unreachable!(),
}
@ -91,7 +91,7 @@ impl Cli {
.admin_rpc_endpoint
.call(&self.rpc_host, AdminRpc::ApiRequest(req), PRIO_NORMAL)
.await?
.ok_or_message("xoxo")?
.ok_or_message("rpc")?
{
AdminRpc::ApiOkResponse(resp) => <T as AdminApiEndpoint>::Response::try_from(resp)
.map_err(|_| Error::Message(format!("{} returned unexpected response", req_name))),