From 46b961dd6f5e69f13869c39e02702cce69b64a94 Mon Sep 17 00:00:00 2001
From: onalante-msft <89409054+onalante-msft@users.noreply.github.com>
Date: Wed, 2 Feb 2022 18:46:57 -0800
Subject: [PATCH 1/3] Update vulnerable regex versions and fix compilation
 errors

Also remove executable bits on code files.
---
 edge-modules/edgehub-proxy/Cargo.lock         |  89 +---
 edgelet/Cargo.lock                            | 175 ++++----
 edgelet/edgelet-core/Cargo.toml               |   2 +-
 edgelet/edgelet-docker/src/error.rs           |   2 +-
 edgelet/edgelet-docker/src/runtime.rs         |   2 +-
 edgelet/edgelet-http-mgmt/src/error.rs        |   4 +-
 edgelet/edgelet-http-workload/Cargo.toml      |   0
 .../src/server/cert/server.rs                 |   0
 .../edgelet-http-workload/tests/dns-san.rs    |   0
 edgelet/edgelet-http/Cargo.toml               |   2 +-
 edgelet/edgelet-utils/src/lib.rs              |   0
 edgelet/iotedge-proxy/Cargo.toml              |   2 +-
 edgelet/iotedge-proxy/src/logging.rs          |   4 +-
 edgelet/iotedge/Cargo.toml                    |   2 +-
 edgelet/iotedged/Cargo.toml                   |   2 +-
 .../iotedged/docker/linux/amd64/Dockerfile    |   0
 edgelet/iotedged/src/logging.rs               |   2 +-
 edgelet/kube-client/Cargo.toml                |   4 +-
 edgelet/support-bundle/Cargo.toml             |   2 +-
 edgelet/support-bundle/src/support_bundle.rs  |  12 +-
 tools/check_submodules/Cargo.lock             |  45 +-
 tools/check_submodules/Cargo.toml             |   2 +-
 tools/check_submodules/src/logging.rs         |   2 +-
 tools/snitch/Cargo.lock                       | 419 ++++++++++++------
 tools/snitch/prep-mail/Cargo.toml             |   4 +-
 tools/snitch/snitcher/Cargo.toml              |   6 +-
 26 files changed, 406 insertions(+), 378 deletions(-)
 mode change 100755 => 100644 edgelet/Cargo.lock
 mode change 100755 => 100644 edgelet/edgelet-http-workload/Cargo.toml
 mode change 100755 => 100644 edgelet/edgelet-http-workload/src/server/cert/server.rs
 mode change 100755 => 100644 edgelet/edgelet-http-workload/tests/dns-san.rs
 mode change 100755 => 100644 edgelet/edgelet-utils/src/lib.rs
 mode change 100755 => 100644 edgelet/iotedged/docker/linux/amd64/Dockerfile

diff --git a/edge-modules/edgehub-proxy/Cargo.lock b/edge-modules/edgehub-proxy/Cargo.lock
index f750337bdab..708de26e7f5 100644
--- a/edge-modules/edgehub-proxy/Cargo.lock
+++ b/edge-modules/edgehub-proxy/Cargo.lock
@@ -19,18 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aho-corasick"
-version = "0.6.10"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
@@ -257,7 +248,7 @@ dependencies = [
  "lazy_static",
  "maybe-uninit",
  "memoffset",
- "scopeguard 1.1.0",
+ "scopeguard",
 ]
 
 [[package]]
@@ -334,7 +325,7 @@ dependencies = [
  "humantime 2.1.0",
  "lazy_static",
  "log",
- "regex 0.2.11",
+ "regex",
  "serde",
  "serde_derive",
  "serde_json",
@@ -367,8 +358,7 @@ dependencies = [
  "nix",
  "openssl",
  "percent-encoding",
- "regex 0.2.11",
- "scopeguard 0.3.3",
+ "regex",
  "serde",
  "serde_derive",
  "serde_json",
@@ -410,7 +400,7 @@ dependencies = [
  "atty",
  "humantime 1.3.0",
  "log",
- "regex 1.4.5",
+ "regex",
  "termcolor",
 ]
 
@@ -791,7 +781,7 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
 dependencies = [
- "scopeguard 1.1.0",
+ "scopeguard",
 ]
 
 [[package]]
@@ -817,9 +807,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 = "memoffset"
@@ -1175,42 +1165,20 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "0.2.11"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
- "aho-corasick 0.6.10",
+ "aho-corasick",
  "memchr",
- "regex-syntax 0.5.6",
- "thread_local",
- "utf8-ranges",
-]
-
-[[package]]
-name = "regex"
-version = "1.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
-dependencies = [
- "aho-corasick 0.7.15",
- "memchr",
- "regex-syntax 0.6.23",
-]
-
-[[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.23"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "remove_dir_all"
@@ -1258,12 +1226,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "scopeguard"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -1442,15 +1404,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.43"
@@ -1730,12 +1683,6 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
 
-[[package]]
-name = "ucd-util"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85f514e095d348c279b1e5cd76795082cf15bd59b93207832abe0b1d8fed236"
-
 [[package]]
 name = "unicode-bidi"
 version = "0.3.5"
@@ -1787,12 +1734,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "utf8-ranges"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
-
 [[package]]
 name = "vcpkg"
 version = "0.2.11"
diff --git a/edgelet/Cargo.lock b/edgelet/Cargo.lock
old mode 100755
new mode 100644
index aeb2d546a9b..becccad9279
--- a/edgelet/Cargo.lock
+++ b/edgelet/Cargo.lock
@@ -8,9 +8,9 @@ checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 
 [[package]]
 name = "aho-corasick"
-version = "0.6.4"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
@@ -79,7 +79,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5164d292487f037ece34ec0de2fcede2faa162f085dd96d2385ab81b12765ba"
 dependencies = [
  "backtrace-sys",
- "cfg-if",
+ "cfg-if 0.1.9",
  "libc",
  "rustc-demangle",
 ]
@@ -188,9 +188,9 @@ checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
 
 [[package]]
 name = "bzip2"
-version = "0.3.3"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b"
+checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0"
 dependencies = [
  "bzip2-sys",
  "libc",
@@ -198,12 +198,13 @@ dependencies = [
 
 [[package]]
 name = "bzip2-sys"
-version = "0.1.7"
+version = "0.1.11+1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f"
+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
 dependencies = [
  "cc",
  "libc",
+ "pkg-config",
 ]
 
 [[package]]
@@ -228,6 +229,12 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
 
+[[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.9"
@@ -333,7 +340,7 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.9",
 ]
 
 [[package]]
@@ -354,12 +361,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
  "autocfg",
- "cfg-if",
+ "cfg-if 0.1.9",
  "crossbeam-utils 0.7.2",
  "lazy_static",
  "maybe-uninit",
  "memoffset",
- "scopeguard 1.0.0",
+ "scopeguard",
 ]
 
 [[package]]
@@ -377,7 +384,7 @@ version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.9",
  "lazy_static",
 ]
 
@@ -388,7 +395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
  "autocfg",
- "cfg-if",
+ "cfg-if 0.1.9",
  "lazy_static",
 ]
 
@@ -483,7 +490,7 @@ dependencies = [
  "failure",
  "futures",
  "hmac",
- "humantime 2.1.0",
+ "humantime",
  "lazy_static",
  "log",
  "regex",
@@ -577,7 +584,6 @@ dependencies = [
  "percent-encoding 1.0.1",
  "rand 0.4.2",
  "regex",
- "scopeguard 0.3.3",
  "serde",
  "serde_derive",
  "serde_json",
@@ -761,15 +767,15 @@ checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 
 [[package]]
 name = "env_logger"
-version = "0.5.9"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00c45cec4cde3daac5f036c74098b4956151525cdf360cff5ee0092c98823e54"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
 dependencies = [
  "atty",
- "humantime 1.1.1",
+ "humantime",
  "log",
  "regex",
- "termcolor",
+ "termcolor 1.1.2",
 ]
 
 [[package]]
@@ -999,15 +1005,6 @@ version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2f407128745b78abc95c0ffbe4e5d37427fdc0d45470710cfef8c44522a2e37"
 
-[[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"
@@ -1184,7 +1181,7 @@ dependencies = [
  "sysinfo",
  "tabwriter",
  "tempfile",
- "termcolor",
+ "termcolor 0.3.6",
  "tokio",
  "typed-headers",
  "url 1.7.2",
@@ -1406,11 +1403,11 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
 [[package]]
 name = "log"
-version = "0.4.5"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fcce5fa49cc693c312001daf1d13411c4a5283796bac1084299ea3e567113f"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -1448,12 +1445,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
 [[package]]
 name = "memchr"
-version = "2.0.1"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
-dependencies = [
- "libc",
-]
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "memoffset"
@@ -1592,7 +1586,7 @@ version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9044faf1413a1057267be51b5afba8eb1090bd2231c693664aa1db716fe1eae0"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.9",
  "libc",
  "winapi 0.3.8",
 ]
@@ -1605,7 +1599,7 @@ checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
 dependencies = [
  "bitflags",
  "cc",
- "cfg-if",
+ "cfg-if 0.1.9",
  "libc",
  "void",
 ]
@@ -1682,7 +1676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e2e79eede055813a3ac52fb3915caf8e1c9da2dec1587871aec9f6f7b48508d"
 dependencies = [
  "bitflags",
- "cfg-if",
+ "cfg-if 0.1.9",
  "foreign-types",
  "lazy_static",
  "libc",
@@ -1734,12 +1728,6 @@ version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "110d5ee3593dbb73f56294327fe5668bcc997897097cbc76b51e7aed3f52452f"
 
-[[package]]
-name = "podio"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd"
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.5"
@@ -1790,12 +1778,6 @@ dependencies = [
  "url 1.7.2",
 ]
 
-[[package]]
-name = "quick-error"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4"
-
 [[package]]
 name = "quote"
 version = "0.6.8"
@@ -1938,25 +1920,20 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "0.2.11"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local",
- "utf8-ranges",
 ]
 
 [[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",
-]
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "remove_dir_all"
@@ -2010,12 +1987,6 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 
-[[package]]
-name = "scopeguard"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
-
 [[package]]
 name = "scopeguard"
 version = "1.0.0"
@@ -2141,7 +2112,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff606e0486e88f5fc6cfeb3966e434fb409abbc7a3ab495238f70a1ca97f789d"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.9",
  "libc",
  "winapi 0.3.8",
 ]
@@ -2222,7 +2193,7 @@ version = "0.14.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2983daff11a197c7c406b130579bc362177aa54cf2cc1f34d6ac88fccaa6a5e1"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.9",
  "doc-comment",
  "libc",
  "ntapi",
@@ -2266,7 +2237,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.9",
  "libc",
  "rand 0.7.2",
  "redox_syscall",
@@ -2283,6 +2254,15 @@ dependencies = [
  "wincolor",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "termion"
 version = "1.5.1"
@@ -2317,13 +2297,23 @@ dependencies = [
 ]
 
 [[package]]
-name = "thread_local"
-version = "0.3.5"
+name = "thiserror"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963"
+checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42"
 dependencies = [
- "lazy_static",
- "unreachable",
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab"
+dependencies = [
+ "proc-macro2 1.0.6",
+ "quote 1.0.2",
+ "syn 1.0.11",
 ]
 
 [[package]]
@@ -2612,12 +2602,6 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
 
-[[package]]
-name = "ucd-util"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
-
 [[package]]
 name = "unicase"
 version = "2.1.0"
@@ -2660,15 +2644,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 
-[[package]]
-name = "unreachable"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
-dependencies = [
- "void",
-]
-
 [[package]]
 name = "url"
 version = "1.7.2"
@@ -2701,12 +2676,6 @@ dependencies = [
  "url 1.7.2",
 ]
 
-[[package]]
-name = "utf8-ranges"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
-
 [[package]]
 name = "vcpkg"
 version = "0.2.3"
@@ -2792,6 +2761,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -2864,13 +2842,14 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "0.5.3"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c21bb410afa2bd823a047f5bda3adb62f51074ac7e06263b2c97ecdd47e9fc6"
+checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815"
 dependencies = [
+ "byteorder",
  "bzip2",
  "crc32fast",
  "flate2",
- "podio",
+ "thiserror",
  "time",
 ]
diff --git a/edgelet/edgelet-core/Cargo.toml b/edgelet/edgelet-core/Cargo.toml
index 9e1bca2370f..ae0344b0eab 100644
--- a/edgelet/edgelet-core/Cargo.toml
+++ b/edgelet/edgelet-core/Cargo.toml
@@ -15,7 +15,7 @@ failure = "0.1"
 hmac = "0.5.0"
 humantime = "2"
 lazy_static = "1.0"
-regex = "0.2"
+regex = "1"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
diff --git a/edgelet/edgelet-docker/src/error.rs b/edgelet/edgelet-docker/src/error.rs
index 9c2d41af092..5b635b8acd3 100644
--- a/edgelet/edgelet-docker/src/error.rs
+++ b/edgelet/edgelet-docker/src/error.rs
@@ -148,7 +148,7 @@ impl From<Context<ErrorKind>> for Error {
 
 impl<'a> From<&'a Error> for ModuleRuntimeErrorReason {
     fn from(err: &'a Error) -> Self {
-        match Fail::find_root_cause(err).downcast_ref::<ErrorKind>() {
+        match <dyn Fail>::find_root_cause(err).downcast_ref::<ErrorKind>() {
             Some(ErrorKind::NotFound(_)) => ModuleRuntimeErrorReason::NotFound,
             _ => ModuleRuntimeErrorReason::Other,
         }
diff --git a/edgelet/edgelet-docker/src/runtime.rs b/edgelet/edgelet-docker/src/runtime.rs
index 14e55936d6d..f37c40ba213 100644
--- a/edgelet/edgelet-docker/src/runtime.rs
+++ b/edgelet/edgelet-docker/src/runtime.rs
@@ -931,7 +931,7 @@ impl ModuleRuntime for DockerModuleRuntime {
                     wait_before_kill,
                 )
                 .or_else(|err| {
-                    match Fail::find_root_cause(&err).downcast_ref::<ErrorKind>() {
+                    match <dyn Fail>::find_root_cause(&err).downcast_ref::<ErrorKind>() {
                         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 ddcadeb3a81..4f35a500327 100644
--- a/edgelet/edgelet-http-mgmt/src/error.rs
+++ b/edgelet/edgelet-http-mgmt/src/error.rs
@@ -122,13 +122,13 @@ impl From<Context<ErrorKind>> for Error {
 impl IntoResponse for Error {
     fn into_response(self) -> Response<Body> {
         let mut message = self.to_string();
-        for cause in Fail::iter_causes(&self) {
+        for cause in <dyn Fail>::iter_causes(&self) {
             message.push_str(&format!("\n\tcaused by: {}", cause));
         }
 
         // 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::<DockerErrorKind>() {
+            if let Some(cause) = <dyn Fail>::find_root_cause(&self).downcast_ref::<DockerErrorKind>() {
                 match cause {
                     DockerErrorKind::NotFound(_) => StatusCode::NOT_FOUND,
                     DockerErrorKind::Conflict => StatusCode::CONFLICT,
diff --git a/edgelet/edgelet-http-workload/Cargo.toml b/edgelet/edgelet-http-workload/Cargo.toml
old mode 100755
new mode 100644
diff --git a/edgelet/edgelet-http-workload/src/server/cert/server.rs b/edgelet/edgelet-http-workload/src/server/cert/server.rs
old mode 100755
new mode 100644
diff --git a/edgelet/edgelet-http-workload/tests/dns-san.rs b/edgelet/edgelet-http-workload/tests/dns-san.rs
old mode 100755
new mode 100644
diff --git a/edgelet/edgelet-http/Cargo.toml b/edgelet/edgelet-http/Cargo.toml
index 6ea2ba4b17c..49552a18a41 100644
--- a/edgelet/edgelet-http/Cargo.toml
+++ b/edgelet/edgelet-http/Cargo.toml
@@ -16,7 +16,7 @@ hyper-tls = "0.3"
 log = "0.4"
 openssl = "0.10"
 percent-encoding = "1.0"
-regex = "0.2"
+regex = "1"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
diff --git a/edgelet/edgelet-utils/src/lib.rs b/edgelet/edgelet-utils/src/lib.rs
old mode 100755
new mode 100644
diff --git a/edgelet/iotedge-proxy/Cargo.toml b/edgelet/iotedge-proxy/Cargo.toml
index 1b30d1bd50b..99af600dec3 100644
--- a/edgelet/iotedge-proxy/Cargo.toml
+++ b/edgelet/iotedge-proxy/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 clap = "2.31"
 config = { version = "0.9", default-features = false, features = ["yaml"] }
-env_logger = "0.5"
+env_logger = "0.9"
 failure = "0.1"
 futures = "0.1"
 hyper = "0.12"
diff --git a/edgelet/iotedge-proxy/src/logging.rs b/edgelet/iotedge-proxy/src/logging.rs
index e73db6fdd82..28ae4ae10d5 100644
--- a/edgelet/iotedge-proxy/src/logging.rs
+++ b/edgelet/iotedge-proxy/src/logging.rs
@@ -8,8 +8,8 @@ use log::{log, Level, LevelFilter};
 pub fn init() {
     env_logger::Builder::new()
         .filter_level(LevelFilter::Info)
-        .default_format_module_path(false)
-        .parse(&env::var("PROXY_LOG").unwrap_or_default())
+        .format_module_path(false)
+        .parse_filters(&env::var("PROXY_LOG").unwrap_or_default())
         .init();
 }
 
diff --git a/edgelet/iotedge/Cargo.toml b/edgelet/iotedge/Cargo.toml
index 05721c473d9..691d1220184 100644
--- a/edgelet/iotedge/Cargo.toml
+++ b/edgelet/iotedge/Cargo.toml
@@ -20,7 +20,7 @@ hyper-tls = "0.3"
 lazy_static = "1"
 native-tls = "0.2"
 openssl = "0.10"
-regex = "0.2"
+regex = "1"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
diff --git a/edgelet/iotedged/Cargo.toml b/edgelet/iotedged/Cargo.toml
index fa844315c6c..95b3934f6d4 100644
--- a/edgelet/iotedged/Cargo.toml
+++ b/edgelet/iotedged/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 base64 = "0.9"
 clap = "2.31"
 chrono = "0.4"
-env_logger = "0.5"
+env_logger = "0.9"
 failure = "0.1"
 futures = "0.1"
 hyper = "0.12.17"
diff --git a/edgelet/iotedged/docker/linux/amd64/Dockerfile b/edgelet/iotedged/docker/linux/amd64/Dockerfile
old mode 100755
new mode 100644
diff --git a/edgelet/iotedged/src/logging.rs b/edgelet/iotedged/src/logging.rs
index be760ae0f6b..8536ffb7909 100644
--- a/edgelet/iotedged/src/logging.rs
+++ b/edgelet/iotedged/src/logging.rs
@@ -51,7 +51,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/edgelet/kube-client/Cargo.toml b/edgelet/kube-client/Cargo.toml
index b2e5ad10539..09ac73b1810 100644
--- a/edgelet/kube-client/Cargo.toml
+++ b/edgelet/kube-client/Cargo.toml
@@ -22,7 +22,7 @@ serde_yaml = "0.8"
 url = "1.7"
 
 [dev_dependencies]
-env_logger = "0.5"
+env_logger = "0.9"
 tempdir = "0.3.7"
 tokio = "0.1"
-serde_json = "1.0"
\ No newline at end of file
+serde_json = "1.0"
diff --git a/edgelet/support-bundle/Cargo.toml b/edgelet/support-bundle/Cargo.toml
index f42f58068b1..96b9bb0cc8d 100644
--- a/edgelet/support-bundle/Cargo.toml
+++ b/edgelet/support-bundle/Cargo.toml
@@ -15,5 +15,5 @@ edgelet-core = { path = "../edgelet-core" }
 
 [dev-dependencies]
 edgelet-test-utils = { path = "../edgelet-test-utils" }
-regex = "0.2"
+regex = "1"
 tempfile = "3.1.0"
diff --git a/edgelet/support-bundle/src/support_bundle.rs b/edgelet/support-bundle/src/support_bundle.rs
index fb3e1e32516..2bae45b1daf 100644
--- a/edgelet/support-bundle/src/support_bundle.rs
+++ b/edgelet/support-bundle/src/support_bundle.rs
@@ -243,7 +243,7 @@ where
 
         let file_name = format!("{}_log.txt", module_name);
         zip_writer
-            .start_file_from_path(&Path::new("logs").join(file_name), file_options)
+            .start_file(Path::new("logs").join(file_name).to_string_lossy(), file_options)
             .into_future()
             .map_err(|err| Error::from(err.context(ErrorKind::SupportBundle)))
             .and_then(move |_| {
@@ -320,7 +320,7 @@ where
         };
 
         self.zip_writer
-            .start_file_from_path(&Path::new("logs").join(file_name), self.file_options)
+            .start_file(Path::new("logs").join(file_name).to_string_lossy(), self.file_options)
             .map_err(|err| Error::from(err.context(ErrorKind::SupportBundle)))?;
 
         self.zip_writer
@@ -375,7 +375,7 @@ where
         };
 
         self.zip_writer
-            .start_file_from_path(&Path::new("logs").join(file_name), self.file_options)
+            .start_file(Path::new("logs").join(file_name).to_string_lossy(), self.file_options)
             .map_err(|err| Error::from(err.context(ErrorKind::SupportBundle)))?;
 
         self.zip_writer
@@ -406,7 +406,7 @@ where
             .map_err(|err| Error::from(err.context(ErrorKind::SupportBundle)))?;
 
         self.zip_writer
-            .start_file_from_path(&Path::new("check.json"), self.file_options)
+            .start_file("check.json", self.file_options)
             .map_err(|err| Error::from(err.context(ErrorKind::SupportBundle)))?;
 
         self.zip_writer
@@ -456,7 +456,7 @@ where
         };
 
         self.zip_writer
-            .start_file_from_path(&Path::new(&file_name), self.file_options)
+            .start_file(file_name, self.file_options)
             .map_err(|err| Error::from(err.context(ErrorKind::SupportBundle)))?;
 
         self.zip_writer
@@ -533,7 +533,7 @@ where
         };
 
         self.zip_writer
-            .start_file_from_path(&Path::new(&file_name), self.file_options)
+            .start_file(file_name, self.file_options)
             .map_err(|err| Error::from(err.context(ErrorKind::SupportBundle)))?;
 
         self.zip_writer
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 5650dce0d13..b445afe8f57 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",
 ]
@@ -97,7 +94,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18b50f5258d1a9ad8396d2d345827875de4261b158124d4c819d9b351454fae5"
 dependencies = [
  "backtrace-sys",
- "cfg-if",
+ "cfg-if 0.1.9",
  "libc",
  "rustc-demangle",
 ]
@@ -197,6 +194,27 @@ dependencies = [
  "iovec",
 ]
 
+[[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"
@@ -219,6 +237,12 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
 
+[[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"
@@ -296,7 +320,17 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.9",
+]
+
+[[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,7 +351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
  "autocfg 1.0.1",
- "cfg-if",
+ "cfg-if 0.1.9",
  "crossbeam-utils 0.7.2",
  "lazy_static",
  "maybe-uninit",
@@ -340,7 +374,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.9",
  "lazy_static",
 ]
 
@@ -351,7 +385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
  "autocfg 1.0.1",
- "cfg-if",
+ "cfg-if 0.1.9",
  "lazy_static",
 ]
 
@@ -392,10 +426,15 @@ dependencies = [
  "generic-array 0.12.3",
 ]
 
+[[package]]
+name = "doc-comment"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+
 [[package]]
 name = "docker"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "base64 0.9.3",
  "failure",
@@ -404,7 +443,6 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "serde_yaml 0.7.5",
  "typed-headers",
  "url",
 ]
@@ -412,7 +450,6 @@ dependencies = [
 [[package]]
 name = "dps"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "base64 0.9.3",
  "bytes",
@@ -440,7 +477,6 @@ 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",
@@ -450,9 +486,10 @@ dependencies = [
  "failure",
  "futures",
  "hmac",
+ "humantime 2.1.0",
  "lazy_static",
  "log",
- "regex 0.2.11",
+ "regex",
  "serde",
  "serde_derive",
  "serde_json",
@@ -465,7 +502,6 @@ dependencies = [
 [[package]]
 name = "edgelet-docker"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "base64 0.9.3",
  "chrono",
@@ -479,20 +515,22 @@ dependencies = [
  "futures",
  "hyper",
  "lazy_static",
+ "libc",
  "log",
  "provisioning",
  "serde",
  "serde_derive",
  "serde_json",
+ "sysinfo",
  "tokio",
  "url",
  "url_serde",
+ "winapi 0.3.7",
 ]
 
 [[package]]
 name = "edgelet-hsm"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "bytes",
  "chrono",
@@ -504,12 +542,10 @@ dependencies = [
 [[package]]
 name = "edgelet-http"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "bytes",
  "chrono",
  "edgelet-core",
- "edgelet-hsm",
  "edgelet-utils",
  "failure",
  "futures",
@@ -526,8 +562,7 @@ dependencies = [
  "nix",
  "openssl",
  "percent-encoding",
- "regex 0.2.11",
- "scopeguard 0.3.3",
+ "regex",
  "serde",
  "serde_derive",
  "serde_json",
@@ -545,7 +580,6 @@ dependencies = [
 [[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",
@@ -565,7 +599,6 @@ dependencies = [
 [[package]]
 name = "edgelet-http-mgmt"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "edgelet-core",
  "edgelet-docker",
@@ -580,13 +613,13 @@ dependencies = [
  "provisioning",
  "serde",
  "serde_json",
+ "support-bundle",
  "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",
@@ -604,7 +637,6 @@ dependencies = [
 [[package]]
 name = "edgelet-utils"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "config",
  "failure",
@@ -622,27 +654,27 @@ checksum = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b"
 
 [[package]]
 name = "env_logger"
-version = "0.5.13"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
+checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
 dependencies = [
  "atty",
- "humantime",
+ "humantime 1.2.0",
  "log",
- "regex 1.1.9",
+ "regex",
  "termcolor",
 ]
 
 [[package]]
 name = "env_logger"
-version = "0.6.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
 dependencies = [
  "atty",
- "humantime",
+ "humantime 2.1.0",
  "log",
- "regex 1.1.9",
+ "regex",
  "termcolor",
 ]
 
@@ -658,7 +690,6 @@ dependencies = [
 [[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",
@@ -668,7 +699,6 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "serde_yaml 0.7.5",
  "typed-headers",
  "url",
 ]
@@ -689,9 +719,9 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.39",
  "synstructure",
 ]
 
@@ -707,12 +737,24 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "450537dc346f0c4d738dda31e790da1da5d4bd12145aad4da0d03d713cb3794f"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.9",
  "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"
@@ -829,7 +871,7 @@ dependencies = [
  "pest",
  "pest_derive",
  "quick-error",
- "regex 1.1.9",
+ "regex",
  "serde",
  "serde_json",
  "walkdir",
@@ -854,7 +896,6 @@ dependencies = [
 [[package]]
 name = "hsm"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "chrono",
  "failure",
@@ -864,7 +905,6 @@ dependencies = [
 [[package]]
 name = "hsm-sys"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "cmake",
 ]
@@ -907,6 +947,12 @@ 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.35"
@@ -940,7 +986,6 @@ dependencies = [
 [[package]]
 name = "hyper-named-pipe"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "edgelet-utils",
  "failure",
@@ -1046,7 +1091,6 @@ checksum = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
 [[package]]
 name = "iothubservice"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "edgelet-http",
  "edgelet-utils",
@@ -1103,9 +1147,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 
 [[package]]
 name = "libc"
-version = "0.2.59"
+version = "0.2.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3262021842bf00fe07dbd6cf34ff25c99d7a7ebef8deea84db72be3ea3bb0aff"
+checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c"
 
 [[package]]
 name = "libflate"
@@ -1138,17 +1182,16 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.7"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c275b6ad54070ac2d665eef9197db647b32239c9d244bfb6f041a766d00da5b3"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "management"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "base64 0.9.3",
  "failure",
@@ -1157,7 +1200,6 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "serde_yaml 0.7.5",
  "typed-headers",
  "url",
 ]
@@ -1188,9 +1230,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"
@@ -1210,6 +1252,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"
@@ -1312,7 +1364,7 @@ version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.9",
  "libc",
  "winapi 0.3.7",
 ]
@@ -1325,7 +1377,7 @@ checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
 dependencies = [
  "bitflags",
  "cc",
- "cfg-if",
+ "cfg-if 0.1.9",
  "libc",
  "void",
 ]
@@ -1340,6 +1392,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"
@@ -1368,6 +1429,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"
@@ -1381,7 +1448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97c140cbb82f3b3468193dd14c1b88def39f341f68257f8a7fe8ed9ed3f628a5"
 dependencies = [
  "bitflags",
- "cfg-if",
+ "cfg-if 0.1.9",
  "foreign-types",
  "lazy_static",
  "libc",
@@ -1472,9 +1539,9 @@ checksum = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.39",
 ]
 
 [[package]]
@@ -1504,7 +1571,7 @@ checksum = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
 name = "prep-mail"
 version = "0.1.0"
 dependencies = [
- "env_logger 0.5.13",
+ "env_logger 0.9.0",
  "futures",
  "handlebars",
  "hyper",
@@ -1522,13 +1589,21 @@ version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 dependencies = [
- "unicode-xid",
+ "unicode-xid 0.1.0",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+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",
@@ -1562,7 +1637,16 @@ version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 0.4.30",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
+dependencies = [
+ "proc-macro2 1.0.36",
 ]
 
 [[package]]
@@ -1713,6 +1797,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"
@@ -1730,47 +1839,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"
@@ -1946,9 +2028,9 @@ version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef45eb79d6463b22f5f9e16d283798b7c0175ba6050bc25c1a946c122727fe7b"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.39",
 ]
 
 [[package]]
@@ -1962,18 +2044,6 @@ dependencies = [
  "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"
@@ -2037,11 +2107,11 @@ dependencies = [
  "chrono",
  "edgelet-core",
  "edgelet-http-mgmt",
- "env_logger 0.5.13",
+ "env_logger 0.9.0",
  "futures",
  "hex",
  "http",
- "humantime",
+ "humantime 1.2.0",
  "hyper",
  "hyper-tls",
  "libflate",
@@ -2049,7 +2119,7 @@ dependencies = [
  "openssl-probe",
  "serde",
  "serde_json",
- "serde_yaml 0.8.13",
+ "serde_yaml",
  "tar",
  "tokio",
  "tokio-uds",
@@ -2064,7 +2134,7 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e626972d3593207547f14bf5fc9efa4d0e7283deb73fef1dff313dae9ab8878"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.9",
  "libc",
  "redox_syscall",
  "winapi 0.3.7",
@@ -2091,15 +2161,38 @@ dependencies = [
  "bytes",
 ]
 
+[[package]]
+name = "support-bundle"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "edgelet-core",
+ "failure",
+ "futures",
+ "tokio",
+ "zip",
+]
+
 [[package]]
 name = "syn"
 version = "0.15.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4d960b829a55e56db167e861ddb43602c003c7be0bee1d345021703fac2fb7c"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "unicode-xid 0.1.0",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
+dependencies = [
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "unicode-xid 0.2.2",
 ]
 
 [[package]]
@@ -2108,16 +2201,30 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "unicode-xid",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.39",
+ "unicode-xid 0.1.0",
+]
+
+[[package]]
+name = "sysinfo"
+version = "0.14.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2983daff11a197c7c406b130579bc362177aa54cf2cc1f34d6ac88fccaa6a5e1"
+dependencies = [
+ "cfg-if 0.1.9",
+ "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",
@@ -2148,7 +2255,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.9",
  "libc",
  "rand 0.7.0",
  "redox_syscall",
@@ -2166,12 +2273,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.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -2276,7 +2394,6 @@ dependencies = [
 [[package]]
 name = "tokio-named-pipe"
 version = "0.1.0"
-source = "git+https://github.com/azure/iotedge?rev=386bde07fb6af9fb55d44d38ad03fe31bb326011#386bde07fb6af9fb55d44d38ad03fe31bb326011"
 dependencies = [
  "futures",
  "mio-named-pipes",
@@ -2458,12 +2575,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"
@@ -2497,6 +2608,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+
 [[package]]
 name = "untrusted"
 version = "0.6.2"
@@ -2524,12 +2641,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "utf8-ranges"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d50aa7650df78abf942826607c62468ce18d9019673d4a2ebe1865dbb96ffde"
-
 [[package]]
 name = "uuid"
 version = "0.7.4"
@@ -2685,3 +2796,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/prep-mail/Cargo.toml b/tools/snitch/prep-mail/Cargo.toml
index 9eac302e928..e55b2bac213 100644
--- a/tools/snitch/prep-mail/Cargo.toml
+++ b/tools/snitch/prep-mail/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-env_logger = "0.5"
+env_logger = "0.9"
 futures = "0.1"
 handlebars = "1.0"
 hyper = "0.12"
@@ -16,4 +16,4 @@ serde_json = "1.0"
 tokio = "0.1"
 url = "1.7"
 
-snitcher = { path = "../snitcher" }
\ No newline at end of file
+snitcher = { path = "../snitcher" }
diff --git a/tools/snitch/snitcher/Cargo.toml b/tools/snitch/snitcher/Cargo.toml
index 393b6d4fb4a..d6efe0b0f30 100644
--- a/tools/snitch/snitcher/Cargo.toml
+++ b/tools/snitch/snitcher/Cargo.toml
@@ -11,9 +11,9 @@ backtrace = "0.3"
 bytes = "0.4"
 byteorder = "1.2"
 chrono = { version = "0.4", features = ["serde"] }
-edgelet-http-mgmt = { git = "https://github.com/azure/iotedge", rev = "386bde07fb6af9fb55d44d38ad03fe31bb326011" }
-edgelet-core = { git = "https://github.com/azure/iotedge", rev = "386bde07fb6af9fb55d44d38ad03fe31bb326011" }
-env_logger = "0.5"
+env_logger = "0.9"
+edgelet-core = { path = "../../../edgelet/edgelet-core" }
+edgelet-http-mgmt = { path = "../../../edgelet/edgelet-http-mgmt" }
 futures = "0.1"
 hex = "0.3"
 http = "0.1"

From 7eb176897f3d116aa68bd498d861620b08c13c60 Mon Sep 17 00:00:00 2001
From: onalante-msft <89409054+onalante-msft@users.noreply.github.com>
Date: Fri, 4 Feb 2022 12:05:27 -0800
Subject: [PATCH 2/3] Force use of '/' on Windows hosts

---
 edgelet/support-bundle/src/support_bundle.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/edgelet/support-bundle/src/support_bundle.rs b/edgelet/support-bundle/src/support_bundle.rs
index 2bae45b1daf..bdf5a4814f6 100644
--- a/edgelet/support-bundle/src/support_bundle.rs
+++ b/edgelet/support-bundle/src/support_bundle.rs
@@ -243,7 +243,7 @@ where
 
         let file_name = format!("{}_log.txt", module_name);
         zip_writer
-            .start_file(Path::new("logs").join(file_name).to_string_lossy(), file_options)
+            .start_file(format!("logs/{}", file_name), file_options)
             .into_future()
             .map_err(|err| Error::from(err.context(ErrorKind::SupportBundle)))
             .and_then(move |_| {
@@ -320,7 +320,7 @@ where
         };
 
         self.zip_writer
-            .start_file(Path::new("logs").join(file_name).to_string_lossy(), self.file_options)
+            .start_file(format!("logs/{}", file_name), self.file_options)
             .map_err(|err| Error::from(err.context(ErrorKind::SupportBundle)))?;
 
         self.zip_writer
@@ -375,7 +375,7 @@ where
         };
 
         self.zip_writer
-            .start_file(Path::new("logs").join(file_name).to_string_lossy(), self.file_options)
+            .start_file(format!("logs/{}", file_name), self.file_options)
             .map_err(|err| Error::from(err.context(ErrorKind::SupportBundle)))?;
 
         self.zip_writer

From 6e1889f1a78401c851f48b6e863de7f93c15f215 Mon Sep 17 00:00:00 2001
From: onalante-msft <89409054+onalante-msft@users.noreply.github.com>
Date: Fri, 4 Feb 2022 13:21:36 -0800
Subject: [PATCH 3/3] rustfmt

---
 edgelet/edgelet-http-mgmt/src/error.rs | 39 +++++++++++++-------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/edgelet/edgelet-http-mgmt/src/error.rs b/edgelet/edgelet-http-mgmt/src/error.rs
index 4f35a500327..a548e9bd1af 100644
--- a/edgelet/edgelet-http-mgmt/src/error.rs
+++ b/edgelet/edgelet-http-mgmt/src/error.rs
@@ -127,26 +127,27 @@ impl IntoResponse for Error {
         }
 
         // Specialize status code based on the underlying docker runtime error, if any
-        let status_code =
-            if let Some(cause) = <dyn Fail>::find_root_cause(&self).downcast_ref::<DockerErrorKind>() {
-                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::MalformedRequestBody
-                    | ErrorKind::MalformedRequestParameter(_)
-                    | ErrorKind::MissingRequiredParameter(_) => StatusCode::BAD_REQUEST,
-                    _ => {
-                        error!("Internal server error: {}", message);
-                        StatusCode::INTERNAL_SERVER_ERROR
-                    }
+        let status_code = if let Some(cause) =
+            <dyn Fail>::find_root_cause(&self).downcast_ref::<DockerErrorKind>()
+        {
+            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::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 {