gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-17 09:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

More error refactoring

Browse Source
This commit is contained in:
Alex Auvolat
2022-05-13 19:18:51 +02:00
parent ec16d166f9
commit ea325d78d3
22 changed files with 209 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/admin/bucket.rs
+3 -2
View File
@@ -18,6 +18,7 @@ use garage_model::s3::object_table::ObjectFilter;
use crate::admin::error::*;
use crate::admin::key::ApiBucketKeyPerm;
use crate::common_error::CommonError;
use crate::helpers::parse_json_body;
pub async fn handle_list_buckets(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
@@ -233,7 +234,7 @@ pub async fn handle_create_bucket(
if let Some(alias) = garage.bucket_alias_table.get(&EmptyKey, ga).await? {
if alias.state.get().is_some() {
return Err(Error::BucketAlreadyExists);
return Err(CommonError::BucketAlreadyExists.into());
}
}
}
@@ -333,7 +334,7 @@ pub async fn handle_delete_bucket(
)
.await?;
if !objects.is_empty() {
return Err(Error::BucketNotEmpty);
return Err(CommonError::BucketNotEmpty.into());
}
// --- done checking, now commit ---