From b473146411d205f1fbbb2538212ea3d6d245a139 Mon Sep 17 00:00:00 2001 From: Paolo Barbolini Date: Sun, 6 Aug 2023 16:13:00 +0200 Subject: [PATCH 1/4] feat: switch to crates.io release of Azure SDK --- Cargo.lock | 67 +++++++++++++++++++++--------------------------------- Cargo.toml | 16 ++++++------- 2 files changed, 34 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc7f30468a3f7..0de9fab7b4c76 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1304,11 +1304,12 @@ dependencies = [ [[package]] name = "azure_core" -version = "0.5.0" -source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=b4544d4920fa3064eb921340054cd9cc130b7664#b4544d4920fa3064eb921340054cd9cc130b7664" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b0f0eea648347e40f5f7f7e6bfea4553bcefad0fbf52044ea339e5ce3aba61" dependencies = [ "async-trait", - "base64 0.13.1", + "base64 0.21.2", "bytes 1.4.0", "dyn-clone", "futures 0.3.28", @@ -1317,11 +1318,11 @@ dependencies = [ "log", "paste", "pin-project", + "quick-xml 0.29.0", "rand 0.8.5", "reqwest", "rustc_version 0.4.0", "serde", - "serde-xml-rs", "serde_json", "time", "url", @@ -1330,17 +1331,18 @@ dependencies = [ [[package]] name = "azure_identity" -version = "0.6.0" -source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=b4544d4920fa3064eb921340054cd9cc130b7664#b4544d4920fa3064eb921340054cd9cc130b7664" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61712538f43d64b56725f335bc931d0eb42d2b082fb157056465bbadfdeb5dd3" dependencies = [ "async-lock", "async-trait", "azure_core", - "base64 0.13.1", "fix-hidden-lifetime-bug", "futures 0.3.28", "log", "oauth2", + "pin-project", "serde", "serde_json", "time", @@ -1350,20 +1352,19 @@ dependencies = [ [[package]] name = "azure_storage" -version = "0.6.0" -source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=b4544d4920fa3064eb921340054cd9cc130b7664#b4544d4920fa3064eb921340054cd9cc130b7664" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32d9cfa13ed9acb51cd663e04f343bd550a92b455add96c90de387a9a6bc4dbc" dependencies = [ "RustyXML", "async-trait", "azure_core", - "base64 0.13.1", "bytes 1.4.0", "futures 0.3.28", "hmac", "log", "once_cell", "serde", - "serde-xml-rs", "serde_derive", "serde_json", "sha2 0.10.7", @@ -1374,19 +1375,17 @@ dependencies = [ [[package]] name = "azure_storage_blobs" -version = "0.6.0" -source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=b4544d4920fa3064eb921340054cd9cc130b7664#b4544d4920fa3064eb921340054cd9cc130b7664" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57cb0fe58af32a3fb49e560613cb1e4937f9f13161a2c1caf1bba0224435f2af" dependencies = [ "RustyXML", "azure_core", "azure_storage", - "base64 0.13.1", "bytes 1.4.0", "futures 0.3.28", "log", - "md5", "serde", - "serde-xml-rs", "serde_derive", "serde_json", "time", @@ -5066,12 +5065,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - [[package]] name = "memchr" version = "2.5.0" @@ -5791,7 +5784,7 @@ dependencies = [ "parking_lot", "percent-encoding", "pin-project", - "quick-xml", + "quick-xml 0.27.1", "reqwest", "serde", "serde_json", @@ -6699,6 +6692,16 @@ dependencies = [ "serde", ] +[[package]] +name = "quick-xml" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "quickcheck" version = "1.0.3" @@ -7626,18 +7629,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "serde-xml-rs" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" -dependencies = [ - "log", - "serde", - "thiserror", - "xml-rs", -] - [[package]] name = "serde_bytes" version = "0.11.12" @@ -10582,12 +10573,6 @@ dependencies = [ "tap", ] -[[package]] -name = "xml-rs" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" - [[package]] name = "xmlparser" version = "0.13.5" diff --git a/Cargo.toml b/Cargo.toml index ae72cfa7c25ac..d8608b90aafeb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -185,10 +185,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 = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, features = ["enable_reqwest"], optional = true } -azure_identity = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, features = ["enable_reqwest"], optional = true } -azure_storage = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, optional = true } -azure_storage_blobs = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, optional = true } +azure_core = { version = "0.13", default-features = false, features = ["enable_reqwest"], optional = true } +azure_identity = { version = "0.13", default-features = false, features = ["enable_reqwest"], optional = true } +azure_storage = { version = "0.13", default-features = false, optional = true } +azure_storage_blobs = { version = "0.13", default-features = false, optional = true } # OpenDAL opendal = {version = "0.38", default-features = false, features = ["native-tls", "services-webhdfs"], optional = true} @@ -350,10 +350,10 @@ openssl-src = { version = "111", default-features = false, features = ["force-en [dev-dependencies] approx = "0.5.1" assert_cmd = { version = "2.0.12", default-features = false } -azure_core = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, features = ["enable_reqwest", "azurite_workaround"] } -azure_identity = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, features = ["enable_reqwest"] } -azure_storage_blobs = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, features = ["azurite_workaround"] } -azure_storage = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "b4544d4920fa3064eb921340054cd9cc130b7664", default-features = false, features = ["azurite_workaround"] } +azure_core = { version = "0.13", default-features = false, features = ["enable_reqwest", "azurite_workaround"] } +azure_identity = { version = "0.13", default-features = false, features = ["enable_reqwest"] } +azure_storage_blobs = { version = "0.13", default-features = false, features = ["azurite_workaround"] } +azure_storage = { version = "0.13", default-features = false } base64 = "0.21.2" criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] } itertools = { version = "0.11.0", default-features = false, features = ["use_alloc"] } From e1a38fb3782910630514d528b3c2cd71c40db906 Mon Sep 17 00:00:00 2001 From: Doug Smith Date: Mon, 7 Aug 2023 10:58:55 -0400 Subject: [PATCH 2/4] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d8608b90aafeb..689c5f26ddb8a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -353,7 +353,7 @@ assert_cmd = { version = "2.0.12", default-features = false } azure_core = { version = "0.13", default-features = false, features = ["enable_reqwest", "azurite_workaround"] } azure_identity = { version = "0.13", default-features = false, features = ["enable_reqwest"] } azure_storage_blobs = { version = "0.13", default-features = false, features = ["azurite_workaround"] } -azure_storage = { version = "0.13", default-features = false } +azure_storage = { version = "0.13", default-features = false, features = ["azurite_workaround"] } base64 = "0.21.2" criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] } itertools = { version = "0.11.0", default-features = false, features = ["use_alloc"] } From 2c84af4708ff5ab5284c226c21fb377e6d134be2 Mon Sep 17 00:00:00 2001 From: Doug Smith Date: Mon, 7 Aug 2023 11:18:15 -0400 Subject: [PATCH 3/4] Remove outdated feature --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 689c5f26ddb8a..d8608b90aafeb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -353,7 +353,7 @@ assert_cmd = { version = "2.0.12", default-features = false } azure_core = { version = "0.13", default-features = false, features = ["enable_reqwest", "azurite_workaround"] } azure_identity = { version = "0.13", default-features = false, features = ["enable_reqwest"] } azure_storage_blobs = { version = "0.13", default-features = false, features = ["azurite_workaround"] } -azure_storage = { version = "0.13", default-features = false, features = ["azurite_workaround"] } +azure_storage = { version = "0.13", default-features = false } base64 = "0.21.2" criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] } itertools = { version = "0.11.0", default-features = false, features = ["use_alloc"] } From fad9ba9b59af2cbbad4927af068df6168ced9ad9 Mon Sep 17 00:00:00 2001 From: Paolo Barbolini Date: Mon, 7 Aug 2023 17:39:39 +0200 Subject: [PATCH 4/4] cargo vdev build licenses --- LICENSE-3rdparty.csv | 3 --- 1 file changed, 3 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 8c11eae6a04f2..b6d5a876eae7e 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -321,7 +321,6 @@ matches,https://github.com/SimonSapin/rust-std-candidates,MIT,Simon Sapin maxminddb,https://github.com/oschwald/maxminddb-rust,ISC,Gregory J. Oschwald md-5,https://github.com/RustCrypto/hashes,MIT OR Apache-2.0,RustCrypto Developers -md5,https://github.com/stainless-steel/md5,Apache-2.0 OR MIT,"Ivan Ukhov , Kamal Ahmad , Konstantin Stepanov , Lukas Kalbertodt , Nathan Musoke , Scott Mabin , Tony Arcieri , Wim de With , Yosef Dinerstein " memchr,https://github.com/BurntSushi/memchr,Unlicense OR MIT,"Andrew Gallant , bluss" memmap2,https://github.com/RazrFalcon/memmap2-rs,MIT OR Apache-2.0,"Dan Burkert , Yevhenii Reizner " memoffset,https://github.com/Gilnaa/memoffset,MIT,Gilad Naaman @@ -483,7 +482,6 @@ semver-parser,https://github.com/steveklabnik/semver-parser,MIT OR Apache-2.0,St serde,https://github.com/serde-rs/serde,MIT OR Apache-2.0,"Erick Tryzelaar , David Tolnay " serde-toml-merge,https://github.com/jdrouet/serde-toml-merge,MIT,Jeremie Drouet serde-value,https://github.com/arcnmx/serde-value,MIT,arcnmx -serde-xml-rs,https://github.com/RReverser/serde-xml-rs,MIT,Ingvar Stepanyan serde_bytes,https://github.com/serde-rs/bytes,MIT OR Apache-2.0,David Tolnay serde_derive,https://github.com/serde-rs/serde,MIT OR Apache-2.0,David Tolnay serde_json,https://github.com/serde-rs/json,MIT OR Apache-2.0,"Erick Tryzelaar , David Tolnay " @@ -643,7 +641,6 @@ winnow,https://github.com/winnow-rs/winnow,MIT,The winnow Authors winreg,https://github.com/gentoo90/winreg-rs,MIT,Igor Shaula woothee,https://github.com/woothee/woothee-rust,Apache-2.0,hhatto wyz,https://github.com/myrrlyn/wyz,MIT,myrrlyn -xml-rs,https://github.com/kornelski/xml-rs,MIT,Vladimir Matveev xmlparser,https://github.com/RazrFalcon/xmlparser,MIT OR Apache-2.0,Evgeniy Reizner yaml-rust,https://github.com/chyh1990/yaml-rust,MIT OR Apache-2.0,Yuheng Chen yansi,https://github.com/SergioBenitez/yansi,MIT OR Apache-2.0,Sergio Benitez