Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions s3/src/bucket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1664,7 +1664,7 @@ impl Bucket {
}

let msg = self
.initiate_multipart_upload(s3_path, content_type)
.initiate_multipart_upload(s3_path, content_type, custom_headers)
.await?;
let path = msg.key;
let upload_id = &msg.upload_id;
Expand Down Expand Up @@ -1806,7 +1806,7 @@ impl Bucket {
s3_path: &str,
content_type: &str,
) -> Result<u16, S3Error> {
let msg = self.initiate_multipart_upload(s3_path, content_type)?;
let msg = self.initiate_multipart_upload(s3_path, content_type, None)?;
let path = msg.key;
let upload_id = &msg.upload_id;

Expand Down Expand Up @@ -1859,8 +1859,12 @@ impl Bucket {
&self,
s3_path: &str,
content_type: &str,
custom_headers: Option<HeaderMap>,
) -> Result<InitiateMultipartUploadResponse, S3Error> {
let command = Command::InitiateMultipartUpload { content_type };
let command = Command::InitiateMultipartUpload {
content_type,
custom_headers,
};
let request = RequestImpl::new(self, s3_path, command).await?;
let response_data = request.response_data(false).await?;
if response_data.status_code() >= 300 {
Expand All @@ -1877,8 +1881,12 @@ impl Bucket {
&self,
s3_path: &str,
content_type: &str,
custom_headers: Option<HeaderMap>,
) -> Result<InitiateMultipartUploadResponse, S3Error> {
let command = Command::InitiateMultipartUpload { content_type };
let command = Command::InitiateMultipartUpload {
content_type,
custom_headers,
};
let request = RequestImpl::new(self, s3_path, command)?;
let response_data = request.response_data(false)?;
if response_data.status_code() >= 300 {
Expand Down
3 changes: 2 additions & 1 deletion s3/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ pub enum Command<'a> {
},
InitiateMultipartUpload {
content_type: &'a str,
custom_headers: Option<HeaderMap>,
},
UploadPart {
part_number: u32,
Expand Down Expand Up @@ -258,7 +259,7 @@ impl<'a> Command<'a> {

pub fn content_type(&self) -> String {
match self {
Command::InitiateMultipartUpload { content_type } => content_type.to_string(),
Command::InitiateMultipartUpload { content_type, .. } => content_type.to_string(),
Command::PutObject { content_type, .. } => content_type.to_string(),
Command::CompleteMultipartUpload { .. }
| Command::PutBucketLifecycle { .. }
Expand Down
9 changes: 9 additions & 0 deletions s3/src/request/request_trait.rs
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,15 @@ pub trait Request {
}
}

// Append custom headers for InitiateMultipartUpload request if any
if let Command::InitiateMultipartUpload { custom_headers, .. } = self.command()
&& let Some(custom_headers) = custom_headers
{
for (k, v) in custom_headers.iter() {
headers.insert(k.clone(), v.clone());
}
}

let host_header = self.host_header();

headers.insert(HOST, host_header.parse()?);
Expand Down