Skip to content
Merged
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
52 changes: 52 additions & 0 deletions src/aws/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,8 @@ impl AmazonS3Builder {
/// - `s3a://<bucket>/<path>`
/// - `https://s3.<region>.amazonaws.com/<bucket>`
/// - `https://<bucket>.s3.<region>.amazonaws.com`
/// - `https://s3.dualstack.<region>.amazonaws.com/<bucket>`
/// - `https://<bucket>.s3.dualstack.<region>.amazonaws.com`
/// - `https://ACCOUNT_ID.r2.cloudflarestorage.com/bucket`
///
/// Note: Settings derived from the URL will override any others set on this builder
Expand Down Expand Up @@ -807,10 +809,34 @@ impl AmazonS3Builder {
self.bucket_name = Some(bucket.into());
}
}
// Path-style dual-stack endpoint, e.g. `s3.dualstack.<region>.amazonaws.com`.
Some(("s3", "dualstack", region, "amazonaws.com")) => {
self.region = Some(region.to_string());
// Override endpoint to explicitly preserve dualstack address
self.endpoint = Some(format!("https://s3.dualstack.{region}.amazonaws.com"));
let bucket = parsed.path_segments().into_iter().flatten().next();
if let Some(bucket) = bucket {
self.bucket_name = Some(bucket.into());
}
}
Some((bucket, "s3", "amazonaws", "com")) => {
self.bucket_name = Some(bucket.to_string());
self.virtual_hosted_style_request = true.into();
}
// Virtual-hosted dual-stack endpoint, e.g.
// `<bucket>.s3.dualstack.<region>.amazonaws.com`
Some((bucket, "s3", "dualstack", rest)) => {
let region = rest
.strip_suffix(".amazonaws.com")
.ok_or_else(|| Error::UrlNotRecognised { url: url.into() })?;
self.bucket_name = Some(bucket.to_string());
self.region = Some(region.to_string());
// Override endpoint to explicitly preserve dualstack address
self.endpoint = Some(format!(
"https://{bucket}.s3.dualstack.{region}.amazonaws.com"
));
self.virtual_hosted_style_request = true.into();
}
Some((bucket, "s3", region, "amazonaws.com")) => {
self.bucket_name = Some(bucket.to_string());
self.region = Some(region.to_string());
Expand Down Expand Up @@ -1782,6 +1808,32 @@ mod tests {
assert_eq!(builder.region, Some("region".to_string()));
assert!(builder.virtual_hosted_style_request.get().unwrap());

// Path-style dual-stack endpoint
let mut builder = AmazonS3Builder::new();
builder
.parse_url("https://s3.dualstack.us-east-1.amazonaws.com/bucket/path")
.unwrap();
assert_eq!(builder.region, Some("us-east-1".to_string()));
assert_eq!(builder.bucket_name, Some("bucket".to_string()));
assert_eq!(
builder.endpoint,
Some("https://s3.dualstack.us-east-1.amazonaws.com".to_string())
);
assert!(!builder.virtual_hosted_style_request.get().unwrap());

// Virtual-hosted dual-stack endpoint
let mut builder = AmazonS3Builder::new();
builder
.parse_url("https://bucket.s3.dualstack.us-east-1.amazonaws.com")
.unwrap();
assert_eq!(builder.bucket_name, Some("bucket".to_string()));
assert_eq!(builder.region, Some("us-east-1".to_string()));
assert_eq!(
builder.endpoint,
Some("https://bucket.s3.dualstack.us-east-1.amazonaws.com".to_string())
);
assert!(builder.virtual_hosted_style_request.get().unwrap());

let mut builder = AmazonS3Builder::new();
builder
.parse_url("https://account123.r2.cloudflarestorage.com/bucket-123")
Expand Down
8 changes: 8 additions & 0 deletions src/parse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,14 @@ mod tests {
"https://bucket.s3.region.amazonaws.com",
(ObjectStoreScheme::AmazonS3, ""),
),
(
"https://s3.dualstack.us-east-1.amazonaws.com/bucket/path",
(ObjectStoreScheme::AmazonS3, "path"),
),
(
"https://bucket.s3.dualstack.us-east-1.amazonaws.com/path",
(ObjectStoreScheme::AmazonS3, "path"),
),
(
"https://ACCOUNT_ID.r2.cloudflarestorage.com/bucket",
(ObjectStoreScheme::AmazonS3, ""),
Expand Down