From ef5ab67c771b3921de4b6b9804bae48f935d547f Mon Sep 17 00:00:00 2001 From: Marco Neumann Date: Tue, 21 Sep 2021 13:35:11 +0200 Subject: [PATCH] chore: upgrade azure dependencies --- .github/dependabot.yml | 3 + Cargo.lock | 404 ++++++++------------------------------ object_store/Cargo.toml | 8 +- object_store/src/azure.rs | 8 +- 4 files changed, 95 insertions(+), 328 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 53f8242a9f..34b782e6a2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,3 +4,6 @@ updates: directory: "/" schedule: interval: "weekly" + ignore: + # https://github.com/tkaitchuck/aHash/issues/95 + dependency-name: "indexmap" diff --git a/Cargo.lock b/Cargo.lock index 50dc41a3e0..7b8e7baf82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -132,7 +132,7 @@ dependencies = [ "multiversion", "num", "prettytable-rs", - "rand 0.8.4", + "rand", "regex", "serde", "serde_derive", @@ -163,10 +163,10 @@ dependencies = [ "ahash", "arrow", "chrono", - "hashbrown", + "hashbrown 0.11.2", "num-traits", "prettytable-rs", - "rand 0.8.4", + "rand", "snafu", ] @@ -246,28 +246,24 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "azure_core" version = "0.1.0" -source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=14ff9326bb1ba07f98733a548988eccd4532b945#14ff9326bb1ba07f98733a548988eccd4532b945" +source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=cb5aba657fe378009c38e979434b2bc93ac0a3d5#cb5aba657fe378009c38e979434b2bc93ac0a3d5" dependencies = [ - "RustyXML", "async-trait", - "base64 0.13.0", "bytes", "chrono", - "failure", + "dyn-clone", "futures", + "getrandom 0.2.3", "http", - "hyper", - "hyper-rustls", "log", - "md5", "oauth2", - "paste", - "quick-error 1.2.3", + "rand", "reqwest", + "rustc_version", "serde", - "serde-xml-rs", "serde_derive", "serde_json", + "thiserror", "url", "uuid", ] @@ -275,31 +271,24 @@ dependencies = [ [[package]] name = "azure_storage" version = "0.1.0" -source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=14ff9326bb1ba07f98733a548988eccd4532b945#14ff9326bb1ba07f98733a548988eccd4532b945" +source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=cb5aba657fe378009c38e979434b2bc93ac0a3d5#cb5aba657fe378009c38e979434b2bc93ac0a3d5" dependencies = [ "RustyXML", "azure_core", "base64 0.13.0", "bytes", "chrono", - "failure", "futures", "http", - "hyper", - "hyper-rustls", "log", "md5", - "mime", - "percent-encoding", - "quick-error 1.2.3", + "once_cell", "ring", "serde", "serde-xml-rs", "serde_derive", "serde_json", - "smallvec", "thiserror", - "time 0.2.27", "url", "uuid", ] @@ -319,12 +308,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - [[package]] name = "base64" version = "0.12.3" @@ -499,7 +482,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" dependencies = [ - "rustc_version 0.4.0", + "rustc_version", ] [[package]] @@ -536,7 +519,7 @@ dependencies = [ "num-integer", "num-traits", "serde", - "time 0.1.43", + "time", "winapi", ] @@ -548,7 +531,7 @@ checksum = "0be5180df5f7c41fc2416bc038bc8d78d44db8136c415b94ccbc95f523dc38e9" dependencies = [ "chrono", "scanlex", - "time 0.1.43", + "time", ] [[package]] @@ -633,12 +616,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "const_fn" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -824,15 +801,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct", -] - [[package]] name = "data_types" version = "0.1.0" @@ -867,14 +835,14 @@ dependencies = [ "async-trait", "chrono", "futures", - "hashbrown", + "hashbrown 0.11.2", "log", "num_cpus", "ordered-float 2.8.0", "parquet", "paste", "pin-project-lite", - "rand 0.8.4", + "rand", "smallvec", "sqlparser", "tokio", @@ -993,12 +961,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "doc-comment" version = "0.3.3" @@ -1011,6 +973,12 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" +[[package]] +name = "dyn-clone" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" + [[package]] name = "either" version = "1.6.1" @@ -1075,28 +1043,6 @@ dependencies = [ "str-buf", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -1367,8 +1313,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.10.2+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -1463,11 +1411,17 @@ dependencies = [ "log", "pest", "pest_derive", - "quick-error 2.0.1", + "quick-error", "serde", "serde_json", ] +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" + [[package]] name = "hashbrown" version = "0.11.2" @@ -1597,12 +1551,10 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ - "ct-logs", "futures-util", "hyper", "log", "rustls", - "rustls-native-certs", "tokio", "tokio-rustls", "webpki", @@ -1646,12 +1598,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.9.1", ] [[package]] @@ -1712,7 +1664,7 @@ dependencies = [ "flate2", "futures", "generated_types", - "hashbrown", + "hashbrown 0.11.2", "heappy", "hex", "http", @@ -1745,7 +1697,7 @@ dependencies = [ "prettytable-rs", "prost", "query", - "rand 0.8.4", + "rand", "rdkafka", "read_buffer", "reqwest", @@ -1789,7 +1741,7 @@ dependencies = [ "futures-util", "generated_types", "prost", - "rand 0.8.4", + "rand", "serde", "serde_json", "thiserror", @@ -1827,7 +1779,7 @@ dependencies = [ "hex", "integer-encoding 3.0.2", "observability_deps", - "rand 0.8.4", + "rand", "snafu", "snap", "test_helpers", @@ -1861,7 +1813,7 @@ dependencies = [ "arrow", "arrow_util", "futures", - "hashbrown", + "hashbrown 0.11.2", "indexmap", "itertools 0.10.1", "observability_deps", @@ -1886,8 +1838,8 @@ dependencies = [ "influxdb_iox_client", "itertools 0.9.0", "packers", - "rand 0.8.4", - "rand_core 0.6.3", + "rand", + "rand_core", "rand_seeder", "serde", "serde_json", @@ -2045,7 +1997,7 @@ dependencies = [ "chrono", "data_types", "futures", - "hashbrown", + "hashbrown 0.11.2", "internal_types", "observability_deps", "tokio", @@ -2237,7 +2189,7 @@ dependencies = [ "httparse", "lazy_static", "log", - "rand 0.8.4", + "rand", "regex", "serde_json", "serde_urlencoded", @@ -2279,7 +2231,7 @@ dependencies = [ "chrono", "data_types", "entry", - "hashbrown", + "hashbrown 0.11.2", "influxdb_line_protocol", "internal_types", "metric", @@ -2519,17 +2471,19 @@ dependencies = [ [[package]] name = "oauth2" -version = "4.0.0-alpha.3" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14be0cf9da49c1a5b2909ec626949dc549e0adda4e9e7f26e4908f08a5435227" +checksum = "80e47cfc4c0a1a519d9a025ebfbac3a2439d1b5cdf397d72dcb79b11d9920dab" dependencies = [ - "base64 0.12.3", + "base64 0.13.0", "chrono", + "getrandom 0.2.3", "http", - "rand 0.7.3", + "rand", "reqwest", "serde", "serde_json", + "serde_path_to_error", "sha2", "thiserror", "url", @@ -2557,6 +2511,7 @@ dependencies = [ "dotenv", "futures", "futures-test", + "indexmap", "itertools 0.10.1", "percent-encoding", "reqwest", @@ -2650,7 +2605,7 @@ dependencies = [ "lazy_static", "percent-encoding", "pin-project", - "rand 0.8.4", + "rand", "thiserror", ] @@ -2729,7 +2684,7 @@ dependencies = [ "internal_types", "observability_deps", "parquet", - "rand 0.8.4", + "rand", "snafu", "test_helpers", ] @@ -2781,7 +2736,7 @@ dependencies = [ "lz4", "num-bigint 0.4.2", "parquet-format", - "rand 0.8.4", + "rand", "snap", "thrift", "zstd", @@ -3256,7 +3211,7 @@ dependencies = [ "datafusion 0.1.0", "datafusion_util", "futures", - "hashbrown", + "hashbrown 0.11.2", "internal_types", "itertools 0.10.1", "libc", @@ -3295,12 +3250,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quick-error" version = "2.0.1" @@ -3341,19 +3290,6 @@ dependencies = [ "nibble_vec", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - [[package]] name = "rand" version = "0.8.4" @@ -3361,19 +3297,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", - "rand_hc 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", + "rand_hc", ] [[package]] @@ -3383,16 +3309,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -3411,16 +3328,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f" dependencies = [ "num-traits", - "rand 0.8.4", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "rand", ] [[package]] @@ -3429,7 +3337,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.6.3", + "rand_core", ] [[package]] @@ -3438,7 +3346,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "612dd698949d531335b4c29d1c64fb11942798decfc08abc218578942e66d7d0" dependencies = [ - "rand_core 0.6.3", + "rand_core", ] [[package]] @@ -3507,7 +3415,7 @@ dependencies = [ "data_types", "datafusion 0.1.0", "either", - "hashbrown", + "hashbrown 0.11.2", "internal_types", "itertools 0.10.1", "metric", @@ -3515,7 +3423,7 @@ dependencies = [ "packers", "parking_lot", "permutation", - "rand 0.8.4", + "rand", "rand_distr", "snafu", "test_helpers", @@ -3673,7 +3581,7 @@ dependencies = [ "log", "rusoto_credential", "rusoto_signature", - "rustc_version 0.4.0", + "rustc_version", "serde", "serde_json", "tokio", @@ -3731,7 +3639,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rusoto_credential", - "rustc_version 0.4.0", + "rustc_version", "serde", "sha2", "tokio", @@ -3761,22 +3669,13 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.4", + "semver", ] [[package]] @@ -3792,18 +3691,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "rustls-native-certs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -dependencies = [ - "openssl-probe", - "rustls", - "schannel", - "security-framework", -] - [[package]] name = "rustyline" version = "9.0.0" @@ -3897,27 +3784,12 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" version = "1.0.130" @@ -3972,6 +3844,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0421d4f173fab82d72d6babf36d57fae38b994ca5c2d78e704260ba6d12118b" +dependencies = [ + "serde", +] + [[package]] name = "serde_regex" version = "1.1.0" @@ -4013,7 +3894,7 @@ dependencies = [ "futures", "futures-util", "generated_types", - "hashbrown", + "hashbrown 0.11.2", "influxdb_iox_client", "influxdb_line_protocol", "internal_types", @@ -4031,7 +3912,7 @@ dependencies = [ "persistence_windows", "predicate", "query", - "rand 0.8.4", + "rand", "rand_distr", "read_buffer", "serde", @@ -4066,7 +3947,7 @@ dependencies = [ "predicate", "query", "query_tests", - "rand 0.8.4", + "rand", "server", "test_helpers", "tokio", @@ -4084,12 +3965,6 @@ dependencies = [ "opaque-debug 0.2.3", ] -[[package]] -name = "sha1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" - [[package]] name = "sha2" version = "0.9.8" @@ -4149,9 +4024,6 @@ name = "smallvec" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" -dependencies = [ - "serde", -] [[package]] name = "snafu" @@ -4220,70 +4092,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "str-buf" version = "1.0.5" @@ -4372,18 +4186,6 @@ version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f886607578031fffb0996a24a5e5b73313f36dca63416b9d1c1004f7cb6084d" -[[package]] -name = "synstructure" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - [[package]] name = "tap" version = "1.0.1" @@ -4398,7 +4200,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if", "libc", - "rand 0.8.4", + "rand", "redox_syscall 0.2.10", "remove_dir_all", "winapi", @@ -4527,44 +4329,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", -] - [[package]] name = "tinytemplate" version = "1.2.1" @@ -4769,7 +4533,7 @@ dependencies = [ "futures-util", "indexmap", "pin-project", - "rand 0.8.4", + "rand", "slab", "tokio", "tokio-stream", @@ -4798,7 +4562,7 @@ dependencies = [ "chrono", "observability_deps", "parking_lot", - "rand 0.8.4", + "rand", ] [[package]] @@ -4823,7 +4587,7 @@ name = "trace_http" version = "0.1.0" dependencies = [ "futures", - "hashbrown", + "hashbrown 0.11.2", "http", "http-body", "itertools 0.10.1", @@ -4927,7 +4691,7 @@ name = "tracker" version = "0.1.0" dependencies = [ "futures", - "hashbrown", + "hashbrown 0.11.2", "lock_api", "metric", "observability_deps", diff --git a/object_store/Cargo.toml b/object_store/Cargo.toml index ada0a0c743..2ab0c5c6d1 100644 --- a/object_store/Cargo.toml +++ b/object_store/Cargo.toml @@ -8,13 +8,15 @@ edition = "2018" async-trait = "0.1.42" # Microsoft Azure Blob storage integration # In order to support tokio 1.0 and delimiters, needed to pull in unreleased azure sdk -azure_core = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "14ff9326bb1ba07f98733a548988eccd4532b945", optional = true } -azure_storage = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "14ff9326bb1ba07f98733a548988eccd4532b945", optional = true, default-features = false, features = ["table", "blob", "queue"] } +azure_core = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "cb5aba657fe378009c38e979434b2bc93ac0a3d5", optional = true } +azure_storage = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = "cb5aba657fe378009c38e979434b2bc93ac0a3d5", optional = true, default-features = false, features = ["table", "blob", "queue"] } bytes = "1.0" chrono = "0.4" # Google Cloud Storage integration cloud-storage = {version = "0.10.2", optional = true} futures = "0.3" +# https://github.com/tkaitchuck/aHash/issues/95 +indexmap = { version = "~1.6.2", optional = true } itertools = "0.10.1" percent-encoding = "2.1" # rusoto crates are for Amazon S3 integration @@ -31,7 +33,7 @@ walkdir = "2" tempfile = "3.1.0" [features] -azure = ["azure_core", "azure_storage"] +azure = ["azure_core", "azure_storage", "indexmap"] gcp = ["cloud-storage"] aws = ["rusoto_core", "rusoto_credential", "rusoto_s3"] diff --git a/object_store/src/azure.rs b/object_store/src/azure.rs index 7fc5b815ed..9f106a8c85 100644 --- a/object_store/src/azure.rs +++ b/object_store/src/azure.rs @@ -7,9 +7,8 @@ use crate::{ use async_trait::async_trait; use azure_core::prelude::*; use azure_storage::{ - clients::{ - AsBlobClient, AsContainerClient, AsStorageClient, ContainerClient, StorageAccountClient, - }, + blob::prelude::{AsBlobClient, AsContainerClient, ContainerClient}, + core::clients::{AsStorageClient, StorageAccountClient}, DeleteSnapshotsMethod, }; use bytes::Bytes; @@ -253,8 +252,7 @@ pub fn new_azure( ) -> Result { let account = account.into(); let access_key = access_key.into(); - // From https://github.com/Azure/azure-sdk-for-rust/blob/master/sdk/storage/examples/blob_00.rs#L29 - let http_client: Arc> = Arc::new(Box::new(reqwest::Client::new())); + let http_client: Arc = Arc::new(reqwest::Client::new()); let storage_account_client = StorageAccountClient::new_access_key(Arc::clone(&http_client), &account, &access_key);