diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-05-17 16:48:23 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-05-17 16:48:23 +0200 |
| commit | 8b1338ef2fcd36214c3ad90f5d3585377f28ec86 (patch) | |
| tree | ccaf940e1cb5bc87824a00575bb3cdb031f186b2 /src/api/admin | |
| parent | 8ff95f09c9edf218b6302470cd57868147316e59 (diff) | |
| download | garage-8b1338ef2fcd36214c3ad90f5d3585377f28ec86.tar.gz garage-8b1338ef2fcd36214c3ad90f5d3585377f28ec86.zip | |
Fix error code
Diffstat (limited to 'src/api/admin')
| -rw-r--r-- | src/api/admin/bucket.rs | 2 | ||||
| -rw-r--r-- | src/api/admin/error.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/api/admin/bucket.rs b/src/api/admin/bucket.rs index dacbd427..2c21edee 100644 --- a/src/api/admin/bucket.rs +++ b/src/api/admin/bucket.rs @@ -95,7 +95,7 @@ pub async fn handle_get_bucket_info( .bucket_helper() .resolve_global_bucket_name(&ga) .await? - .ok_or_bad_request("Bucket not found")?, + .ok_or_else(|| HelperError::NoSuchBucket(ga.to_string()))?, _ => { return Err(Error::bad_request( "Either id or globalAlias must be provided (but not both)", diff --git a/src/api/admin/error.rs b/src/api/admin/error.rs index cd7e6af7..592440a5 100644 --- a/src/api/admin/error.rs +++ b/src/api/admin/error.rs @@ -2,7 +2,7 @@ use err_derive::Error; use hyper::header::HeaderValue; 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; pub use crate::common_error::{CommonErrorDerivative, OkOrBadRequest, OkOrInternalError}; |