From fe7de0b45363594d1f23b575eddb2947d38ace6a Mon Sep 17 00:00:00 2001 From: onalante-msft <89409054+onalante-msft@users.noreply.github.com> Date: Mon, 7 Feb 2022 20:54:01 -0800 Subject: [PATCH] [release/1.2] Remove thread_local for non-edgelet projects (#6092) *Cf.* #6070. ## Azure IoT Edge PR checklist: This checklist is used to make sure that common guidelines for a pull request are followed. ### General Guidelines and Best Practices - [x] I have read the [contribution guidelines](https://github.com/azure/iotedge#contributing). - [x] Title of the pull request is clear and informative. - [x] Description of the pull request includes a concise summary of the enhancement or bug fix. ### Testing Guidelines - [x] Pull request includes test coverage for the included changes. - Description of the pull request includes - [ ] concise summary of tests added/modified - [x] local testing done. --- edge-hub/watchdog/Cargo.lock | 26 +- edge-modules/api-proxy-module/Cargo.lock | 42 +- edge-modules/api-proxy-module/Cargo.toml | 2 +- edge-modules/edgehub-proxy/Cargo.lock | 194 ++-- edge-modules/edgehub-proxy/Cargo.toml | 4 +- edge-modules/edgehub-proxy/src/logging.rs | 2 +- edge-modules/edgehub-proxy/src/main.rs | 2 +- edgelet/edgelet-docker/src/error.rs | 2 +- edgelet/edgelet-docker/src/runtime.rs | 2 +- edgelet/edgelet-http-mgmt/src/error.rs | 41 +- mqtt/Cargo.lock | 29 +- test/modules/generic-mqtt-tester/Cargo.lock | 23 +- tools/check_submodules/Cargo.lock | 45 +- tools/check_submodules/Cargo.toml | 2 +- tools/check_submodules/src/logging.rs | 2 +- tools/snitch/Cargo.lock | 983 ++++++++++++-------- tools/snitch/snitcher/Cargo.toml | 5 +- 17 files changed, 742 insertions(+), 664 deletions(-) diff --git a/edge-hub/watchdog/Cargo.lock b/edge-hub/watchdog/Cargo.lock index f104fa33bec..407faa71d5c 100644 --- a/edge-hub/watchdog/Cargo.lock +++ b/edge-hub/watchdog/Cargo.lock @@ -2,9 +2,9 @@ # It is not intended for manual editing. [[package]] name = "aho-corasick" -version = "0.7.13" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -115,9 +115,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.3.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memoffset" @@ -189,14 +189,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.3.9" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] @@ -211,9 +210,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.18" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "signal-hook" @@ -261,15 +260,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static", -] - [[package]] name = "time" version = "0.1.43" diff --git a/edge-modules/api-proxy-module/Cargo.lock b/edge-modules/api-proxy-module/Cargo.lock index d287a2d3154..93c3f1196cd 100644 --- a/edge-modules/api-proxy-module/Cargo.lock +++ b/edge-modules/api-proxy-module/Cargo.lock @@ -2,9 +2,9 @@ # It is not intended for manual editing. [[package]] name = "aho-corasick" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -34,11 +34,11 @@ dependencies = [ "md5", "mockito", "mqtt3", + "percent-encoding 1.0.1", "regex", "serde_json", - "syn", - "test-case", "tokio", + "url", ] [[package]] @@ -711,9 +711,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.3.4" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "mio" @@ -1095,21 +1095,20 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "regex" -version = "1.4.2" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] name = "regex-syntax" -version = "0.6.21" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "remove_dir_all" @@ -1292,18 +1291,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "test-case" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199464148b42bcf3da8b2a56f6ee87ca68f47402496d1268849291ec9fb463c8" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "version_check", -] - [[package]] name = "thiserror" version = "1.0.23" @@ -1324,15 +1311,6 @@ dependencies = [ "syn", ] -[[package]] -name = "thread_local" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447" -dependencies = [ - "lazy_static", -] - [[package]] name = "time" version = "0.1.44" diff --git a/edge-modules/api-proxy-module/Cargo.toml b/edge-modules/api-proxy-module/Cargo.toml index a2c53883024..963d13c14fa 100644 --- a/edge-modules/api-proxy-module/Cargo.toml +++ b/edge-modules/api-proxy-module/Cargo.toml @@ -15,7 +15,7 @@ futures = "0.3" futures-util = "0.3" log = "0.4" md5 = "0.7" -regex = "1.3" +regex = "1.5" serde_json = "1.0" tokio = { version = "0.2", features = ["tcp", "time", "process","signal","sync"] } percent-encoding = "1.0" diff --git a/edge-modules/edgehub-proxy/Cargo.lock b/edge-modules/edgehub-proxy/Cargo.lock index 315ac80bd40..0675f19372f 100644 --- a/edge-modules/edgehub-proxy/Cargo.lock +++ b/edge-modules/edgehub-proxy/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.6.9" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -50,7 +50,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a" dependencies = [ "backtrace-sys", - "cfg-if", + "cfg-if 0.1.6", "libc", "rustc-demangle", "winapi 0.3.6", @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.0.4" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" @@ -127,6 +127,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "chrono" version = "0.4.6" @@ -180,12 +186,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a079bddaa385eab2a88dc5816a378921852ab3af6646748da14681b2facf502" -[[package]] -name = "constant_time_eq" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" - [[package]] name = "core-foundation" version = "0.5.1" @@ -223,11 +223,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.6", "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", - "memoffset", + "memoffset 0.5.6", "scopeguard 1.1.0", ] @@ -237,7 +237,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if", + "cfg-if 0.1.6", "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -255,20 +255,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.6", "lazy_static", ] -[[package]] -name = "crypto-mac" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0999b4ff4d3446d4ddb19a63e9e00c1876e75cd7000d20e57a693b4b3f08d958" -dependencies = [ - "constant_time_eq", - "generic-array", -] - [[package]] name = "digest" version = "0.7.6" @@ -298,7 +288,7 @@ dependencies = [ "log", "serde_json", "tokio", - "url 1.7.2", + "url 2.2.2", "workload", ] @@ -313,11 +303,10 @@ dependencies = [ "edgelet-utils", "failure", "futures", - "hmac", - "humantime 2.1.0", + "humantime", "lazy_static", "log", - "regex 0.2.11", + "regex", "serde", "serde_derive", "serde_json", @@ -347,8 +336,7 @@ dependencies = [ "nix", "openssl", "percent-encoding 2.1.0", - "regex 0.2.11", - "scopeguard 0.3.3", + "regex", "serde", "serde_derive", "serde_json", @@ -380,14 +368,14 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "env_logger" -version = "0.5.13" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", - "humantime 1.1.1", + "humantime", "log", - "regex 1.0.6", + "regex", "termcolor", ] @@ -521,16 +509,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" -[[package]] -name = "hmac" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f3bdb08579d99d7dc761c0e266f13b5f2ab8c8c703b9fc9ef333cd8f48f55e" -dependencies = [ - "crypto-mac", - "digest", -] - [[package]] name = "http" version = "0.1.21" @@ -560,15 +538,6 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" -[[package]] -name = "humantime" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e" -dependencies = [ - "quick-error", -] - [[package]] name = "humantime" version = "2.1.0" @@ -711,9 +680,9 @@ checksum = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" [[package]] name = "libc" -version = "0.2.66" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" +checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c" [[package]] name = "linked-hash-map" @@ -733,11 +702,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.6" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -754,14 +723,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.1.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a3eb002f0535929f1199681417029ebea04aadc0c7a4224b46be99c7f5d6a16" -dependencies = [ - "cfg-if", - "libc", - "version_check", -] +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memoffset" @@ -772,6 +736,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.12" @@ -846,22 +819,22 @@ version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" dependencies = [ - "cfg-if", + "cfg-if 0.1.6", "libc", "winapi 0.3.6", ] [[package]] name = "nix" -version = "0.14.1" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 1.0.0", "libc", - "void", + "memoffset 0.6.5", ] [[package]] @@ -905,7 +878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1309181cdcbdb51bc3b6bedb33dfac2a83b3d585033d3f6d9e22e8c1928613" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 0.1.6", "foreign-types", "lazy_static", "libc", @@ -998,12 +971,6 @@ dependencies = [ "unicode-xid 0.2.2", ] -[[package]] -name = "quick-error" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" - [[package]] name = "quote" version = "0.6.9" @@ -1067,47 +1034,20 @@ dependencies = [ [[package]] name = "regex" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.5.6", - "thread_local", - "utf8-ranges", -] - -[[package]] -name = "regex" -version = "1.0.6" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee84f70c8c08744ea9641a731c7fadb475bf2ecc52d7f627feb833e0b3990467" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.6.3", - "thread_local", - "utf8-ranges", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.5.6" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -dependencies = [ - "ucd-util", -] - -[[package]] -name = "regex-syntax" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc557aac2b708fe84121caf261346cc2eed71978024337e42eb46b8a252ac6e" -dependencies = [ - "ucd-util", -] +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "remove_dir_all" @@ -1341,7 +1281,7 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55c1195ef8513f3273d55ff59fe5da6940287a0d7a98331254397f464833675b" dependencies = [ - "cfg-if", + "cfg-if 0.1.6", "libc", "rand", "redox_syscall", @@ -1378,15 +1318,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "thread_local" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -dependencies = [ - "lazy_static", -] - [[package]] name = "time" version = "0.1.40" @@ -1600,9 +1531,9 @@ dependencies = [ [[package]] name = "tokio-uds" -version = "0.2.3" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df195376b43508f01570bacc73e13a1de0854dc59e79d1ec09913e8db6dd2a70" +checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" dependencies = [ "bytes", "futures", @@ -1611,6 +1542,7 @@ dependencies = [ "log", "mio", "mio-uds", + "tokio-codec", "tokio-io", "tokio-reactor", ] @@ -1640,12 +1572,6 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" -[[package]] -name = "ucd-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f8bfa9ff0cadcd210129ad9d2c5f145c13e9ced3d3e5d948a6213487d52444" - [[package]] name = "unicase" version = "2.2.0" @@ -1725,12 +1651,6 @@ dependencies = [ "url 1.7.2", ] -[[package]] -name = "utf8-ranges" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" - [[package]] name = "vcpkg" version = "0.2.6" @@ -1749,12 +1669,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "want" version = "0.2.0" diff --git a/edge-modules/edgehub-proxy/Cargo.toml b/edge-modules/edgehub-proxy/Cargo.toml index 545387d9dfa..91facfb2eae 100644 --- a/edge-modules/edgehub-proxy/Cargo.toml +++ b/edge-modules/edgehub-proxy/Cargo.toml @@ -6,14 +6,14 @@ edition = "2018" [dependencies] clap = "2.31" -env_logger = "0.5" +env_logger = "0.9" failure = "0.1" failure_derive = "0.1" hyper = "0.12.36" log = "0.4" serde_json = "1.0" tokio = "0.1" -url = "1.7" +url = "2.2" edgelet-http = { path = "../../edgelet/edgelet-http" } edgelet-utils = { path = "../../edgelet/edgelet-utils" } diff --git a/edge-modules/edgehub-proxy/src/logging.rs b/edge-modules/edgehub-proxy/src/logging.rs index 1ba34cf6b65..02119dac284 100644 --- a/edge-modules/edgehub-proxy/src/logging.rs +++ b/edge-modules/edgehub-proxy/src/logging.rs @@ -45,7 +45,7 @@ pub fn init() { } }) .filter_level(LevelFilter::Info) - .parse(&env::var(ENV_LOG).unwrap_or_default()) + .parse_filters(&env::var(ENV_LOG).unwrap_or_default()) .init(); } diff --git a/edge-modules/edgehub-proxy/src/main.rs b/edge-modules/edgehub-proxy/src/main.rs index 10a8d06c32c..a3a88f328ce 100644 --- a/edge-modules/edgehub-proxy/src/main.rs +++ b/edge-modules/edgehub-proxy/src/main.rs @@ -201,7 +201,7 @@ fn run() -> Result<(), Error> { } fn client(url: &Url) -> Result { - let hyper_client = Client::builder().build(UrlConnector::new(&url)?); + let hyper_client = Client::builder().build(UrlConnector::new(url)?); let base_path = get_base_path(url); let mut configuration = Configuration::new(hyper_client); configuration.base_path = base_path.to_string(); diff --git a/edgelet/edgelet-docker/src/error.rs b/edgelet/edgelet-docker/src/error.rs index 27e51878d3d..905e427d1a5 100644 --- a/edgelet/edgelet-docker/src/error.rs +++ b/edgelet/edgelet-docker/src/error.rs @@ -160,7 +160,7 @@ impl From> for Error { impl<'a> From<&'a Error> for ModuleRuntimeErrorReason { fn from(err: &'a Error) -> Self { - match Fail::find_root_cause(err).downcast_ref::() { + match ::find_root_cause(err).downcast_ref::() { Some(ErrorKind::NotFound(_)) => ModuleRuntimeErrorReason::NotFound, _ => ModuleRuntimeErrorReason::Other, } diff --git a/edgelet/edgelet-docker/src/runtime.rs b/edgelet/edgelet-docker/src/runtime.rs index 24289aac97d..ca0b72547f5 100644 --- a/edgelet/edgelet-docker/src/runtime.rs +++ b/edgelet/edgelet-docker/src/runtime.rs @@ -1099,7 +1099,7 @@ impl ModuleRuntime for DockerModuleRuntime { wait_before_kill, ) .or_else(|err| { - match Fail::find_root_cause(&err).downcast_ref::() { + match ::find_root_cause(&err).downcast_ref::() { Some(ErrorKind::NotFound(_)) | Some(ErrorKind::NotModified) => Ok(()), _ => Err(err), } diff --git a/edgelet/edgelet-http-mgmt/src/error.rs b/edgelet/edgelet-http-mgmt/src/error.rs index 9dda0102de2..71e2f544bba 100644 --- a/edgelet/edgelet-http-mgmt/src/error.rs +++ b/edgelet/edgelet-http-mgmt/src/error.rs @@ -130,27 +130,28 @@ impl IntoResponse for Error { } // Specialize status code based on the underlying docker runtime error, if any - let status_code = - if let Some(cause) = Fail::find_root_cause(&self).downcast_ref::() { - match cause { - DockerErrorKind::NotFound(_) => StatusCode::NOT_FOUND, - DockerErrorKind::Conflict => StatusCode::CONFLICT, - DockerErrorKind::NotModified => StatusCode::NOT_MODIFIED, - _ => StatusCode::INTERNAL_SERVER_ERROR, - } - } else { - match self.kind() { - ErrorKind::InvalidApiVersion(_) - | ErrorKind::InvalidIdentityType - | ErrorKind::MalformedRequestBody - | ErrorKind::MalformedRequestParameter(_) - | ErrorKind::MissingRequiredParameter(_) => StatusCode::BAD_REQUEST, - _ => { - error!("Internal server error: {}", message); - StatusCode::INTERNAL_SERVER_ERROR - } + let status_code = if let Some(cause) = + ::find_root_cause(&self).downcast_ref::() + { + match cause { + DockerErrorKind::NotFound(_) => StatusCode::NOT_FOUND, + DockerErrorKind::Conflict => StatusCode::CONFLICT, + DockerErrorKind::NotModified => StatusCode::NOT_MODIFIED, + _ => StatusCode::INTERNAL_SERVER_ERROR, + } + } else { + match self.kind() { + ErrorKind::InvalidApiVersion(_) + | ErrorKind::InvalidIdentityType + | ErrorKind::MalformedRequestBody + | ErrorKind::MalformedRequestParameter(_) + | ErrorKind::MissingRequiredParameter(_) => StatusCode::BAD_REQUEST, + _ => { + error!("Internal server error: {}", message); + StatusCode::INTERNAL_SERVER_ERROR } - }; + } + }; // Per the RFC, status code NotModified should not have a body let body = if status_code == StatusCode::NOT_MODIFIED { diff --git a/mqtt/Cargo.lock b/mqtt/Cargo.lock index 533e51fa2e4..a4ad911be68 100644 --- a/mqtt/Cargo.lock +++ b/mqtt/Cargo.lock @@ -8,9 +8,9 @@ checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" [[package]] name = "aho-corasick" -version = "0.7.14" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -974,9 +974,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "memchr" -version = "2.3.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memoffset" @@ -1366,6 +1366,12 @@ dependencies = [ "libc", ] +[[package]] +name = "once_cell" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" + [[package]] name = "oorandom" version = "11.1.2" @@ -1905,14 +1911,13 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "regex" -version = "1.4.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] @@ -1927,9 +1932,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.20" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "remove_dir_all" @@ -2249,11 +2254,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.0.1" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] diff --git a/test/modules/generic-mqtt-tester/Cargo.lock b/test/modules/generic-mqtt-tester/Cargo.lock index e1a3964c8e9..3d10214ff4d 100644 --- a/test/modules/generic-mqtt-tester/Cargo.lock +++ b/test/modules/generic-mqtt-tester/Cargo.lock @@ -8,9 +8,9 @@ checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" [[package]] name = "aho-corasick" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -731,9 +731,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.3.4" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "miniz_oxide" @@ -1264,14 +1264,13 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "regex" -version = "1.4.3" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] @@ -1286,9 +1285,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.22" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "rustc_version" @@ -1458,11 +1457,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.0" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] diff --git a/tools/check_submodules/Cargo.lock b/tools/check_submodules/Cargo.lock index 21ef78f1eb3..2b2145bf444 100644 --- a/tools/check_submodules/Cargo.lock +++ b/tools/check_submodules/Cargo.lock @@ -1,10 +1,12 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "aho-corasick" -version = "0.7.6" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -142,9 +144,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.5.13" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", "humantime", @@ -198,12 +200,9 @@ checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" [[package]] name = "humantime" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "idna" @@ -304,9 +303,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "nom" @@ -358,12 +357,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "quick-error" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" - [[package]] name = "quote" version = "1.0.2" @@ -375,21 +368,20 @@ dependencies = [ [[package]] name = "regex" -version = "1.3.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] name = "regex-syntax" -version = "0.6.12" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "rustc-demangle" @@ -476,15 +468,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "thread_local" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -dependencies = [ - "lazy_static", -] - [[package]] name = "unicode-bidi" version = "0.3.4" diff --git a/tools/check_submodules/Cargo.toml b/tools/check_submodules/Cargo.toml index 0c53f8a7eab..25c503b1281 100644 --- a/tools/check_submodules/Cargo.toml +++ b/tools/check_submodules/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] clap = "2.32" -env_logger = "0.5" +env_logger = "0.9" failure = "0.1" git2 = "0.7" hex = "0.3" diff --git a/tools/check_submodules/src/logging.rs b/tools/check_submodules/src/logging.rs index 8cbd0e94942..63ae1dfaf83 100644 --- a/tools/check_submodules/src/logging.rs +++ b/tools/check_submodules/src/logging.rs @@ -55,7 +55,7 @@ pub fn init_logger() { } }) .filter_level(LevelFilter::Info) - .parse(&env::var(ENV_LOG).unwrap_or_default()) + .parse_filters(&env::var(ENV_LOG).unwrap_or_default()) .init(); } diff --git a/tools/snitch/Cargo.lock b/tools/snitch/Cargo.lock index bc2112f96c7..82285e530ed 100644 --- a/tools/snitch/Cargo.lock +++ b/tools/snitch/Cargo.lock @@ -9,25 +9,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9222d58bccd9e6e3b82098a2ec142ad34e5d433de986d46cec03ad3a2b5fd529" [[package]] -name = "adler32" -version = "1.0.3" +name = "adler" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "aho-corasick" -version = "0.6.10" +name = "adler32" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" -dependencies = [ - "memchr", -] +checksum = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" [[package]] name = "aho-corasick" -version = "0.7.4" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b7aa1ccb7d7ea3f437cf025a2ab1c47cc6c1bc9fc84918ff449def12f5e282" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -38,6 +35,17 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" +[[package]] +name = "async-trait" +version = "0.1.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +dependencies = [ + "proc-macro2 1.0.28", + "quote 1.0.9", + "syn 1.0.74", +] + [[package]] name = "atty" version = "0.2.12" @@ -60,6 +68,46 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +[[package]] +name = "aziot-cert-common-http" +version = "0.1.0" +source = "git+https://github.com/Azure/iot-identity-service?branch=release/1.2#0181b9d153e721e5a1a8665a671a8f765df7fca2" +dependencies = [ + "aziot-key-common", + "serde", +] + +[[package]] +name = "aziot-identity-common" +version = "0.1.0" +source = "git+https://github.com/Azure/iot-identity-service?branch=release/1.2#0181b9d153e721e5a1a8665a671a8f765df7fca2" +dependencies = [ + "aziot-key-common", + "http-common", + "serde", +] + +[[package]] +name = "aziot-identity-common-http" +version = "0.1.0" +source = "git+https://github.com/Azure/iot-identity-service?branch=release/1.2#0181b9d153e721e5a1a8665a671a8f765df7fca2" +dependencies = [ + "aziot-cert-common-http", + "aziot-identity-common", + "aziot-key-common", + "http-common", + "serde", + "serde_json", +] + +[[package]] +name = "aziot-key-common" +version = "0.1.0" +source = "git+https://github.com/Azure/iot-identity-service?branch=release/1.2#0181b9d153e721e5a1a8665a671a8f765df7fca2" +dependencies = [ + "serde", +] + [[package]] name = "azure_sdk_for_rust" version = "0.12.0" @@ -68,11 +116,11 @@ checksum = "889fdedf171de79c2f27e66c22a262267c2f061458a0fefeed5760490db8ae66" dependencies = [ "RustyXML", "base64 0.10.1", - "bytes", + "bytes 0.4.12", "chrono", "env_logger 0.6.2", "futures", - "http", + "http 0.1.21", "hyper", "hyper-rustls", "log", @@ -86,7 +134,7 @@ dependencies = [ "serde_json", "smallvec", "time", - "url", + "url 1.7.2", "uuid", ] @@ -97,7 +145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18b50f5258d1a9ad8396d2d345827875de4261b158124d4c819d9b351454fae5" dependencies = [ "backtrace-sys", - "cfg-if", + "cfg-if 0.1.10", "libc", "rustc-demangle", ] @@ -131,6 +179,12 @@ dependencies = [ "byteorder", ] +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + [[package]] name = "bitflags" version = "1.1.0" @@ -197,6 +251,33 @@ dependencies = [ "iovec", ] +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + +[[package]] +name = "bzip2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "c2-chacha" version = "0.2.2" @@ -213,12 +294,38 @@ version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" +[[package]] +name = "cert-client" +version = "0.1.0" +dependencies = [ + "aziot-cert-common-http", + "aziot-key-common", + "edgelet-core", + "edgelet-http", + "failure", + "futures", + "hyper", + "log", + "percent-encoding 2.1.0", + "serde", + "serde_derive", + "serde_json", + "typed-headers", + "url 2.2.2", +] + [[package]] name = "cfg-if" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "chrono" version = "0.4.7" @@ -241,15 +348,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "cmake" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c84c596dcf125d6781f58e3f4254677ec2a6d8aa56e8501ac277100990b3229" -dependencies = [ - "cc", -] - [[package]] name = "config" version = "0.9.3" @@ -259,7 +357,15 @@ dependencies = [ "lazy_static", "nom", "serde", - "yaml-rust", +] + +[[package]] +name = "config-common" +version = "0.1.0" +source = "git+https://github.com/Azure/iot-identity-service?branch=release/1.2#0181b9d153e721e5a1a8665a671a8f765df7fca2" +dependencies = [ + "serde", + "toml", ] [[package]] @@ -268,12 +374,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a079bddaa385eab2a88dc5816a378921852ab3af6646748da14681b2facf502" -[[package]] -name = "constant_time_eq" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" - [[package]] name = "core-foundation" version = "0.6.4" @@ -296,7 +396,17 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", +] + +[[package]] +name = "crossbeam-channel" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +dependencies = [ + "crossbeam-utils 0.7.2", + "maybe-uninit", ] [[package]] @@ -317,21 +427,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg 1.0.1", - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", - "memoffset", + "memoffset 0.5.6", "scopeguard 1.1.0", ] +[[package]] +name = "crossbeam-queue" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" +dependencies = [ + "crossbeam-utils 0.6.5", +] + [[package]] name = "crossbeam-queue" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -342,7 +461,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -353,20 +472,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg 1.0.1", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] -[[package]] -name = "crypto-mac" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0999b4ff4d3446d4ddb19a63e9e00c1876e75cd7000d20e57a693b4b3f08d958" -dependencies = [ - "constant_time_eq", - "generic-array 0.9.1", -] - [[package]] name = "ct-logs" version = "0.5.1" @@ -395,42 +504,25 @@ dependencies = [ ] [[package]] -name = "docker" -version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" -dependencies = [ - "base64 0.9.3", - "failure", - "futures", - "hyper", - "serde", - "serde_derive", - "serde_json", - "serde_yaml 0.7.5", - "typed-headers", - "url", -] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] -name = "dps" +name = "docker" version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" dependencies = [ "base64 0.9.3", - "bytes", - "chrono", - "edgelet-core", - "edgelet-http", "failure", "futures", "hyper", - "log", - "percent-encoding", "serde", "serde_derive", "serde_json", - "tokio", - "url", + "serde_yaml", + "typed-headers", + "url 1.7.2", ] [[package]] @@ -442,171 +534,112 @@ checksum = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" [[package]] name = "edgelet-core" version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" dependencies = [ "base64 0.9.3", - "bytes", + "bytes 0.4.12", "chrono", "consistenttime", "edgelet-utils", "failure", "futures", - "hmac", + "humantime 2.1.0", "lazy_static", "log", - "regex 0.2.11", + "regex", "serde", "serde_derive", "serde_json", "sha2", "tokio", - "url", + "url 2.2.2", "url_serde", ] [[package]] name = "edgelet-docker" version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" dependencies = [ + "aziot-cert-common-http", "base64 0.9.3", + "cert-client", "chrono", - "config", + "config-common", "docker", "edgelet-core", - "edgelet-hsm", "edgelet-http", "edgelet-utils", "failure", "futures", "hyper", "lazy_static", + "libc", "log", - "provisioning", "serde", "serde_derive", "serde_json", + "sysinfo", "tokio", - "url", + "tokio-process", + "url 2.2.2", "url_serde", ] -[[package]] -name = "edgelet-hsm" -version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" -dependencies = [ - "bytes", - "chrono", - "edgelet-core", - "failure", - "hsm", -] - [[package]] name = "edgelet-http" version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" dependencies = [ - "bytes", + "bytes 0.4.12", "chrono", "edgelet-core", - "edgelet-hsm", "edgelet-utils", "failure", "futures", "hyper", - "hyper-named-pipe", "hyper-proxy", "hyper-tls", "hyperlocal", - "hyperlocal-windows", "libc", "log", - "mio-uds-windows", "native-tls", "nix", "openssl", - "percent-encoding", - "regex 0.2.11", - "scopeguard 0.3.3", + "percent-encoding 2.1.0", + "regex", "serde", "serde_derive", "serde_json", "systemd", "tokio", - "tokio-named-pipe", "tokio-tls", "tokio-uds", - "tokio-uds-windows", "typed-headers", - "url", - "winapi 0.3.7", -] - -[[package]] -name = "edgelet-http-external-provisioning" -version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" -dependencies = [ - "base64 0.9.3", - "bytes", - "chrono", - "edgelet-core", - "edgelet-http", - "external-provisioning", - "failure", - "futures", - "hyper", - "log", - "serde", - "serde_json", - "url", + "url 2.2.2", ] [[package]] name = "edgelet-http-mgmt" version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" dependencies = [ + "aziot-identity-common", "edgelet-core", "edgelet-docker", "edgelet-http", - "edgelet-iothub", "failure", "futures", "hyper", + "identity-client", "lazy_static", "log", "management", - "provisioning", "serde", "serde_json", - "url", -] - -[[package]] -name = "edgelet-iothub" -version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" -dependencies = [ - "base64 0.9.3", - "chrono", - "edgelet-core", - "edgelet-http", - "failure", - "futures", - "iothubservice", - "percent-encoding", - "serde", - "serde_derive", - "url", + "support-bundle", + "url 2.2.2", ] [[package]] name = "edgelet-utils" version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" dependencies = [ "config", "failure", @@ -629,9 +662,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" dependencies = [ "atty", - "humantime", + "humantime 1.2.0", "log", - "regex 1.1.9", + "regex", "termcolor", ] @@ -642,9 +675,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" dependencies = [ "atty", - "humantime", + "humantime 1.2.0", "log", - "regex 1.1.9", + "regex", "termcolor", ] @@ -657,24 +690,6 @@ dependencies = [ "backtrace", ] -[[package]] -name = "external-provisioning" -version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" -dependencies = [ - "base64 0.9.3", - "edgelet-core", - "failure", - "futures", - "hyper", - "serde", - "serde_derive", - "serde_json", - "serde_yaml 0.7.5", - "typed-headers", - "url", -] - [[package]] name = "failure" version = "0.1.8" @@ -709,12 +724,24 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "450537dc346f0c4d738dda31e790da1da5d4bd12145aad4da0d03d713cb3794f" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "redox_syscall", "winapi 0.3.7", ] +[[package]] +name = "flate2" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +dependencies = [ + "cfg-if 1.0.0", + "crc32fast", + "libc", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.6" @@ -736,6 +763,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding 2.1.0", +] + [[package]] name = "fuchsia-cprng" version = "0.1.1" @@ -764,6 +801,12 @@ version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869" +[[package]] +name = "futures-core" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" + [[package]] name = "futures-cpupool" version = "0.1.8" @@ -774,6 +817,37 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "futures-macro" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +dependencies = [ + "proc-macro2 1.0.28", + "quote 1.0.9", + "syn 1.0.74", +] + +[[package]] +name = "futures-task" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" + +[[package]] +name = "futures-util" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + [[package]] name = "generic-array" version = "0.9.1" @@ -809,10 +883,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a539b63339fbbb00e081e84b6e11bd1d9634a82d91da2984a18ac74a8823f392" dependencies = [ "byteorder", - "bytes", + "bytes 0.4.12", "fnv", "futures", - "http", + "http 0.1.21", "indexmap", "log", "slab", @@ -831,7 +905,7 @@ dependencies = [ "pest", "pest_derive", "quick-error", - "regex 1.1.9", + "regex", "serde", "serde_json", "walkdir", @@ -844,42 +918,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" [[package]] -name = "hmac" -version = "0.5.0" +name = "http" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f3bdb08579d99d7dc761c0e266f13b5f2ab8c8c703b9fc9ef333cd8f48f55e" -dependencies = [ - "crypto-mac", - "digest 0.7.6", -] - -[[package]] -name = "hsm" -version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" -dependencies = [ - "chrono", - "failure", - "hsm-sys", -] - -[[package]] -name = "hsm-sys" -version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" +checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" dependencies = [ - "cmake", + "bytes 0.4.12", + "fnv", + "itoa 0.4.4", ] [[package]] name = "http" -version = "0.1.21" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ - "bytes", + "bytes 1.1.0", "fnv", - "itoa", + "itoa 1.0.1", ] [[package]] @@ -888,12 +945,31 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", - "http", + "http 0.1.21", "tokio-buf", ] +[[package]] +name = "http-common" +version = "0.1.0" +source = "git+https://github.com/Azure/iot-identity-service?branch=release/1.2#0181b9d153e721e5a1a8665a671a8f765df7fca2" +dependencies = [ + "async-trait", + "base64 0.13.0", + "futures-util", + "http 0.2.6", + "libc", + "log", + "nix", + "percent-encoding 2.1.0", + "serde", + "serde_json", + "tracing", + "url 2.2.2", +] + [[package]] name = "httparse" version = "1.3.4" @@ -909,21 +985,27 @@ dependencies = [ "quick-error", ] +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + [[package]] name = "hyper" version = "0.12.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "futures-cpupool", "h2", - "http", + "http 0.1.21", "http-body", "httparse", "iovec", - "itoa", + "itoa 0.4.4", "log", "net2", "rustc_version", @@ -934,23 +1016,9 @@ dependencies = [ "tokio-io", "tokio-reactor", "tokio-tcp", - "tokio-threadpool", - "tokio-timer", - "want", -] - -[[package]] -name = "hyper-named-pipe" -version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" -dependencies = [ - "edgelet-utils", - "failure", - "futures", - "hex", - "hyper", - "tokio-named-pipe", - "url", + "tokio-threadpool", + "tokio-timer", + "want", ] [[package]] @@ -959,9 +1027,9 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca88dbc8a46e9a7530321ae8196527673d24f6ad08ce5b35078fe6a7d4001c6" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", - "http", + "http 0.1.21", "hyper", "hyper-tls", "native-tls", @@ -976,7 +1044,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15b66d1bd4864ef036adf2363409caa3acd63ebb4725957b66e621c8a36631a3" dependencies = [ - "bytes", + "bytes 0.4.12", "ct-logs", "futures", "hyper", @@ -993,7 +1061,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "hyper", "native-tls", @@ -1015,17 +1083,24 @@ dependencies = [ ] [[package]] -name = "hyperlocal-windows" +name = "identity-client" version = "0.1.0" -source = "git+https://github.com/Azure/hyperlocal-windows#2bd432bbbfb5b1cf38429733dd9a593c7b97a850" dependencies = [ + "aziot-identity-common", + "aziot-identity-common-http", + "edgelet-core", + "edgelet-http", + "failure", "futures", - "hex", "hyper", - "mio-uds-windows", - "tokio", - "tokio-io", - "tokio-uds-windows", + "hyperlocal", + "log", + "percent-encoding 1.0.1", + "serde", + "serde_derive", + "serde_json", + "typed-headers", + "url 2.2.2", ] [[package]] @@ -1039,29 +1114,23 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "indexmap" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" -[[package]] -name = "iothubservice" -version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" -dependencies = [ - "edgelet-http", - "edgelet-utils", - "failure", - "futures", - "hyper", - "percent-encoding", - "serde", - "serde_derive", - "serde_json", - "url", -] - [[package]] name = "iovec" version = "0.1.2" @@ -1078,6 +1147,12 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + [[package]] name = "kernel32-sys" version = "0.2.2" @@ -1105,9 +1180,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" [[package]] name = "libc" -version = "0.2.98" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" +checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c" [[package]] name = "libflate" @@ -1144,13 +1219,12 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c275b6ad54070ac2d665eef9197db647b32239c9d244bfb6f041a766d00da5b3" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] name = "management" version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" dependencies = [ "base64 0.9.3", "failure", @@ -1159,9 +1233,9 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "serde_yaml 0.7.5", + "serde_yaml", "typed-headers", - "url", + "url 1.7.2", ] [[package]] @@ -1190,9 +1264,9 @@ checksum = "7e6bcd6433cff03a4bfc3d9834d504467db1f1cf6d0ea765d37d330249ed629d" [[package]] name = "memchr" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memoffset" @@ -1203,6 +1277,15 @@ dependencies = [ "autocfg 1.0.1", ] +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg 1.0.1", +] + [[package]] name = "mime" version = "0.3.13" @@ -1212,6 +1295,16 @@ dependencies = [ "unicase", ] +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg 1.0.1", +] + [[package]] name = "mio" version = "0.6.19" @@ -1313,22 +1406,22 @@ version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "winapi 0.3.7", ] [[package]] name = "nix" -version = "0.14.1" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 1.0.0", "libc", - "void", + "memoffset 0.6.5", ] [[package]] @@ -1341,6 +1434,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "ntapi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" +dependencies = [ + "winapi 0.3.7", +] + [[package]] name = "num-integer" version = "0.1.41" @@ -1369,6 +1471,12 @@ dependencies = [ "libc", ] +[[package]] +name = "once_cell" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" + [[package]] name = "opaque-debug" version = "0.2.2" @@ -1382,7 +1490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97c140cbb82f3b3468193dd14c1b88def39f341f68257f8a7fe8ed9ed3f628a5" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 0.1.10", "foreign-types", "lazy_static", "libc", @@ -1446,6 +1554,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + [[package]] name = "pest" version = "2.1.1" @@ -1489,6 +1603,18 @@ dependencies = [ "sha-1", ] +[[package]] +name = "pin-project-lite" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + [[package]] name = "pkg-config" version = "0.3.14" @@ -1514,7 +1640,7 @@ dependencies = [ "serde_json", "snitcher", "tokio", - "url", + "url 1.7.2", ] [[package]] @@ -1535,31 +1661,6 @@ dependencies = [ "unicode-xid 0.2.2", ] -[[package]] -name = "provisioning" -version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" -dependencies = [ - "base64 0.9.3", - "bytes", - "dps", - "edgelet-core", - "edgelet-hsm", - "edgelet-http", - "edgelet-http-external-provisioning", - "edgelet-utils", - "external-provisioning", - "failure", - "futures", - "hsm", - "log", - "serde", - "serde_derive", - "serde_json", - "sha2", - "url", -] - [[package]] name = "quick-error" version = "1.2.2" @@ -1732,6 +1833,31 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "rayon" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032" +dependencies = [ + "autocfg 1.0.1", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils 0.7.2", + "lazy_static", + "num_cpus", +] + [[package]] name = "rdrand" version = "0.4.0" @@ -1749,47 +1875,20 @@ checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" [[package]] name = "regex" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -dependencies = [ - "aho-corasick 0.6.10", - "memchr", - "regex-syntax 0.5.6", - "thread_local", - "utf8-ranges", -] - -[[package]] -name = "regex" -version = "1.1.9" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ - "aho-corasick 0.7.4", + "aho-corasick", "memchr", - "regex-syntax 0.6.8", - "thread_local", - "utf8-ranges", -] - -[[package]] -name = "regex-syntax" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -dependencies = [ - "ucd-util", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.8" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b01330cce219c1c6b2e209e5ed64ccd587ae5c67bed91c0b49eecf02ae40e21" -dependencies = [ - "ucd-util", -] +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "remove_dir_all" @@ -1976,23 +2075,11 @@ version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704" dependencies = [ - "itoa", + "itoa 0.4.4", "ryu", "serde", ] -[[package]] -name = "serde_yaml" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8099d3df28273c99a1728190c7a9f19d444c941044f64adf986bee7ec53051" -dependencies = [ - "dtoa", - "linked-hash-map", - "serde", - "yaml-rust", -] - [[package]] name = "serde_yaml" version = "0.8.13" @@ -2029,6 +2116,15 @@ dependencies = [ "fake-simd", ] +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + [[package]] name = "slab" version = "0.4.2" @@ -2052,15 +2148,15 @@ dependencies = [ "azure_sdk_for_rust", "backtrace", "byteorder", - "bytes", + "bytes 0.4.12", "chrono", "edgelet-core", "edgelet-http-mgmt", "env_logger 0.5.13", "futures", "hex", - "http", - "humantime", + "http 0.1.21", + "humantime 1.2.0", "hyper", "hyper-tls", "libflate", @@ -2068,12 +2164,12 @@ dependencies = [ "openssl-probe", "serde", "serde_json", - "serde_yaml 0.8.13", + "serde_yaml", "tar", "tokio", "tokio-uds", "tokio-uds-windows", - "url", + "url 1.7.2", "url_serde", ] @@ -2095,7 +2191,19 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" dependencies = [ - "bytes", + "bytes 0.4.12", +] + +[[package]] +name = "support-bundle" +version = "0.1.0" +dependencies = [ + "chrono", + "edgelet-core", + "failure", + "futures", + "tokio", + "zip", ] [[package]] @@ -2132,10 +2240,24 @@ dependencies = [ "unicode-xid 0.2.2", ] +[[package]] +name = "sysinfo" +version = "0.14.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2983daff11a197c7c406b130579bc362177aa54cf2cc1f34d6ac88fccaa6a5e1" +dependencies = [ + "cfg-if 0.1.10", + "doc-comment", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi 0.3.7", +] + [[package]] name = "systemd" version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" dependencies = [ "failure", "log", @@ -2166,7 +2288,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "rand 0.7.0", "redox_syscall", @@ -2184,12 +2306,23 @@ dependencies = [ ] [[package]] -name = "thread_local" -version = "0.3.6" +name = "thiserror" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" dependencies = [ - "lazy_static", + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +dependencies = [ + "proc-macro2 1.0.28", + "quote 1.0.9", + "syn 1.0.74", ] [[package]] @@ -2224,7 +2357,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "mio", "num_cpus", @@ -2248,7 +2381,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" dependencies = [ - "bytes", + "bytes 0.4.12", "either", "futures", ] @@ -2259,7 +2392,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "tokio-io", ] @@ -2301,19 +2434,27 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "log", ] [[package]] -name = "tokio-named-pipe" -version = "0.1.0" -source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011" +name = "tokio-process" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382d90f43fa31caebe5d3bc6cfd854963394fff3b8cb59d5146607aaae7e7e43" dependencies = [ + "crossbeam-queue 0.1.2", "futures", + "lazy_static", + "libc", + "log", + "mio", "mio-named-pipes", - "tokio", + "tokio-io", + "tokio-reactor", + "tokio-signal", "winapi 0.3.7", ] @@ -2348,6 +2489,23 @@ dependencies = [ "webpki", ] +[[package]] +name = "tokio-signal" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c34c6e548f101053321cba3da7cbb87a610b85555884c41b07da2eb91aff12" +dependencies = [ + "futures", + "libc", + "mio", + "mio-uds", + "signal-hook-registry", + "tokio-executor", + "tokio-io", + "tokio-reactor", + "winapi 0.3.7", +] + [[package]] name = "tokio-sync" version = "0.1.6" @@ -2364,7 +2522,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "iovec", "mio", @@ -2379,7 +2537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ "crossbeam-deque", - "crossbeam-queue", + "crossbeam-queue 0.2.3", "crossbeam-utils 0.7.2", "futures", "lazy_static", @@ -2418,7 +2576,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "log", "mio", @@ -2433,7 +2591,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "iovec", "libc", @@ -2450,7 +2608,7 @@ name = "tokio-uds-windows" version = "0.1.0" source = "git+https://github.com/Azure/tokio-uds-windows.git#b689a914dbaa905f359f89200c01fed7a6c8df3f" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "iovec", "log", @@ -2460,6 +2618,48 @@ dependencies = [ "tokio-reactor", ] +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "tracing" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9" +dependencies = [ + "cfg-if 1.0.0", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" +dependencies = [ + "proc-macro2 1.0.28", + "quote 1.0.9", + "syn 1.0.74", +] + +[[package]] +name = "tracing-core" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" +dependencies = [ + "lazy_static", +] + [[package]] name = "try-lock" version = "0.2.2" @@ -2473,9 +2673,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6f5af532d859106afe9077c8f95bcaa09af272d5d9b338ec1ff05830b5803c" dependencies = [ "base64 0.10.1", - "bytes", + "bytes 0.4.12", "chrono", - "http", + "http 0.1.21", "mime", ] @@ -2491,12 +2691,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71a9c5b1fe77426cf144cc30e49e955270f5086e31a6441dfa8b32efc09b9d77" -[[package]] -name = "ucd-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" - [[package]] name = "unicase" version = "2.4.0" @@ -2548,26 +2742,33 @@ version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" dependencies = [ - "idna", + "idna 0.1.5", "matches", - "percent-encoding", + "percent-encoding 1.0.1", ] [[package]] -name = "url_serde" -version = "0.2.0" +name = "url" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ + "form_urlencoded", + "idna 0.2.3", + "matches", + "percent-encoding 2.1.0", "serde", - "url", ] [[package]] -name = "utf8-ranges" -version = "1.0.3" +name = "url_serde" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50aa7650df78abf942826607c62468ce18d9019673d4a2ebe1865dbb96ffde" +checksum = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea" +dependencies = [ + "serde", + "url 1.7.2", +] [[package]] name = "uuid" @@ -2590,12 +2791,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "walkdir" version = "2.2.8" @@ -2724,3 +2919,17 @@ checksum = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d" dependencies = [ "linked-hash-map", ] + +[[package]] +name = "zip" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +dependencies = [ + "byteorder", + "bzip2", + "crc32fast", + "flate2", + "thiserror", + "time", +] diff --git a/tools/snitch/snitcher/Cargo.toml b/tools/snitch/snitcher/Cargo.toml index de3d944a135..8eeffd156c8 100644 --- a/tools/snitch/snitcher/Cargo.toml +++ b/tools/snitch/snitcher/Cargo.toml @@ -11,9 +11,8 @@ backtrace = "0.3" bytes = "0.4" byteorder = "1.2" chrono = { version = "0.4", features = ["serde"] } -# TODO: update these revisions to avoid security vulnerabilities -edgelet-http-mgmt = { git = "https://github.com/azure/iotedge", rev = "386bde07fb6af9fb55d44d38ad03fe31bb326011" } -edgelet-core = { git = "https://github.com/azure/iotedge", rev = "386bde07fb6af9fb55d44d38ad03fe31bb326011" } +edgelet-core = { path = "../../../edgelet/edgelet-core" } +edgelet-http-mgmt = { path = "../../../edgelet/edgelet-http-mgmt" } env_logger = "0.5" futures = "0.1" hex = "0.3"