Deuxfleurs/garage
48
55
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

more complete admin API #298

Merged
lx merged 48 commits from admin-api into main 2022-05-24 10:16:40 +00:00
Conversation 0 Commits 48 Files changed 65 +3 -9
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 30e393b439 - Show all commits

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

@ -45,9 +45,7 @@ impl From<HelperError> for Error {
match err { match err {
HelperError::Internal(i) => Self::Common(CommonError::InternalError(i)), HelperError::Internal(i) => Self::Common(CommonError::InternalError(i)),
HelperError::BadRequest(b) => Self::Common(CommonError::BadRequest(b)), HelperError::BadRequest(b) => Self::Common(CommonError::BadRequest(b)),
HelperError::InvalidBucketName(n) => { HelperError::InvalidBucketName(n) => Self::Common(CommonError::InvalidBucketName(n)),
Self::Common(CommonError::InvalidBucketName(n))
}
HelperError::NoSuchBucket(n) => Self::Common(CommonError::NoSuchBucket(n)), HelperError::NoSuchBucket(n) => Self::Common(CommonError::NoSuchBucket(n)),
HelperError::NoSuchAccessKey(n) => Self::NoSuchAccessKey(n), HelperError::NoSuchAccessKey(n) => Self::NoSuchAccessKey(n),
} }

4
src/api/k2v/error.rs
View file

@ -59,9 +59,7 @@ impl From<HelperError> for Error {
match err { match err {
HelperError::Internal(i) => Self::Common(CommonError::InternalError(i)), HelperError::Internal(i) => Self::Common(CommonError::InternalError(i)),
HelperError::BadRequest(b) => Self::Common(CommonError::BadRequest(b)), HelperError::BadRequest(b) => Self::Common(CommonError::BadRequest(b)),
HelperError::InvalidBucketName(n) => { HelperError::InvalidBucketName(n) => Self::Common(CommonError::InvalidBucketName(n)),
Self::Common(CommonError::InvalidBucketName(n))
}
HelperError::NoSuchBucket(n) => Self::Common(CommonError::NoSuchBucket(n)), HelperError::NoSuchBucket(n) => Self::Common(CommonError::NoSuchBucket(n)),
e => Self::Common(CommonError::BadRequest(format!("{}", e))), e => Self::Common(CommonError::BadRequest(format!("{}", e))),
} }

4
src/api/s3/error.rs
View file

@ -91,9 +91,7 @@ impl From<HelperError> for Error {
match err { match err {
HelperError::Internal(i) => Self::Common(CommonError::InternalError(i)), HelperError::Internal(i) => Self::Common(CommonError::InternalError(i)),
HelperError::BadRequest(b) => Self::Common(CommonError::BadRequest(b)), HelperError::BadRequest(b) => Self::Common(CommonError::BadRequest(b)),
HelperError::InvalidBucketName(n) => { HelperError::InvalidBucketName(n) => Self::Common(CommonError::InvalidBucketName(n)),
Self::Common(CommonError::InvalidBucketName(n))
}
HelperError::NoSuchBucket(n) => Self::Common(CommonError::NoSuchBucket(n)), HelperError::NoSuchBucket(n) => Self::Common(CommonError::NoSuchBucket(n)),
e => Self::bad_request(format!("{}", e)), e => Self::bad_request(format!("{}", e)),
} }