From 0f11ca0cb76610b5a4c9b9dc6ef0f94725bbb3be Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 2 Jul 2024 15:59:47 -0700 Subject: [PATCH 1/2] chore!: fix typo customed should be customized Signed-off-by: tison --- core/src/docs/rfcs/3197_config.md | 2 +- core/src/services/gcs/backend.rs | 10 +++++----- core/src/services/gcs/docs.md | 2 +- core/src/services/s3/backend.rs | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/core/src/docs/rfcs/3197_config.md b/core/src/docs/rfcs/3197_config.md index 5540676080f..3ede3aede8d 100644 --- a/core/src/docs/rfcs/3197_config.md +++ b/core/src/docs/rfcs/3197_config.md @@ -180,7 +180,7 @@ pub struct S3Config { pub struct S3Builder { config: S3Config, - customed_credential_load: Option>, + customized_credential_load: Option>, http_client: Option, } ``` diff --git a/core/src/services/gcs/backend.rs b/core/src/services/gcs/backend.rs index 3f1cb93724c..70b7bde1c5c 100644 --- a/core/src/services/gcs/backend.rs +++ b/core/src/services/gcs/backend.rs @@ -86,7 +86,7 @@ pub struct GcsBuilder { config: GcsConfig, http_client: Option, - customed_token_loader: Option>, + customized_token_loader: Option>, } impl Debug for GcsBuilder { @@ -189,9 +189,9 @@ impl GcsBuilder { self } - /// Specify the customed token loader used by this service. - pub fn customed_token_loader(&mut self, token_load: Box) -> &mut Self { - self.customed_token_loader = Some(token_load); + /// Specify the customized token loader used by this service. + pub fn customized_token_loader(&mut self, token_load: Box) -> &mut Self { + self.customized_token_loader = Some(token_load); self } @@ -300,7 +300,7 @@ impl Builder for GcsBuilder { if let Ok(Some(cred)) = cred_loader.load() { token_loader = token_loader.with_credentials(cred) } - if let Some(loader) = self.customed_token_loader.take() { + if let Some(loader) = self.customized_token_loader.take() { token_loader = token_loader.with_customed_token_loader(loader) } diff --git a/core/src/services/gcs/docs.md b/core/src/services/gcs/docs.md index d818b6bbafe..a068f8b0919 100644 --- a/core/src/services/gcs/docs.md +++ b/core/src/services/gcs/docs.md @@ -37,7 +37,7 @@ OpenDAL supports the following authentication options: 4. Fetch access token from [VM metadata](https://cloud.google.com/docs/authentication/rest#metadata-server) - Only works when running inside Google Cloud. - If a non-default Service Account name is required, set with `service_account`. Otherwise, nothing need to be set. -5. A custom `TokenLoader` via `GcsBuilder.customed_token_loader()` +5. A custom `TokenLoader` via `GcsBuilder.customized_token_loader()` Notes: diff --git a/core/src/services/s3/backend.rs b/core/src/services/s3/backend.rs index d6edb1e7478..7d7ab8de2d3 100644 --- a/core/src/services/s3/backend.rs +++ b/core/src/services/s3/backend.rs @@ -232,7 +232,7 @@ impl Debug for S3Config { pub struct S3Builder { config: S3Config, - customed_credential_load: Option>, + customized_credential_load: Option>, http_client: Option, } @@ -577,12 +577,12 @@ impl S3Builder { self } - /// Adding a customed credential load for service. + /// Adding a customized credential load for service. /// - /// If customed_credential_load has been set, we will ignore all other + /// If customized_credential_load has been set, we will ignore all other /// credential load methods. - pub fn customed_credential_load(&mut self, cred: Box) -> &mut Self { - self.customed_credential_load = Some(cred); + pub fn customized_credential_load(&mut self, cred: Box) -> &mut Self { + self.customized_credential_load = Some(cred); self } @@ -805,7 +805,7 @@ impl Builder for S3Builder { S3Builder { config, - customed_credential_load: None, + customized_credential_load: None, http_client: None, } } @@ -935,8 +935,8 @@ impl Builder for S3Builder { } let mut loader: Option> = None; - // If customed_credential_load is set, we will use it. - if let Some(v) = self.customed_credential_load.take() { + // If customized_credential_load is set, we will use it. + if let Some(v) = self.customized_credential_load.take() { loader = Some(v); } From fd1f081c066748a9c5893775ba36d48faa95c81d Mon Sep 17 00:00:00 2001 From: tison Date: Wed, 3 Jul 2024 17:41:51 -0700 Subject: [PATCH 2/2] more Signed-off-by: tison --- core/Cargo.lock | 18 ++++++++++++++---- core/Cargo.toml | 2 +- core/src/services/gcs/backend.rs | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/core/Cargo.lock b/core/Cargo.lock index b0e9139a877..d0085908fdd 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -4772,7 +4772,7 @@ dependencies = [ "prometheus", "prometheus-client", "prost 0.11.9", - "quick-xml", + "quick-xml 0.31.0", "r2d2", "rand 0.8.5", "redb", @@ -5787,6 +5787,16 @@ dependencies = [ "serde", ] +[[package]] +name = "quick-xml" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86e446ed58cef1bbfe847bc2fda0e2e4ea9f0e57b90c507d4781292590d72a4e" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "quick_cache" version = "0.4.2" @@ -6116,9 +6126,9 @@ dependencies = [ [[package]] name = "reqsign" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70fe66d4cd0b5ed9b1abbfe639bf6baeaaf509f7da2d51b31111ba945be59286" +checksum = "03dd4ba7c3901dd43e6b8c7446a760d45bc1ea4301002e1a6fa48f97c3a796fa" dependencies = [ "anyhow", "async-trait", @@ -6134,7 +6144,7 @@ dependencies = [ "log", "once_cell", "percent-encoding", - "quick-xml", + "quick-xml 0.35.0", "rand 0.8.5", "reqwest 0.12.4", "rsa", diff --git a/core/Cargo.toml b/core/Cargo.toml index 6cba0f70079..33336a642b2 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -264,7 +264,7 @@ sha1 = { version = "0.10.6", optional = true } sha2 = { version = "0.10", optional = true } # For http based services. -reqsign = { version = "0.15.2", default-features = false, optional = true } +reqsign = { version = "0.16", default-features = false, optional = true } # for services-atomic-server atomic_lib = { version = "0.34.5", optional = true } diff --git a/core/src/services/gcs/backend.rs b/core/src/services/gcs/backend.rs index 70b7bde1c5c..deb0b0d313c 100644 --- a/core/src/services/gcs/backend.rs +++ b/core/src/services/gcs/backend.rs @@ -301,7 +301,7 @@ impl Builder for GcsBuilder { token_loader = token_loader.with_credentials(cred) } if let Some(loader) = self.customized_token_loader.take() { - token_loader = token_loader.with_customed_token_loader(loader) + token_loader = token_loader.with_customized_token_loader(loader) } let signer = GoogleSigner::new("storage");