From 0b27204599a6b6378b71c769ee4894b1772beb52 Mon Sep 17 00:00:00 2001 From: john8628 Date: Thu, 20 Jul 2023 14:42:22 +0800 Subject: [PATCH 1/2] s3 head with no X-Amz-Bucket-Region , using us-east-1 region as default --- core/src/services/s3/backend.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/services/s3/backend.rs b/core/src/services/s3/backend.rs index 69ca4adc2c55..37bdaeb2855a 100644 --- a/core/src/services/s3/backend.rs +++ b/core/src/services/s3/backend.rs @@ -619,13 +619,16 @@ impl S3Builder { ); match res.status() { - StatusCode::OK | StatusCode::FORBIDDEN | StatusCode::MOVED_PERMANENTLY => { + StatusCode::OK | StatusCode::MOVED_PERMANENTLY => { let region = res.headers().get("x-amz-bucket-region")?; if let Ok(regin) = region.to_str() { Some(regin.to_string()) } else { None } + }, + StatusCode::FORBIDDEN => { + Some("us-east-1".to_string()) } // Unexpected status code _ => None, From 479b103bff9cc7acba8b9d54444c63a12c722ea4 Mon Sep 17 00:00:00 2001 From: john8628 Date: Thu, 20 Jul 2023 15:53:29 +0800 Subject: [PATCH 2/2] fix cargo fmt --- core/src/services/s3/backend.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/services/s3/backend.rs b/core/src/services/s3/backend.rs index 37bdaeb2855a..50fa32f6aeb6 100644 --- a/core/src/services/s3/backend.rs +++ b/core/src/services/s3/backend.rs @@ -619,17 +619,15 @@ impl S3Builder { ); match res.status() { - StatusCode::OK | StatusCode::MOVED_PERMANENTLY => { + StatusCode::OK | StatusCode::MOVED_PERMANENTLY => { let region = res.headers().get("x-amz-bucket-region")?; if let Ok(regin) = region.to_str() { Some(regin.to_string()) } else { None } - }, - StatusCode::FORBIDDEN => { - Some("us-east-1".to_string()) } + StatusCode::FORBIDDEN => Some("us-east-1".to_string()), // Unexpected status code _ => None, }