asonix/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Pull requests Activity

Fix error code

Browse source
This commit is contained in:
Alex 2022-05-17 16:48:23 +02:00
parent 8ff95f09c9
commit 8b1338ef2f
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/admin/bucket.rs
View file

@ -95,7 +95,7 @@ pub async fn handle_get_bucket_info(
.bucket_helper() .bucket_helper()
.resolve_global_bucket_name(&ga) .resolve_global_bucket_name(&ga)
.await? .await?
.ok_or_bad_request("Bucket not found")?, .ok_or_else(|| HelperError::NoSuchBucket(ga.to_string()))?,
_ => { _ => {
return Err(Error::bad_request( return Err(Error::bad_request(
"Either id or globalAlias must be provided (but not both)", "Either id or globalAlias must be provided (but not both)",

2
src/api/admin/error.rs
View file

@ -2,7 +2,7 @@ use err_derive::Error;
use hyper::header::HeaderValue; use hyper::header::HeaderValue;
use hyper::{Body, HeaderMap, StatusCode}; use hyper::{Body, HeaderMap, StatusCode};
use garage_model::helper::error::Error as HelperError; pub use garage_model::helper::error::Error as HelperError;
use crate::common_error::CommonError; use crate::common_error::CommonError;
pub use crate::common_error::{CommonErrorDerivative, OkOrBadRequest, OkOrInternalError}; pub use crate::common_error::{CommonErrorDerivative, OkOrBadRequest, OkOrInternalError};