From f82b938033f1a01a136315b5f37ecb89b78bca0c Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Fri, 13 May 2022 15:10:52 +0200 Subject: [PATCH] Rename error::Error to s3::error::Error --- src/api/helpers.rs | 2 +- src/api/k2v/api_server.rs | 2 +- src/api/k2v/batch.rs | 2 +- src/api/k2v/index.rs | 2 +- src/api/k2v/item.rs | 2 +- src/api/k2v/range.rs | 2 +- src/api/k2v/router.rs | 2 +- src/api/lib.rs | 2 -- src/api/s3/api_server.rs | 2 +- src/api/s3/bucket.rs | 2 +- src/api/s3/copy.rs | 2 +- src/api/s3/cors.rs | 2 +- src/api/s3/delete.rs | 2 +- src/api/{ => s3}/error.rs | 0 src/api/s3/get.rs | 2 +- src/api/s3/list.rs | 2 +- src/api/s3/mod.rs | 1 + src/api/s3/post_object.rs | 2 +- src/api/s3/put.rs | 2 +- src/api/s3/router.rs | 2 +- src/api/s3/website.rs | 2 +- src/api/s3/xml.rs | 2 +- src/api/signature/mod.rs | 2 +- src/api/signature/payload.rs | 2 +- src/api/signature/streaming.rs | 2 +- src/web/error.rs | 6 +++--- src/web/web_server.rs | 2 +- 27 files changed, 27 insertions(+), 28 deletions(-) rename src/api/{ => s3}/error.rs (100%) diff --git a/src/api/helpers.rs b/src/api/helpers.rs index e94e8b00..121fbd5a 100644 --- a/src/api/helpers.rs +++ b/src/api/helpers.rs @@ -7,7 +7,7 @@ use garage_util::data::*; use garage_model::garage::Garage; use garage_model::key_table::Key; -use crate::error::*; +use crate::s3::error::*; /// What kind of authorization is required to perform a given action #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/src/api/k2v/api_server.rs b/src/api/k2v/api_server.rs index b14bcda6..9b4ad882 100644 --- a/src/api/k2v/api_server.rs +++ b/src/api/k2v/api_server.rs @@ -12,7 +12,7 @@ use garage_util::error::Error as GarageError; use garage_model::garage::Garage; -use crate::error::*; +use crate::s3::error::*; use crate::generic_server::*; use crate::signature::payload::check_payload_signature; diff --git a/src/api/k2v/batch.rs b/src/api/k2v/batch.rs index 26d3cef0..dab3bfb2 100644 --- a/src/api/k2v/batch.rs +++ b/src/api/k2v/batch.rs @@ -12,7 +12,7 @@ use garage_model::garage::Garage; use garage_model::k2v::causality::*; use garage_model::k2v::item_table::*; -use crate::error::*; +use crate::s3::error::*; use crate::helpers::*; use crate::k2v::range::read_range; diff --git a/src/api/k2v/index.rs b/src/api/k2v/index.rs index 896dbcf0..e587841c 100644 --- a/src/api/k2v/index.rs +++ b/src/api/k2v/index.rs @@ -12,7 +12,7 @@ use garage_table::util::*; use garage_model::garage::Garage; use garage_model::k2v::counter_table::{BYTES, CONFLICTS, ENTRIES, VALUES}; -use crate::error::*; +use crate::s3::error::*; use crate::k2v::range::read_range; pub async fn handle_read_index( diff --git a/src/api/k2v/item.rs b/src/api/k2v/item.rs index 1860863e..95624d57 100644 --- a/src/api/k2v/item.rs +++ b/src/api/k2v/item.rs @@ -10,7 +10,7 @@ use garage_model::garage::Garage; use garage_model::k2v::causality::*; use garage_model::k2v::item_table::*; -use crate::error::*; +use crate::s3::error::*; pub const X_GARAGE_CAUSALITY_TOKEN: &str = "X-Garage-Causality-Token"; diff --git a/src/api/k2v/range.rs b/src/api/k2v/range.rs index 8d4cefbc..cf6034b9 100644 --- a/src/api/k2v/range.rs +++ b/src/api/k2v/range.rs @@ -7,7 +7,7 @@ use std::sync::Arc; use garage_table::replication::TableShardedReplication; use garage_table::*; -use crate::error::*; +use crate::s3::error::*; use crate::helpers::key_after_prefix; /// Read range in a Garage table. diff --git a/src/api/k2v/router.rs b/src/api/k2v/router.rs index 611b6629..c509a4da 100644 --- a/src/api/k2v/router.rs +++ b/src/api/k2v/router.rs @@ -1,4 +1,4 @@ -use crate::error::*; +use crate::s3::error::*; use std::borrow::Cow; diff --git a/src/api/lib.rs b/src/api/lib.rs index 5bc2a18e..370dfd7a 100644 --- a/src/api/lib.rs +++ b/src/api/lib.rs @@ -3,8 +3,6 @@ extern crate tracing; pub mod common_error; -pub mod error; -pub use error::Error; mod encoding; pub mod generic_server; diff --git a/src/api/s3/api_server.rs b/src/api/s3/api_server.rs index af9f03e7..77ac3879 100644 --- a/src/api/s3/api_server.rs +++ b/src/api/s3/api_server.rs @@ -14,7 +14,7 @@ use garage_util::error::Error as GarageError; use garage_model::garage::Garage; use garage_model::key_table::Key; -use crate::error::*; +use crate::s3::error::*; use crate::generic_server::*; use crate::signature::payload::check_payload_signature; diff --git a/src/api/s3/bucket.rs b/src/api/s3/bucket.rs index 6ecda2cd..d4a6b0cb 100644 --- a/src/api/s3/bucket.rs +++ b/src/api/s3/bucket.rs @@ -14,7 +14,7 @@ use garage_util::crdt::*; use garage_util::data::*; use garage_util::time::*; -use crate::error::*; +use crate::s3::error::*; use crate::s3::xml as s3_xml; use crate::signature::verify_signed_content; diff --git a/src/api/s3/copy.rs b/src/api/s3/copy.rs index 825b8fc0..abd90f4a 100644 --- a/src/api/s3/copy.rs +++ b/src/api/s3/copy.rs @@ -18,7 +18,7 @@ use garage_model::s3::block_ref_table::*; use garage_model::s3::object_table::*; use garage_model::s3::version_table::*; -use crate::error::*; +use crate::s3::error::*; use crate::helpers::{parse_bucket_key, resolve_bucket}; use crate::s3::put::{decode_upload_id, get_headers}; use crate::s3::xml::{self as s3_xml, xmlns_tag}; diff --git a/src/api/s3/cors.rs b/src/api/s3/cors.rs index 37ea2e43..1ad4f2f8 100644 --- a/src/api/s3/cors.rs +++ b/src/api/s3/cors.rs @@ -9,7 +9,7 @@ use hyper::{header::HeaderName, Body, Method, Request, Response, StatusCode}; use serde::{Deserialize, Serialize}; -use crate::error::*; +use crate::s3::error::*; use crate::s3::xml::{to_xml_with_header, xmlns_tag, IntValue, Value}; use crate::signature::verify_signed_content; diff --git a/src/api/s3/delete.rs b/src/api/s3/delete.rs index 1e3f1249..5065b285 100644 --- a/src/api/s3/delete.rs +++ b/src/api/s3/delete.rs @@ -8,7 +8,7 @@ use garage_util::time::*; use garage_model::garage::Garage; use garage_model::s3::object_table::*; -use crate::error::*; +use crate::s3::error::*; use crate::s3::xml as s3_xml; use crate::signature::verify_signed_content; diff --git a/src/api/error.rs b/src/api/s3/error.rs similarity index 100% rename from src/api/error.rs rename to src/api/s3/error.rs diff --git a/src/api/s3/get.rs b/src/api/s3/get.rs index 794bd4e9..7fa1a177 100644 --- a/src/api/s3/get.rs +++ b/src/api/s3/get.rs @@ -17,7 +17,7 @@ use garage_model::garage::Garage; use garage_model::s3::object_table::*; use garage_model::s3::version_table::*; -use crate::error::*; +use crate::s3::error::*; const X_AMZ_MP_PARTS_COUNT: &str = "x-amz-mp-parts-count"; diff --git a/src/api/s3/list.rs b/src/api/s3/list.rs index d97aafe5..b4ba5bcd 100644 --- a/src/api/s3/list.rs +++ b/src/api/s3/list.rs @@ -16,7 +16,7 @@ use garage_model::s3::version_table::Version; use garage_table::{EmptyKey, EnumerationOrder}; use crate::encoding::*; -use crate::error::*; +use crate::s3::error::*; use crate::helpers::key_after_prefix; use crate::s3::put as s3_put; use crate::s3::xml as s3_xml; diff --git a/src/api/s3/mod.rs b/src/api/s3/mod.rs index 3f5c1915..7b56d4d8 100644 --- a/src/api/s3/mod.rs +++ b/src/api/s3/mod.rs @@ -1,4 +1,5 @@ pub mod api_server; +pub mod error; mod bucket; mod copy; diff --git a/src/api/s3/post_object.rs b/src/api/s3/post_object.rs index 91648a19..343aa366 100644 --- a/src/api/s3/post_object.rs +++ b/src/api/s3/post_object.rs @@ -14,7 +14,7 @@ use serde::Deserialize; use garage_model::garage::Garage; -use crate::error::*; +use crate::s3::error::*; use crate::helpers::resolve_bucket; use crate::s3::put::{get_headers, save_stream}; use crate::s3::xml as s3_xml; diff --git a/src/api/s3/put.rs b/src/api/s3/put.rs index d50e32b0..660a8858 100644 --- a/src/api/s3/put.rs +++ b/src/api/s3/put.rs @@ -19,7 +19,7 @@ use garage_model::s3::block_ref_table::*; use garage_model::s3::object_table::*; use garage_model::s3::version_table::*; -use crate::error::*; +use crate::s3::error::*; use crate::s3::xml as s3_xml; use crate::signature::verify_signed_content; diff --git a/src/api/s3/router.rs b/src/api/s3/router.rs index e920e162..b12c63a7 100644 --- a/src/api/s3/router.rs +++ b/src/api/s3/router.rs @@ -3,7 +3,7 @@ use std::borrow::Cow; use hyper::header::HeaderValue; use hyper::{HeaderMap, Method, Request}; -use crate::error::{Error, OkOrBadRequest}; +use crate::s3::error::{Error, OkOrBadRequest}; use crate::helpers::Authorization; use crate::router_macros::{generateQueryParameters, router_match}; diff --git a/src/api/s3/website.rs b/src/api/s3/website.rs index 4fc7b7bb..b2582c4b 100644 --- a/src/api/s3/website.rs +++ b/src/api/s3/website.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use hyper::{Body, Request, Response, StatusCode}; use serde::{Deserialize, Serialize}; -use crate::error::*; +use crate::s3::error::*; use crate::s3::xml::{to_xml_with_header, xmlns_tag, IntValue, Value}; use crate::signature::verify_signed_content; diff --git a/src/api/s3/xml.rs b/src/api/s3/xml.rs index 75ec4559..111657a0 100644 --- a/src/api/s3/xml.rs +++ b/src/api/s3/xml.rs @@ -1,7 +1,7 @@ use quick_xml::se::to_string; use serde::{Deserialize, Serialize, Serializer}; -use crate::Error as ApiError; +use crate::s3::error::Error as ApiError; pub fn to_xml_with_header(x: &T) -> Result { let mut xml = r#""#.to_string(); diff --git a/src/api/signature/mod.rs b/src/api/signature/mod.rs index e3554080..4679747f 100644 --- a/src/api/signature/mod.rs +++ b/src/api/signature/mod.rs @@ -4,7 +4,7 @@ use sha2::Sha256; use garage_util::data::{sha256sum, Hash}; -use crate::error::*; +use crate::s3::error::*; pub mod payload; pub mod streaming; diff --git a/src/api/signature/payload.rs b/src/api/signature/payload.rs index 52c4d401..47445bc7 100644 --- a/src/api/signature/payload.rs +++ b/src/api/signature/payload.rs @@ -15,7 +15,7 @@ use super::LONG_DATETIME; use super::{compute_scope, signing_hmac}; use crate::encoding::uri_encode; -use crate::error::*; +use crate::s3::error::*; pub async fn check_payload_signature( garage: &Garage, diff --git a/src/api/signature/streaming.rs b/src/api/signature/streaming.rs index 6c326c54..06a0512e 100644 --- a/src/api/signature/streaming.rs +++ b/src/api/signature/streaming.rs @@ -12,7 +12,7 @@ use garage_util::data::Hash; use super::{compute_scope, sha256sum, HmacSha256, LONG_DATETIME}; -use crate::error::*; +use crate::s3::error::*; pub fn parse_streaming_body( api_key: &Key, diff --git a/src/web/error.rs b/src/web/error.rs index 478731b5..bd8f17b5 100644 --- a/src/web/error.rs +++ b/src/web/error.rs @@ -9,7 +9,7 @@ use garage_api::generic_server::ApiError; pub enum Error { /// An error received from the API crate #[error(display = "API error: {}", _0)] - ApiError(garage_api::Error), + ApiError(garage_api::s3::error::Error), /// The file does not exist #[error(display = "Not found")] @@ -22,10 +22,10 @@ pub enum Error { impl From for Error where - garage_api::Error: From, + garage_api::s3::error::Error: From, { fn from(err: T) -> Self { - Error::ApiError(garage_api::Error::from(err)) + Error::ApiError(garage_api::s3::error::Error::from(err)) } } diff --git a/src/web/web_server.rs b/src/web/web_server.rs index e83bc4cb..dad98dfc 100644 --- a/src/web/web_server.rs +++ b/src/web/web_server.rs @@ -18,7 +18,7 @@ use opentelemetry::{ use crate::error::*; -use garage_api::error::{Error as ApiError, OkOrBadRequest, OkOrInternalError}; +use garage_api::s3::error::{Error as ApiError, OkOrBadRequest, OkOrInternalError}; use garage_api::helpers::{authority_to_host, host_to_bucket}; use garage_api::s3::cors::{add_cors_headers, find_matching_cors_rule, handle_options_for_bucket}; use garage_api::s3::get::{handle_get, handle_head};