gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-07-28 16:58:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

admin api: rename bucket aliasing operations

Browse Source
This commit is contained in:
Alex Auvolat
2025-01-28 18:51:15 +01:00
parent f8ed3fdbc4
commit ba810b2e81
5 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/admin/api.rs
+16 -16
View File
@@ -54,10 +54,10 @@ admin_endpoints![
BucketDenyKey,
// Operations on bucket aliases
GlobalAliasBucket,
GlobalUnaliasBucket,
LocalAliasBucket,
LocalUnaliasBucket,
AddGlobalBucketAlias,
RemoveGlobalBucketAlias,
AddLocalBucketAlias,
RemoveLocalBucketAlias,
];
// **********************************************
@@ -514,48 +514,48 @@ pub struct BucketDenyKeyResponse(pub GetBucketInfoResponse);
// Operations on bucket aliases
// **********************************************
// ---- GlobalAliasBucket ----
// ---- AddGlobalBucketAlias ----
#[derive(Serialize, Deserialize)]
pub struct GlobalAliasBucketRequest {
pub struct AddGlobalBucketAliasRequest {
pub bucket_id: String,
pub alias: String,
}
#[derive(Serialize, Deserialize)]
pub struct GlobalAliasBucketResponse(pub GetBucketInfoResponse);
pub struct AddGlobalBucketAliasResponse(pub GetBucketInfoResponse);
// ---- GlobalUnaliasBucket ----
// ---- RemoveGlobalBucketAlias ----
#[derive(Serialize, Deserialize)]
pub struct GlobalUnaliasBucketRequest {
pub struct RemoveGlobalBucketAliasRequest {
pub bucket_id: String,
pub alias: String,
}
#[derive(Serialize, Deserialize)]
pub struct GlobalUnaliasBucketResponse(pub GetBucketInfoResponse);
pub struct RemoveGlobalBucketAliasResponse(pub GetBucketInfoResponse);
// ---- LocalAliasBucket ----
// ---- AddLocalBucketAlias ----
#[derive(Serialize, Deserialize)]
pub struct LocalAliasBucketRequest {
pub struct AddLocalBucketAliasRequest {
pub bucket_id: String,
pub access_key_id: String,
pub alias: String,
}
#[derive(Serialize, Deserialize)]
pub struct LocalAliasBucketResponse(pub GetBucketInfoResponse);
pub struct AddLocalBucketAliasResponse(pub GetBucketInfoResponse);
// ---- LocalUnaliasBucket ----
// ---- RemoveLocalBucketAlias ----
#[derive(Serialize, Deserialize)]
pub struct LocalUnaliasBucketRequest {
pub struct RemoveLocalBucketAliasRequest {
pub bucket_id: String,
pub access_key_id: String,
pub alias: String,
}
#[derive(Serialize, Deserialize)]
pub struct LocalUnaliasBucketResponse(pub GetBucketInfoResponse);
pub struct RemoveLocalBucketAliasResponse(pub GetBucketInfoResponse);
src/api/admin/bucket.rs
+20 -20
View File
@@ -22,10 +22,10 @@ use crate::admin::api::{
BucketDenyKeyResponse, BucketKeyPermChangeRequest, BucketLocalAlias, CreateBucketRequest,
CreateBucketResponse, DeleteBucketRequest, DeleteBucketResponse, GetBucketInfoKey,
GetBucketInfoRequest, GetBucketInfoResponse, GetBucketInfoWebsiteResponse,
GlobalAliasBucketRequest, GlobalAliasBucketResponse, GlobalUnaliasBucketRequest,
GlobalUnaliasBucketResponse, ListBucketsRequest, ListBucketsResponse, ListBucketsResponseItem,
LocalAliasBucketRequest, LocalAliasBucketResponse, LocalUnaliasBucketRequest,
LocalUnaliasBucketResponse, UpdateBucketRequest, UpdateBucketResponse,
AddGlobalBucketAliasRequest, AddGlobalBucketAliasResponse, RemoveGlobalBucketAliasRequest,
RemoveGlobalBucketAliasResponse, ListBucketsRequest, ListBucketsResponse, ListBucketsResponseItem,
AddLocalBucketAliasRequest, AddLocalBucketAliasResponse, RemoveLocalBucketAliasRequest,
RemoveLocalBucketAliasResponse, UpdateBucketRequest, UpdateBucketResponse,
};
use crate::admin::error::*;
use crate::admin::EndpointHandler;
@@ -453,10 +453,10 @@ pub async fn handle_bucket_change_key_perm(
// ---- BUCKET ALIASES ----
#[async_trait]
impl EndpointHandler for GlobalAliasBucketRequest {
type Response = GlobalAliasBucketResponse;
impl EndpointHandler for AddGlobalBucketAliasRequest {
type Response = AddGlobalBucketAliasResponse;
async fn handle(self, garage: &Arc<Garage>) -> Result<GlobalAliasBucketResponse, Error> {
async fn handle(self, garage: &Arc<Garage>) -> Result<AddGlobalBucketAliasResponse, Error> {
let bucket_id = parse_bucket_id(&self.bucket_id)?;
let helper = garage.locked_helper().await;
@@ -465,17 +465,17 @@ impl EndpointHandler for GlobalAliasBucketRequest {
.set_global_bucket_alias(bucket_id, &self.alias)
.await?;
Ok(GlobalAliasBucketResponse(
Ok(AddGlobalBucketAliasResponse(
bucket_info_results(garage, bucket_id).await?,
))
}
}
#[async_trait]
impl EndpointHandler for GlobalUnaliasBucketRequest {
type Response = GlobalUnaliasBucketResponse;
impl EndpointHandler for RemoveGlobalBucketAliasRequest {
type Response = RemoveGlobalBucketAliasResponse;
async fn handle(self, garage: &Arc<Garage>) -> Result<GlobalUnaliasBucketResponse, Error> {
async fn handle(self, garage: &Arc<Garage>) -> Result<RemoveGlobalBucketAliasResponse, Error> {
let bucket_id = parse_bucket_id(&self.bucket_id)?;
let helper = garage.locked_helper().await;
@@ -484,17 +484,17 @@ impl EndpointHandler for GlobalUnaliasBucketRequest {
.unset_global_bucket_alias(bucket_id, &self.alias)
.await?;
Ok(GlobalUnaliasBucketResponse(
Ok(RemoveGlobalBucketAliasResponse(
bucket_info_results(garage, bucket_id).await?,
))
}
}
#[async_trait]
impl EndpointHandler for LocalAliasBucketRequest {
type Response = LocalAliasBucketResponse;
impl EndpointHandler for AddLocalBucketAliasRequest {
type Response = AddLocalBucketAliasResponse;
async fn handle(self, garage: &Arc<Garage>) -> Result<LocalAliasBucketResponse, Error> {
async fn handle(self, garage: &Arc<Garage>) -> Result<AddLocalBucketAliasResponse, Error> {
let bucket_id = parse_bucket_id(&self.bucket_id)?;
let helper = garage.locked_helper().await;
@@ -503,17 +503,17 @@ impl EndpointHandler for LocalAliasBucketRequest {
.set_local_bucket_alias(bucket_id, &self.access_key_id, &self.alias)
.await?;
Ok(LocalAliasBucketResponse(
Ok(AddLocalBucketAliasResponse(
bucket_info_results(garage, bucket_id).await?,
))
}
}
#[async_trait]
impl EndpointHandler for LocalUnaliasBucketRequest {
type Response = LocalUnaliasBucketResponse;
impl EndpointHandler for RemoveLocalBucketAliasRequest {
type Response = RemoveLocalBucketAliasResponse;
async fn handle(self, garage: &Arc<Garage>) -> Result<LocalUnaliasBucketResponse, Error> {
async fn handle(self, garage: &Arc<Garage>) -> Result<RemoveLocalBucketAliasResponse, Error> {
let bucket_id = parse_bucket_id(&self.bucket_id)?;
let helper = garage.locked_helper().await;
@@ -522,7 +522,7 @@ impl EndpointHandler for LocalUnaliasBucketRequest {
.unset_local_bucket_alias(bucket_id, &self.access_key_id, &self.alias)
.await?;
Ok(LocalUnaliasBucketResponse(
Ok(RemoveLocalBucketAliasResponse(
bucket_info_results(garage, bucket_id).await?,
))
}
src/api/admin/router_v2.rs
+10 -10
View File
@@ -55,10 +55,10 @@ impl AdminApiRequest {
POST BucketAllowKey (body),
POST BucketDenyKey (body),
// Bucket aliases
POST GlobalAliasBucket (body),
POST GlobalUnaliasBucket (body),
POST LocalAliasBucket (body),
POST LocalUnaliasBucket (body),
POST AddGlobalBucketAlias (body),
POST RemoveGlobalBucketAlias (body),
POST AddLocalBucketAlias (body),
POST RemoveLocalBucketAlias (body),
]);
if let Some(message) = query.nonempty_message() {
@@ -174,14 +174,14 @@ impl AdminApiRequest {
Ok(AdminApiRequest::BucketDenyKey(BucketDenyKeyRequest(req)))
}
// Bucket aliasing
Endpoint::GlobalAliasBucket { id, alias } => Ok(AdminApiRequest::GlobalAliasBucket(
GlobalAliasBucketRequest {
Endpoint::GlobalAliasBucket { id, alias } => Ok(AdminApiRequest::AddGlobalBucketAlias(
AddGlobalBucketAliasRequest {
bucket_id: id,
alias,
},
)),
Endpoint::GlobalUnaliasBucket { id, alias } => Ok(
AdminApiRequest::GlobalUnaliasBucket(GlobalUnaliasBucketRequest {
AdminApiRequest::RemoveGlobalBucketAlias(RemoveGlobalBucketAliasRequest {
bucket_id: id,
alias,
}),
@@ -190,7 +190,7 @@ impl AdminApiRequest {
id,
access_key_id,
alias,
} => Ok(AdminApiRequest::LocalAliasBucket(LocalAliasBucketRequest {
} => Ok(AdminApiRequest::AddLocalBucketAlias(AddLocalBucketAliasRequest {
access_key_id,
bucket_id: id,
alias,
@@ -199,8 +199,8 @@ impl AdminApiRequest {
id,
access_key_id,
alias,
} => Ok(AdminApiRequest::LocalUnaliasBucket(
LocalUnaliasBucketRequest {
} => Ok(AdminApiRequest::RemoveLocalBucketAlias(
RemoveLocalBucketAliasRequest {
access_key_id,
bucket_id: id,
alias,