diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-02-07 15:25:49 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-02-07 15:32:51 +0100 |
| commit | e011941964b1c1e0b90f85014d166d64a83ae8e2 (patch) | |
| tree | 5c5cef9af72d48dd7347922341e43f0013380c60 /src/api/s3/put.rs | |
| parent | 53746b59e525ff5f518ed59d7831b05e2732785d (diff) | |
| download | garage-e011941964b1c1e0b90f85014d166d64a83ae8e2.tar.gz garage-e011941964b1c1e0b90f85014d166d64a83ae8e2.zip | |
[dep-upgrade-202402] refactor use of BodyStream
Diffstat (limited to 'src/api/s3/put.rs')
| -rw-r--r-- | src/api/s3/put.rs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/api/s3/put.rs b/src/api/s3/put.rs index 3d43eee8..17424862 100644 --- a/src/api/s3/put.rs +++ b/src/api/s3/put.rs @@ -4,13 +4,13 @@ use std::sync::Arc; use base64::prelude::*; use futures::prelude::*; use futures::try_join; -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}; use sha2::Sha256; +use hyper::body::{Body, Bytes}; +use hyper::header::{HeaderMap, HeaderValue}; +use hyper::{Request, Response}; + use opentelemetry::{ trace::{FutureExt as OtelFutureExt, TraceContextExt, Tracer}, Context, @@ -51,14 +51,12 @@ pub async fn handle_put( None => None, }; - let body_stream = BodyStream::new(req.into_body()) - .map(|x| x.map(|f| f.into_data().unwrap())) //TODO remove unwrap - .map_err(Error::from); + let stream = body_stream(req.into_body()); save_stream( garage, headers, - body_stream, + stream, bucket, key, content_md5, |