Skip to content

Support R2 URLs with jurisdictions #815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alamb merged 1 commit into from
Aug 17, 2026
Merged

Support R2 URLs with jurisdictions #815

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 25 additions & 0 deletions src/aws/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@ impl AmazonS3Builder {
/// - `https://s3.dualstack.<region>.amazonaws.com/<bucket>`
/// - `https://<bucket>.s3.dualstack.<region>.amazonaws.com`
/// - `https://ACCOUNT_ID.r2.cloudflarestorage.com/bucket`
/// - `https://ACCOUNT_ID.JURISDICTION.r2.cloudflarestorage.com/bucket`
///
/// Note: Settings derived from the URL will override any others set on this builder
///
Expand Down Expand Up @@ -852,6 +853,17 @@ impl AmazonS3Builder {
self.bucket_name = Some(bucket.into());
}
}
Some((account, jurisdiction, "r2", "cloudflarestorage.com")) => {
self.region = Some("auto".to_string());
let endpoint =
format!("https://{account}.{jurisdiction}.r2.cloudflarestorage.com");
self.endpoint = Some(endpoint);

let bucket = parsed.path_segments().into_iter().flatten().next();
if let Some(bucket) = bucket {
self.bucket_name = Some(bucket.into());
}
}
_ => return Err(Error::UrlNotRecognised { url: url.into() }.into()),
},
scheme => {
Expand Down Expand Up @@ -1846,13 +1858,26 @@ mod tests {
Some("https://account123.r2.cloudflarestorage.com".to_string())
);

let mut builder = AmazonS3Builder::new();
builder
.parse_url("https://account123.eu.r2.cloudflarestorage.com/bucket-123")
.unwrap();

assert_eq!(builder.bucket_name, Some("bucket-123".to_string()));
assert_eq!(builder.region, Some("auto".to_string()));
assert_eq!(
builder.endpoint,
Some("https://account123.eu.r2.cloudflarestorage.com".to_string())
);

let err_cases = [
"mailto://bucket/path",
"https://s3.bucket.mydomain.com",
"https://s3.bucket.foo.amazonaws.com",
"https://bucket.mydomain.region.amazonaws.com",
"https://bucket.s3.region.bar.amazonaws.com",
"https://bucket.foo.s3.amazonaws.com",
"https://account.r2.eu.cloudflarestorage.com/bucket",
];
let mut builder = AmazonS3Builder::new();
for case in err_cases {
Expand Down