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)]

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;

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;
 

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(

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";
 

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.

src/api/k2v/router.rs

@@ -1,4 +1,4 @@
-use crate::error::*;
+use crate::s3::error::*;
 
 use std::borrow::Cow;
 

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;

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;

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;
 

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};

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;
 

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;
 

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";
 

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;

src/api/s3/mod.rs

@@ -1,4 +1,5 @@
 pub mod api_server;
+pub mod error;
 
 mod bucket;
 mod copy;

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;

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;
 

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};
 

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;
 

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<T: Serialize>(x: &T) -> Result<String, ApiError> {
 	let mut xml = r#"<?xml version="1.0" encoding="UTF-8"?>"#.to_string();

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;

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,

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,

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<T> From<T> for Error
 where
-	garage_api::Error: From<T>,
+	garage_api::s3::error::Error: From<T>,
 {
 	fn from(err: T) -> Self {
-		Error::ApiError(garage_api::Error::from(err))
+		Error::ApiError(garage_api::s3::error::Error::from(err))
 	}
 }
 

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};