diff --git a/core/src/services/oss/backend.rs b/core/src/services/oss/backend.rs index e99a58b4fe66..c39b9394f311 100644 --- a/core/src/services/oss/backend.rs +++ b/core/src/services/oss/backend.rs @@ -118,8 +118,6 @@ pub struct OssBuilder { access_key_id: Option, access_key_secret: Option, - allow_anonymous: bool, - http_client: Option, } @@ -206,12 +204,6 @@ impl OssBuilder { self } - /// Anonymously access the bucket. - pub fn allow_anonymous(&mut self) -> &mut Self { - self.allow_anonymous = true; - self - } - /// Specify the http client that used by this service. /// /// # Notes @@ -278,9 +270,6 @@ impl Builder for OssBuilder { map.get("access_key_id").map(|v| builder.access_key_id(v)); map.get("access_key_secret") .map(|v| builder.access_key_secret(v)); - map.get("allow_anonymous") - .filter(|v| *v == "on" || *v == "true") - .map(|_| builder.allow_anonymous()); builder } diff --git a/core/src/services/oss/core.rs b/core/src/services/oss/core.rs index 2755bc79c2c7..2dcaf5e18beb 100644 --- a/core/src/services/oss/core.rs +++ b/core/src/services/oss/core.rs @@ -62,7 +62,7 @@ impl Debug for OssCore { } impl OssCore { - async fn load_credential(&self) -> Result { + async fn load_credential(&self) -> Result> { let cred = self .loader .load() @@ -70,22 +70,29 @@ impl OssCore { .map_err(new_request_credential_error)?; if let Some(cred) = cred { - Ok(cred) + Ok(Some(cred)) } else { - Err(Error::new( - ErrorKind::ConfigInvalid, - "no valid credential found", - )) + Ok(None) } } pub async fn sign(&self, req: &mut Request) -> Result<()> { - let cred = self.load_credential().await?; + let cred = if let Some(cred) = self.load_credential().await? { + cred + } else { + return Ok(()); + }; + self.signer.sign(req, &cred).map_err(new_request_sign_error) } pub async fn sign_query(&self, req: &mut Request, duration: Duration) -> Result<()> { - let cred = self.load_credential().await?; + let cred = if let Some(cred) = self.load_credential().await? { + cred + } else { + return Ok(()); + }; + self.signer .sign_query(req, duration, &cred) .map_err(new_request_sign_error)