You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opendal.apache.org by xu...@apache.org on 2023/03/19 08:48:22 UTC

[incubator-opendal] branch main updated: fix: Bucket config related error is misleadling (#1684)

This is an automated email from the ASF dual-hosted git repository.

xuanwo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git


The following commit(s) were added to refs/heads/main by this push:
     new 1df68baa fix: Bucket config related error is misleadling (#1684)
1df68baa is described below

commit 1df68baad7f28a071b2fe1dc5e4b4964b6291bd2
Author: sihong zhou <62...@qq.com>
AuthorDate: Sun Mar 19 16:48:16 2023 +0800

    fix: Bucket config related error is misleadling (#1684)
    
    fix issue 1235 misleadling config error
---
 core/src/services/gcs/backend.rs | 8 +++++---
 core/src/services/obs/backend.rs | 6 ++++--
 core/src/services/oss/backend.rs | 6 ++++--
 core/src/services/s3/backend.rs  | 5 ++++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/core/src/services/gcs/backend.rs b/core/src/services/gcs/backend.rs
index 69d3dfc6..06fd41ec 100644
--- a/core/src/services/gcs/backend.rs
+++ b/core/src/services/gcs/backend.rs
@@ -252,9 +252,11 @@ impl Builder for GcsBuilder {
         // Handle endpoint and bucket name
         let bucket = match self.bucket.is_empty() {
             false => Ok(&self.bucket),
-            true => Err(Error::new(ErrorKind::ConfigInvalid, "bucket is empty")
-                .with_operation("Builder::build")
-                .with_context("service", Scheme::Gcs)),
+            true => Err(
+                Error::new(ErrorKind::ConfigInvalid, "The bucket is misconfigured")
+                    .with_operation("Builder::build")
+                    .with_context("service", Scheme::Gcs),
+            ),
         }?;
 
         // TODO: server side encryption
diff --git a/core/src/services/obs/backend.rs b/core/src/services/obs/backend.rs
index 32cf833b..3183f02d 100644
--- a/core/src/services/obs/backend.rs
+++ b/core/src/services/obs/backend.rs
@@ -207,8 +207,10 @@ impl Builder for ObsBuilder {
 
         let bucket = match &self.bucket {
             Some(bucket) => Ok(bucket.to_string()),
-            None => Err(Error::new(ErrorKind::ConfigInvalid, "bucket is empty")
-                .with_context("service", Scheme::Obs)),
+            None => Err(
+                Error::new(ErrorKind::ConfigInvalid, "The bucket is misconfigured")
+                    .with_context("service", Scheme::Obs),
+            ),
         }?;
         debug!("backend use bucket {}", &bucket);
 
diff --git a/core/src/services/oss/backend.rs b/core/src/services/oss/backend.rs
index efc433e8..a61d7cdb 100644
--- a/core/src/services/oss/backend.rs
+++ b/core/src/services/oss/backend.rs
@@ -310,8 +310,10 @@ impl Builder for OssBuilder {
         // Handle endpoint, region and bucket name.
         let bucket = match self.bucket.is_empty() {
             false => Ok(&self.bucket),
-            true => Err(Error::new(ErrorKind::ConfigInvalid, "bucket is empty")
-                .with_context("service", Scheme::Oss)),
+            true => Err(
+                Error::new(ErrorKind::ConfigInvalid, "The bucket is misconfigured")
+                    .with_context("service", Scheme::Oss),
+            ),
         }?;
 
         let client = if let Some(client) = self.http_client.take() {
diff --git a/core/src/services/s3/backend.rs b/core/src/services/s3/backend.rs
index 8cd78313..633a633d 100644
--- a/core/src/services/s3/backend.rs
+++ b/core/src/services/s3/backend.rs
@@ -853,7 +853,10 @@ impl Builder for S3Builder {
         // Handle bucket name.
         let bucket = match self.bucket.is_empty() {
             false => Ok(&self.bucket),
-            true => Err(Error::new(ErrorKind::ConfigInvalid, "bucket is empty")),
+            true => Err(
+                Error::new(ErrorKind::ConfigInvalid, "The bucket is misconfigured")
+                    .with_context("service", Scheme::S3),
+            ),
         }?;
         debug!("backend use bucket {}", &bucket);