From 0e61accd512743fc5323ed70947428fd56098640 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 14:51:56 -0600 Subject: [PATCH] chore(deps): Bump the azure group with 4 updates (#18773) * chore(deps): Bump the azure group with 4 updates Bumps the azure group with 4 updates: [azure_core](https://github.com/azure/azure-sdk-for-rust), [azure_identity](https://github.com/azure/azure-sdk-for-rust), [azure_storage](https://github.com/azure/azure-sdk-for-rust) and [azure_storage_blobs](https://github.com/azure/azure-sdk-for-rust). Updates `azure_core` from 0.15.0 to 0.16.0 - [Release notes](https://github.com/azure/azure-sdk-for-rust/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-rust/blob/main/HISTORY.md) - [Commits](https://github.com/azure/azure-sdk-for-rust/commits) Updates `azure_identity` from 0.15.0 to 0.16.2 - [Release notes](https://github.com/azure/azure-sdk-for-rust/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-rust/blob/main/HISTORY.md) - [Commits](https://github.com/azure/azure-sdk-for-rust/commits) Updates `azure_storage` from 0.15.0 to 0.16.0 - [Release notes](https://github.com/azure/azure-sdk-for-rust/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-rust/blob/main/HISTORY.md) - [Commits](https://github.com/azure/azure-sdk-for-rust/commits) Updates `azure_storage_blobs` from 0.15.0 to 0.16.0 - [Release notes](https://github.com/azure/azure-sdk-for-rust/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-rust/blob/main/HISTORY.md) - [Commits](https://github.com/azure/azure-sdk-for-rust/commits) --- updated-dependencies: - dependency-name: azure_core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: azure - dependency-name: azure_identity dependency-type: direct:production update-type: version-update:semver-minor dependency-group: azure - dependency-name: azure_storage dependency-type: direct:production update-type: version-update:semver-minor dependency-group: azure - dependency-name: azure_storage_blobs dependency-type: direct:production update-type: version-update:semver-minor dependency-group: azure ... Signed-off-by: dependabot[bot] * updates from API * update licenses --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: neuronull --- Cargo.lock | 55 +++++++++++++++----------------- Cargo.toml | 16 +++++----- LICENSE-3rdparty.csv | 4 +-- src/sinks/azure_common/config.rs | 20 ++++++------ 4 files changed, 46 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ec7aecd803e9..a868c8df42465 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1360,9 +1360,9 @@ dependencies = [ [[package]] name = "azure_core" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f20eb684aea745292c540173304383c9cba9697d1c31d307620a57d6f878fa9" +checksum = "8e29286b9edfdd6f2c7e9d970bb5b015df8621258acab9ecfcea09b2d7692467" dependencies = [ "async-trait", "base64 0.21.4", @@ -1387,14 +1387,13 @@ dependencies = [ [[package]] name = "azure_identity" -version = "0.15.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e15ab021e72fa7196fa8406951f7e85a3476e4968568b2ce3866d2ceed831655" +checksum = "5b67b337346da8739e91ea1e9400a6ebc9bc54e0b2af1d23c9bcd565950588f9" dependencies = [ "async-lock", "async-trait", "azure_core", - "fix-hidden-lifetime-bug", "futures 0.3.28", "log", "oauth2", @@ -1402,15 +1401,16 @@ dependencies = [ "serde", "serde_json", "time", + "tz-rs", "url", "uuid", ] [[package]] name = "azure_storage" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf64f9d78e573f64e189fa7188c4e6a0f605e27740105a8d32038b3ba8c913be" +checksum = "bed0ccefde57930b2886fd4aed1f70ac469c197b8c2e94828290d71bcbdb5d97" dependencies = [ "RustyXML", "async-trait", @@ -1419,7 +1419,6 @@ dependencies = [ "futures 0.3.28", "hmac", "log", - "once_cell", "serde", "serde_derive", "serde_json", @@ -1431,9 +1430,9 @@ dependencies = [ [[package]] name = "azure_storage_blobs" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61299a8b65b88acba1a079a0b5e8a39970a12cb53e35ada2641687edb022d5a" +checksum = "f91a52da2d192cfe43759f61e8bb31a5969f1722d5b85ac89627f356ad674ab4" dependencies = [ "RustyXML", "azure_core", @@ -2337,6 +2336,12 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + [[package]] name = "convert_case" version = "0.4.0" @@ -3408,26 +3413,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "fix-hidden-lifetime-bug" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4ae9c2016a663983d4e40a9ff967d6dcac59819672f0b47f2b17574e99c33c8" -dependencies = [ - "fix-hidden-lifetime-bug-proc_macros", -] - -[[package]] -name = "fix-hidden-lifetime-bug-proc_macros" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c81935e123ab0741c4c4f0d9b8377e5fb21d3de7e062fa4b1263b1fbcba1ea" -dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 1.0.109", -] - [[package]] name = "fixedbitset" version = "0.4.2" @@ -8687,6 +8672,7 @@ checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", + "js-sys", "libc", "num_threads", "serde", @@ -9453,6 +9439,15 @@ dependencies = [ "syn 2.0.38", ] +[[package]] +name = "tz-rs" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33851b15c848fad2cf4b105c6bb66eb9512b6f6c44a4b13f57c53c73c707e2b4" +dependencies = [ + "const_fn", +] + [[package]] name = "uaparser" version = "0.6.1" diff --git a/Cargo.toml b/Cargo.toml index 0ff8ae90e2e28..aab7534f40596 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -189,10 +189,10 @@ aws-smithy-http-tower = { git = "https://github.com/vectordotdev/aws-sdk-rust", aws-smithy-types = { git = "https://github.com/vectordotdev/aws-sdk-rust", rev = "3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670", default-features = false, optional = true } # Azure -azure_core = { version = "0.15", default-features = false, features = ["enable_reqwest"], optional = true } -azure_identity = { version = "0.15", default-features = false, features = ["enable_reqwest"], optional = true } -azure_storage = { version = "0.15", default-features = false, optional = true } -azure_storage_blobs = { version = "0.15", default-features = false, optional = true } +azure_core = { version = "0.16", default-features = false, features = ["enable_reqwest"], optional = true } +azure_identity = { version = "0.16", default-features = false, features = ["enable_reqwest"], optional = true } +azure_storage = { version = "0.16", default-features = false, optional = true } +azure_storage_blobs = { version = "0.16", default-features = false, optional = true } # OpenDAL opendal = {version = "0.38", default-features = false, features = ["native-tls", "services-webhdfs"], optional = true} @@ -354,10 +354,10 @@ openssl-src = { version = "300", default-features = false, features = ["force-en [dev-dependencies] approx = "0.5.1" assert_cmd = { version = "2.0.12", default-features = false } -azure_core = { version = "0.15", default-features = false, features = ["enable_reqwest", "azurite_workaround"] } -azure_identity = { version = "0.15", default-features = false, features = ["enable_reqwest"] } -azure_storage_blobs = { version = "0.15", default-features = false, features = ["azurite_workaround"] } -azure_storage = { version = "0.15", default-features = false } +azure_core = { version = "0.16", default-features = false, features = ["enable_reqwest", "azurite_workaround"] } +azure_identity = { version = "0.16", default-features = false, features = ["enable_reqwest"] } +azure_storage_blobs = { version = "0.16", default-features = false, features = ["azurite_workaround"] } +azure_storage = { version = "0.16", default-features = false } base64 = "0.21.4" criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] } itertools = { version = "0.11.0", default-features = false, features = ["use_alloc"] } diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 049404464311e..3f8fa40e83adb 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -137,6 +137,7 @@ community-id,https://github.com/traceflight/rs-community-id,MIT OR Apache-2.0,Ju concurrent-queue,https://github.com/smol-rs/concurrent-queue,Apache-2.0 OR MIT,Stjepan Glavina concurrent-queue,https://github.com/smol-rs/concurrent-queue,Apache-2.0 OR MIT,"Stjepan Glavina , Taiki Endo , John Nunley " const-oid,https://github.com/RustCrypto/formats/tree/master/const-oid,Apache-2.0 OR MIT,RustCrypto Developers +const_fn,https://github.com/taiki-e/const_fn,Apache-2.0 OR MIT,The const_fn Authors convert_case,https://github.com/rutrum/convert-case,MIT,David Purdum convert_case,https://github.com/rutrum/convert-case,MIT,Rutrum cookie-factory,https://github.com/rust-bakery/cookie-factory,MIT,"Geoffroy Couprie , Pierre Chifflier " @@ -206,8 +207,6 @@ fallible-iterator,https://github.com/sfackler/rust-fallible-iterator,MIT OR Apac fastrand,https://github.com/smol-rs/fastrand,Apache-2.0 OR MIT,Stjepan Glavina fiat-crypto,https://github.com/mit-plv/fiat-crypto,MIT OR Apache-2.0 OR BSD-1-Clause,Fiat Crypto library authors filetime,https://github.com/alexcrichton/filetime,MIT OR Apache-2.0,Alex Crichton -fix-hidden-lifetime-bug,https://github.com/danielhenrymantilla/fix-hidden-lifetime-bug.rs,Zlib OR MIT OR Apache-2.0,Daniel Henry-Mantilla -fix-hidden-lifetime-bug-proc_macros,https://github.com/danielhenrymantilla/fix-hidden-lifetime-bug.rs,Zlib OR MIT OR Apache-2.0,Daniel Henry-Mantilla flagset,https://github.com/enarx/flagset,Apache-2.0,Nathaniel McCallum flate2,https://github.com/rust-lang/flate2-rs,MIT OR Apache-2.0,"Alex Crichton , Josh Triplett " float_eq,https://github.com/jtempest/float_eq-rs,MIT OR Apache-2.0,jtempest @@ -588,6 +587,7 @@ twox-hash,https://github.com/shepmaster/twox-hash,MIT,Jake Goulding , Chris Morgan " typenum,https://github.com/paholg/typenum,MIT OR Apache-2.0,"Paho Lurie-Gregg , Andre Bogus " typetag,https://github.com/dtolnay/typetag,MIT OR Apache-2.0,David Tolnay +tz-rs,https://github.com/x-hgg-x/tz-rs,MIT OR Apache-2.0,x-hgg-x uaparser,https://github.com/davidarmstronglewis/uap-rs,MIT,David Lewis ucd-trie,https://github.com/BurntSushi/ucd-generate,MIT OR Apache-2.0,Andrew Gallant unarray,https://github.com/cameron1024/unarray,MIT OR Apache-2.0,The unarray Authors diff --git a/src/sinks/azure_common/config.rs b/src/sinks/azure_common/config.rs index bfb61d616ce63..f23a8f0bde3b1 100644 --- a/src/sinks/azure_common/config.rs +++ b/src/sinks/azure_common/config.rs @@ -140,10 +140,12 @@ pub fn build_client( // that account_name is not required to exist in the connection_string since // account_name is only used with the default CloudLocation in the Azure SDK to // generate the storage API endpoint - Some(uri) => ClientBuilder::with_location(CloudLocation::Custom { - uri: uri.to_string(), - credentials: connection_string.storage_credentials()?, - }), + Some(uri) => ClientBuilder::with_location( + CloudLocation::Custom { + uri: uri.to_string(), + }, + connection_string.storage_credentials()?, + ), // Without a valid blob_endpoint in the connection_string, assume we are in Azure // Commercial (AzureCloud location) and create a default Blob Storage Client that // builds the API endpoint location using the account_name as input @@ -160,15 +162,15 @@ pub fn build_client( (None, Some(storage_account_p)) => { let creds = std::sync::Arc::new(DefaultAzureCredential::default()); let auto_creds = std::sync::Arc::new(AutoRefreshingTokenCredential::new(creds)); - let storage_credentials = StorageCredentials::TokenCredential(auto_creds); + let storage_credentials = StorageCredentials::token_credential(auto_creds); client = match endpoint { // If a blob_endpoint is provided in the configuration, use it with a Custom // CloudLocation, to allow overriding the blob storage API endpoint - Some(endpoint) => ClientBuilder::with_location(CloudLocation::Custom { - uri: endpoint, - credentials: storage_credentials, - }), + Some(endpoint) => ClientBuilder::with_location( + CloudLocation::Custom { uri: endpoint }, + storage_credentials, + ), // Use the storage_account configuration parameter and assume we are in Azure // Commercial (AzureCloud location) and build the blob storage API endpoint using // the storage_account as input.