diff options
Diffstat (limited to 'src/api/s3/error.rs')
| -rw-r--r-- | src/api/s3/error.rs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/api/s3/error.rs b/src/api/s3/error.rs index 2855e0b3..22d2fe14 100644 --- a/src/api/s3/error.rs +++ b/src/api/s3/error.rs @@ -4,7 +4,10 @@ use err_derive::Error; use hyper::header::HeaderValue; use hyper::{HeaderMap, StatusCode}; -use crate::common_error::CommonError; +use garage_model::helper::error::Error as HelperError; + +pub(crate) use crate::common_error::pass_helper_error; +use crate::common_error::{helper_error_as_internal, CommonError}; pub use crate::common_error::{CommonErrorDerivative, OkOrBadRequest, OkOrInternalError}; use crate::generic_server::ApiError; use crate::helpers::*; @@ -87,6 +90,14 @@ where } } +// Helper errors are always passed as internal errors by default. +// To pass the specific error code back to the client, use `pass_helper_error`. +impl From<HelperError> for Error { + fn from(err: HelperError) -> Error { + Error::Common(helper_error_as_internal(err)) + } +} + impl CommonErrorDerivative for Error {} impl From<roxmltree::Error> for Error { |