forked from Deuxfleurs/garage
**Spec:** - [x] Start writing - [x] Specify all layout endpoints - [x] Specify all endpoints for operations on keys - [x] Specify all endpoints for operations on key/bucket permissions - [x] Specify all endpoints for operations on buckets - [x] Specify all endpoints for operations on bucket aliases View rendered spec at <https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/admin-api/doc/drafts/admin-api.md> **Code:** - [x] Refactor code for admin api to use common api code that was created for K2V **General endpoints:** - [x] Metrics - [x] GetClusterStatus - [x] ConnectClusterNodes - [x] GetClusterLayout - [x] UpdateClusterLayout - [x] ApplyClusterLayout - [x] RevertClusterLayout **Key-related endpoints:** - [x] ListKeys - [x] CreateKey - [x] ImportKey - [x] GetKeyInfo - [x] UpdateKey - [x] DeleteKey **Bucket-related endpoints:** - [x] ListBuckets - [x] CreateBucket - [x] GetBucketInfo - [x] DeleteBucket - [x] PutBucketWebsite - [x] DeleteBucketWebsite **Operations on key/bucket permissions:** - [x] BucketAllowKey - [x] BucketDenyKey **Operations on bucket aliases:** - [x] GlobalAliasBucket - [x] GlobalUnaliasBucket - [x] LocalAliasBucket - [x] LocalUnaliasBucket **And also:** - [x] Separate error type for the admin API (this PR includes a quite big refactoring of error handling) - [x] Add management of website access - [ ] Check that nothing is missing wrt what can be done using the CLI - [ ] Improve formatting of the spec - [x] Make sure everyone is cool with the API design Fix #231 Fix #295 Co-authored-by: Alex Auvolat <alex@adnab.me> Reviewed-on: Deuxfleurs/garage#298 Co-authored-by: Alex <alex@adnab.me> Co-committed-by: Alex <alex@adnab.me>
49 lines
1.1 KiB
Rust
49 lines
1.1 KiB
Rust
use err_derive::Error;
|
|
use hyper::header::HeaderValue;
|
|
use hyper::{HeaderMap, StatusCode};
|
|
|
|
use garage_api::generic_server::ApiError;
|
|
|
|
/// Errors of this crate
|
|
#[derive(Debug, Error)]
|
|
pub enum Error {
|
|
/// An error received from the API crate
|
|
#[error(display = "API error: {}", _0)]
|
|
ApiError(garage_api::s3::error::Error),
|
|
|
|
/// The file does not exist
|
|
#[error(display = "Not found")]
|
|
NotFound,
|
|
|
|
/// The client sent a request without host, or with unsupported method
|
|
#[error(display = "Bad request: {}", _0)]
|
|
BadRequest(String),
|
|
}
|
|
|
|
impl<T> From<T> for Error
|
|
where
|
|
garage_api::s3::error::Error: From<T>,
|
|
{
|
|
fn from(err: T) -> Self {
|
|
Error::ApiError(garage_api::s3::error::Error::from(err))
|
|
}
|
|
}
|
|
|
|
impl Error {
|
|
/// Transform errors into http status code
|
|
pub fn http_status_code(&self) -> StatusCode {
|
|
match self {
|
|
Error::NotFound => StatusCode::NOT_FOUND,
|
|
Error::ApiError(e) => e.http_status_code(),
|
|
Error::BadRequest(_) => StatusCode::BAD_REQUEST,
|
|
}
|
|
}
|
|
|
|
pub fn add_headers(&self, header_map: &mut HeaderMap<HeaderValue>) {
|
|
#[allow(clippy::single_match)]
|
|
match self {
|
|
Error::ApiError(e) => e.add_http_headers(header_map),
|
|
_ => (),
|
|
}
|
|
}
|
|
}
|