1 files changed, 12 insertions, 8 deletions
diff --git a/src/api/s3/put.rs b/src/api/s3/put.rs
index 606facc4..3d43eee8 100644
--- a/src/api/s3/put.rs
+++ b/src/api/s3/put.rs
@@ -4,7 +4,8 @@ use std::sync::Arc;
 use base64::prelude::*;
 use futures::prelude::*;
 use futures::try_join;
-use hyper::body::{Body, Bytes};
+use http_body_util::BodyStream;
+use hyper::body::Bytes;
 use hyper::header::{HeaderMap, HeaderValue};
 use hyper::{Request, Response};
 use md5::{digest::generic_array::*, Digest as Md5Digest, Md5};
@@ -30,15 +31,17 @@ use garage_model::s3::block_ref_table::*;
 use garage_model::s3::object_table::*;
 use garage_model::s3::version_table::*;
 
+use crate::helpers::*;
+use crate::s3::api_server::{ReqBody, ResBody};
 use crate::s3::error::*;
 
 pub async fn handle_put(
 	garage: Arc<Garage>,
-	req: Request<Body>,
+	req: Request<ReqBody>,
 	bucket: &Bucket,
 	key: &String,
 	content_sha256: Option<Hash>,
-) -> Result<Response<Body>, Error> {
+) -> Result<Response<ResBody>, Error> {
 	// Retrieve interesting headers from request
 	let headers = get_headers(req.headers())?;
 	debug!("Object headers: {:?}", headers);
@@ -48,13 +51,14 @@ pub async fn handle_put(
 		None => None,
 	};
 
-	let (_head, body) = req.into_parts();
-	let body = body.map_err(Error::from);
+	let body_stream = BodyStream::new(req.into_body())
+		.map(|x| x.map(|f| f.into_data().unwrap())) //TODO remove unwrap
+		.map_err(Error::from);
 
 	save_stream(
 		garage,
 		headers,
-		body,
+		body_stream,
 		bucket,
 		key,
 		content_md5,
@@ -434,11 +438,11 @@ impl<S: Stream<Item = Result<Bytes, Error>> + Unpin> StreamChunker<S> {
 	}
 }
 
-pub fn put_response(version_uuid: Uuid, md5sum_hex: String) -> Response<Body> {
+pub fn put_response(version_uuid: Uuid, md5sum_hex: String) -> Response<ResBody> {
 	Response::builder()
 		.header("x-amz-version-id", hex::encode(version_uuid))
 		.header("ETag", format!("\"{}\"", md5sum_hex))
-		.body(Body::from(vec![]))
+		.body(empty_body())
 		.unwrap()
 }