gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-13 23:56:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

admin api: clearer syntax for AddBucketAlias and RemoveBucketAlias

Browse Source
This commit is contained in:
Alex Auvolat
2025-01-29 11:06:45 +01:00
parent 12ea4cda5f
commit 420bbc162d
7 changed files with 79 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/admin/bucket.rs
+17 -19
View File
@@ -16,15 +16,7 @@ use garage_model::permission::*;
use garage_model::s3::mpu_table;
use garage_model::s3::object_table::*;
use crate::admin::api::ApiBucketKeyPerm;
use crate::admin::api::{
AddBucketAliasRequest, AddBucketAliasResponse, AllowBucketKeyRequest, AllowBucketKeyResponse,
ApiBucketQuotas, BucketKeyPermChangeRequest, BucketLocalAlias, CreateBucketRequest,
CreateBucketResponse, DeleteBucketRequest, DeleteBucketResponse, DenyBucketKeyRequest,
DenyBucketKeyResponse, GetBucketInfoKey, GetBucketInfoRequest, GetBucketInfoResponse,
GetBucketInfoWebsiteResponse, ListBucketsRequest, ListBucketsResponse, ListBucketsResponseItem,
RemoveBucketAliasRequest, RemoveBucketAliasResponse, UpdateBucketRequest, UpdateBucketResponse,
};
use crate::admin::api::*;
use crate::admin::error::*;
use crate::admin::EndpointHandler;
use crate::common_error::CommonError;
@@ -459,15 +451,18 @@ impl EndpointHandler for AddBucketAliasRequest {
let helper = garage.locked_helper().await;
match self.access_key_id {
None => {
match self.alias {
BucketAliasEnum::Global { global_alias } => {
helper
.set_global_bucket_alias(bucket_id, &self.alias)
.set_global_bucket_alias(bucket_id, &global_alias)
.await?;
}
Some(ak) => {
BucketAliasEnum::Local {
local_alias,
access_key_id,
} => {
helper
.set_local_bucket_alias(bucket_id, &ak, &self.alias)
.set_local_bucket_alias(bucket_id, &access_key_id, &local_alias)
.await?;
}
}
@@ -487,15 +482,18 @@ impl EndpointHandler for RemoveBucketAliasRequest {
let helper = garage.locked_helper().await;
match self.access_key_id {
None => {
match self.alias {
BucketAliasEnum::Global { global_alias } => {
helper
.unset_global_bucket_alias(bucket_id, &self.alias)
.unset_global_bucket_alias(bucket_id, &global_alias)
.await?;
}
Some(ak) => {
BucketAliasEnum::Local {
local_alias,
access_key_id,
} => {
helper
.unset_local_bucket_alias(bucket_id, &ak, &self.alias)
.unset_local_bucket_alias(bucket_id, &access_key_id, &local_alias)
.await?;
}
}