From 9fa20d45bebab2a3f66b9721c3643dbd607d944d Mon Sep 17 00:00:00 2001
From: Alex Auvolat <lx@deuxfleurs.fr>
Date: Fri, 31 Jan 2025 18:18:04 +0100
Subject: wip: split garage_api into garage_api_{common,s3,k2v,admin}

---
 src/api/s3/post_object.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/api/s3/post_object.rs')

diff --git a/src/api/s3/post_object.rs b/src/api/s3/post_object.rs
index 5279ec6a..6416c523 100644
--- a/src/api/s3/post_object.rs
+++ b/src/api/s3/post_object.rs
@@ -16,15 +16,15 @@ use serde::Deserialize;
 use garage_model::garage::Garage;
 use garage_model::s3::object_table::*;
 
-use crate::helpers::*;
-use crate::s3::api_server::ResBody;
-use crate::s3::checksum::*;
-use crate::s3::cors::*;
-use crate::s3::encryption::EncryptionParams;
-use crate::s3::error::*;
-use crate::s3::put::{get_headers, save_stream, ChecksumMode};
-use crate::s3::xml as s3_xml;
-use crate::signature::payload::{verify_v4, Authorization};
+use crate::api_server::ResBody;
+use crate::checksum::*;
+use crate::cors::*;
+use crate::encryption::EncryptionParams;
+use crate::error::*;
+use crate::put::{get_headers, save_stream, ChecksumMode};
+use crate::xml as s3_xml;
+use garage_api_common::helpers::*;
+use garage_api_common::signature::payload::{verify_v4, Authorization};
 
 pub async fn handle_post_object(
 	garage: Arc<Garage>,
-- 
cgit v1.2.3


From 84f1db91c4e53a8d0c037fd01adb695fd9400ed5 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <lx@deuxfleurs.fr>
Date: Fri, 31 Jan 2025 18:34:57 +0100
Subject: fix things up

---
 src/api/s3/post_object.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/api/s3/post_object.rs')

diff --git a/src/api/s3/post_object.rs b/src/api/s3/post_object.rs
index 6416c523..2bcabf1d 100644
--- a/src/api/s3/post_object.rs
+++ b/src/api/s3/post_object.rs
@@ -16,6 +16,9 @@ use serde::Deserialize;
 use garage_model::garage::Garage;
 use garage_model::s3::object_table::*;
 
+use garage_api_common::helpers::*;
+use garage_api_common::signature::payload::{verify_v4, Authorization};
+
 use crate::api_server::ResBody;
 use crate::checksum::*;
 use crate::cors::*;
@@ -23,8 +26,6 @@ use crate::encryption::EncryptionParams;
 use crate::error::*;
 use crate::put::{get_headers, save_stream, ChecksumMode};
 use crate::xml as s3_xml;
-use garage_api_common::helpers::*;
-use garage_api_common::signature::payload::{verify_v4, Authorization};
 
 pub async fn handle_post_object(
 	garage: Arc<Garage>,
-- 
cgit v1.2.3


From afa28706e5566737376f8448bcc548f780f0f57f Mon Sep 17 00:00:00 2001
From: Alex Auvolat <lx@deuxfleurs.fr>
Date: Fri, 31 Jan 2025 18:42:14 +0100
Subject: split s3/cors.rs into also common/cors.rs

---
 src/api/s3/post_object.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/api/s3/post_object.rs')

diff --git a/src/api/s3/post_object.rs b/src/api/s3/post_object.rs
index 2bcabf1d..6c0e73d4 100644
--- a/src/api/s3/post_object.rs
+++ b/src/api/s3/post_object.rs
@@ -16,12 +16,12 @@ use serde::Deserialize;
 use garage_model::garage::Garage;
 use garage_model::s3::object_table::*;
 
+use garage_api_common::cors::*;
 use garage_api_common::helpers::*;
 use garage_api_common::signature::payload::{verify_v4, Authorization};
 
 use crate::api_server::ResBody;
 use crate::checksum::*;
-use crate::cors::*;
 use crate::encryption::EncryptionParams;
 use crate::error::*;
 use crate::put::{get_headers, save_stream, ChecksumMode};
-- 
cgit v1.2.3