diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-05-13 15:04:53 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-05-13 15:04:53 +0200 |
| commit | 96b11524d53b3616a28f33e2b057655be1639f6f (patch) | |
| tree | 324a8a9624c5b861fb5a09b0ae0e0c07f6b9614c /src/api/admin | |
| parent | c0fb9fd0fe553e5eda39dcb1a09f059bcd631b6c (diff) | |
| download | garage-96b11524d53b3616a28f33e2b057655be1639f6f.tar.gz garage-96b11524d53b3616a28f33e2b057655be1639f6f.zip | |
Error refactoring
Diffstat (limited to 'src/api/admin')
| -rw-r--r-- | src/api/admin/api_server.rs | 2 | ||||
| -rw-r--r-- | src/api/admin/bucket.rs | 4 | ||||
| -rw-r--r-- | src/api/admin/error.rs | 13 | ||||
| -rw-r--r-- | src/api/admin/mod.rs | 7 |
4 files changed, 15 insertions, 11 deletions
diff --git a/src/api/admin/api_server.rs b/src/api/admin/api_server.rs index b344a51b..b2effa62 100644 --- a/src/api/admin/api_server.rs +++ b/src/api/admin/api_server.rs @@ -17,9 +17,9 @@ use garage_util::error::Error as GarageError; use crate::generic_server::*; -use crate::admin::error::*; use crate::admin::bucket::*; use crate::admin::cluster::*; +use crate::admin::error::*; use crate::admin::key::*; use crate::admin::router::{Authorization, Endpoint}; diff --git a/src/api/admin/bucket.rs b/src/api/admin/bucket.rs index 1ecb66ab..db1fda0f 100644 --- a/src/api/admin/bucket.rs +++ b/src/api/admin/bucket.rs @@ -16,8 +16,8 @@ use garage_model::garage::Garage; use garage_model::permission::*; use garage_model::s3::object_table::ObjectFilter; -use crate::admin::key::ApiBucketKeyPerm; use crate::admin::error::*; +use crate::admin::key::ApiBucketKeyPerm; use crate::admin::parse_json_body; pub async fn handle_list_buckets(garage: &Arc<Garage>) -> Result<Response<Body>, Error> { @@ -98,7 +98,7 @@ pub async fn handle_get_bucket_info( .ok_or_bad_request("Bucket not found")?, _ => { 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)", )); } }; diff --git a/src/api/admin/error.rs b/src/api/admin/error.rs index 3e488d8d..1f49fed5 100644 --- a/src/api/admin/error.rs +++ b/src/api/admin/error.rs @@ -3,10 +3,10 @@ use hyper::header::HeaderValue; use hyper::{Body, HeaderMap, StatusCode}; use garage_model::helper::error::Error as HelperError; -use garage_util::error::Error as GarageError; use crate::generic_server::ApiError; -pub use crate::common_error::*; +use crate::common_error::CommonError; +pub use crate::common_error::{OkOrBadRequest, OkOrInternalError}; /// Errors of this crate #[derive(Debug, Error)] @@ -47,7 +47,9 @@ pub enum Error { } impl<T> From<T> for Error -where CommonError: From<T> { +where + CommonError: From<T>, +{ fn from(err: T) -> Self { Error::CommonError(CommonError::from(err)) } @@ -83,7 +85,10 @@ impl ApiError for Error { } fn http_body(&self, garage_region: &str, path: &str) -> Body { - Body::from(format!("ERROR: {}\n\ngarage region: {}\npath: {}", self, garage_region, path)) + Body::from(format!( + "ERROR: {}\n\ngarage region: {}\npath: {}", + self, garage_region, path + )) } } diff --git a/src/api/admin/mod.rs b/src/api/admin/mod.rs index 68839039..73700e6e 100644 --- a/src/api/admin/mod.rs +++ b/src/api/admin/mod.rs @@ -1,14 +1,13 @@ pub mod api_server; -mod router; mod error; +mod router; mod bucket; mod cluster; mod key; - -use serde::{Deserialize}; -use hyper::{Request, Body}; +use hyper::{Body, Request}; +use serde::Deserialize; use error::*; |