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 precisions in errors & small refactoring

Browse Source
This commit is contained in:
Alex Auvolat
2022-05-13 19:36:17 +02:00
parent 5a535788fc
commit 8033bdb0b4
6 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/admin/error.rs
+9 -7
View File
@@ -18,8 +18,8 @@ pub enum Error {
// Category: cannot process
/// The API access key does not exist
#[error(display = "Access key not found")]
NoSuchAccessKey,
#[error(display = "Access key not found: {}", _0)]
NoSuchAccessKey(String),
}
impl<T> From<T> for Error
@@ -38,9 +38,11 @@ impl From<HelperError> for Error {
match err {
HelperError::Internal(i) => Self::CommonError(CommonError::InternalError(i)),
HelperError::BadRequest(b) => Self::CommonError(CommonError::BadRequest(b)),
HelperError::InvalidBucketName(_) => Self::CommonError(CommonError::InvalidBucketName),
HelperError::NoSuchBucket(_) => Self::CommonError(CommonError::NoSuchBucket),
HelperError::NoSuchAccessKey(_) => Self::NoSuchAccessKey,
HelperError::InvalidBucketName(n) => {
Self::CommonError(CommonError::InvalidBucketName(n))
}
HelperError::NoSuchBucket(n) => Self::CommonError(CommonError::NoSuchBucket(n)),
HelperError::NoSuchAccessKey(n) => Self::NoSuchAccessKey(n),
}
}
}
@@ -49,7 +51,7 @@ impl Error {
fn code(&self) -> &'static str {
match self {
Error::CommonError(c) => c.aws_code(),
Error::NoSuchAccessKey => "NoSuchAccessKey",
Error::NoSuchAccessKey(_) => "NoSuchAccessKey",
}
}
}
@@ -59,7 +61,7 @@ impl ApiError for Error {
fn http_status_code(&self) -> StatusCode {
match self {
Error::CommonError(c) => c.http_status_code(),
Error::NoSuchAccessKey => StatusCode::NOT_FOUND,
Error::NoSuchAccessKey(_) => StatusCode::NOT_FOUND,
}
}