gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-05 20:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

admin api: increased compatibility for v0/ endpoints

Browse Source
This commit is contained in:
Alex Auvolat
2023-10-05 16:56:13 +02:00
parent 1c13135f25
commit 0c431b0c03
5 changed files with 388 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/admin/api_server.rs
+8 -2
View File
@@ -25,7 +25,8 @@ use crate::admin::bucket::*;
use crate::admin::cluster::*;
use crate::admin::error::*;
use crate::admin::key::*;
use crate::admin::router::{Authorization, Endpoint};
use crate::admin::router_v0;
use crate::admin::router_v1::{Authorization, Endpoint};
use crate::helpers::host_to_bucket;
pub struct AdminApiServer {
@@ -229,7 +230,12 @@ impl ApiHandler for AdminApiServer {
type Error = Error;
fn parse_endpoint(&self, req: &Request<Body>) -> Result<Endpoint, Error> {
Endpoint::from_request(req)
if req.uri().path().starts_with("/v0/") {
let endpoint_v0 = router_v0::Endpoint::from_request(req)?;
Endpoint::from_v0(endpoint_v0)
} else {
Endpoint::from_request(req)
}
}
async fn handle(