Merge pull request #1267 from webern/bump

update cargo dependencies
bottlerocket-os · Jan 11, 2021 · d3ebb91 · d3ebb91
2 parents 6cd8754 + f2d56ed
commit d3ebb91
Show file tree

Hide file tree

Showing 39 changed files with 660 additions and 505 deletions.
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/api/apiclient/Cargo.toml b/sources/api/apiclient/Cargo.toml
@@ -13,13 +13,15 @@ exclude = ["README.md"]
 http = "0.2"
 hyper = { version = "0.13", default-features = false }
 hyper-unix-connector = "0.1"
+# when we update hyper to 0.14+ and tokio to 1
+# hyper-unix-connector = "0.2"
 log = "0.4"
 serde_json = "1.0"
-simplelog = "0.8"
+simplelog = "0.9"
 snafu = "0.6"
 tokio = { version = "0.2", default-features = false, features = ["macros", "rt-threaded", "time"] }
-# When hyper updates to tokio 0.3:
-#tokio = { version = "0.3", default-features = false, features = ["macros", "rt-multi-thread", "time"] }
+# When we update hyper to 0.14+ which has tokio 1:
+#tokio = { version = "1", default-features = false, features = ["macros", "rt-multi-thread", "time"] }
 unindent = "0.1"
 
 [build-dependencies]

diff --git a/sources/api/apiclient/src/main.rs b/sources/api/apiclient/src/main.rs
@@ -423,7 +423,7 @@ mod error {
         Check { source: update::Error },
 
         #[snafu(display("Logger setup error: {}", source))]
-        Logger { source: simplelog::TermLogError },
+        Logger { source: log::SetLoggerError },
 
         #[snafu(display("Failed {} request to '{}': {}", method, uri, source))]
         Request {

diff --git a/sources/api/apiserver/Cargo.toml b/sources/api/apiserver/Cargo.toml
@@ -25,7 +25,7 @@ percent-encoding = "2.1"
 semver = "0.11"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-simplelog = "0.8"
+simplelog = "0.9"
 snafu = "0.6"
 thar-be-updates = { path = "../thar-be-updates" }
 walkdir = "2.2"

diff --git a/sources/api/apiserver/src/bin/apiserver.rs b/sources/api/apiserver/src/bin/apiserver.rs
@@ -33,7 +33,7 @@ mod error {
         Server { source: apiserver::server::Error },
 
         #[snafu(display("Logger setup error: {}", source))]
-        Logger { source: simplelog::TermLogError },
+        Logger { source: log::SetLoggerError },
     }
 }
 

diff --git a/sources/api/bork/Cargo.toml b/sources/api/bork/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 exclude = ["README.md"]
 
 [dependencies]
-rand = "0.7.0"
+rand = "0.8"
 serde_json = "1"
diff --git a/sources/api/bork/src/main.rs b/sources/api/bork/src/main.rs
@@ -4,7 +4,7 @@ use rand::{thread_rng, Rng};
 
 fn main() {
     let mut rng = thread_rng();
-    let val = rng.gen_range(0, 2048);
+    let val = rng.gen_range(0..2048);
 
     // sundog expects JSON-serialized output so that many types can be represented, allowing the
     // API model to use more accurate types.

diff --git a/sources/api/corndog/Cargo.toml b/sources/api/corndog/Cargo.toml
@@ -16,7 +16,7 @@ log = "0.4"
 models = { path = "../../models" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-simplelog = "0.8"
+simplelog = "0.9"
 snafu = "0.6"
 tokio = { version = "0.2", default-features = false, features = ["macros", "rt-threaded"] }
 # When hyper updates to tokio 0.3:

diff --git a/sources/api/corndog/src/main.rs b/sources/api/corndog/src/main.rs
@@ -281,7 +281,7 @@ mod error {
         },
 
         #[snafu(display("Logger setup error: {}", source))]
-        Logger { source: simplelog::TermLogError },
+        Logger { source: log::SetLoggerError },
 
         #[snafu(display(
             "Error deserializing response as JSON from {} to '{}': {}",

diff --git a/sources/api/early-boot-config/Cargo.toml b/sources/api/early-boot-config/Cargo.toml
@@ -16,7 +16,7 @@ log = "0.4"
 reqwest = { version = "0.10", default-features = false, features = ["blocking"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-simplelog = "0.8"
+simplelog = "0.9"
 snafu = "0.6"
 tokio = { version = "0.2", default-features = false, features = ["macros", "rt-threaded"] }
 # When hyper updates to tokio 0.3:

diff --git a/sources/api/early-boot-config/src/main.rs b/sources/api/early-boot-config/src/main.rs
@@ -121,7 +121,7 @@ mod error {
         IdentityDocMissingData { missing: String },
 
         #[snafu(display("Logger setup error: {}", source))]
-        Logger { source: simplelog::TermLogError },
+        Logger { source: log::SetLoggerError },
     }
 }
 

diff --git a/sources/api/host-containers/Cargo.toml b/sources/api/host-containers/Cargo.toml
@@ -17,7 +17,7 @@ log = "0.4"
 models = { path = "../../models" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-simplelog = "0.8"
+simplelog = "0.9"
 snafu = "0.6"
 tokio = { version = "0.2", default-features = false, features = ["macros", "rt-threaded"] }
 # When hyper updates to tokio 0.3:

diff --git a/sources/api/host-containers/src/main.rs b/sources/api/host-containers/src/main.rs
@@ -105,7 +105,7 @@ mod error {
         ManageContainersFailed { failed: usize, tried: usize },
 
         #[snafu(display("Logger setup error: {}", source))]
-        Logger { source: simplelog::TermLogError },
+        Logger { source: log::SetLoggerError },
 
         #[snafu(display("Unable to base64 decode user-data '{}': '{}'", base64_string, source))]
         Base64Decode {

diff --git a/sources/api/migration/migrator/Cargo.toml b/sources/api/migration/migrator/Cargo.toml
@@ -15,10 +15,10 @@ log = "0.4"
 lz4 = "1.23.1"
 nix = "0.19"
 pentacle = "1.0.0"
-rand = { version = "0.7", default-features = false, features = ["std"] }
+rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
 regex = "1.1"
 semver = "0.11"
-simplelog = "0.8"
+simplelog = "0.9"
 snafu = "0.6"
 tempfile = "3.1.0"
 tough = "0.8"

diff --git a/sources/api/migration/migrator/src/main.rs b/sources/api/migration/migrator/src/main.rs
@@ -185,7 +185,11 @@ pub(crate) fn run(args: &Args) -> Result<()> {
 /// Generates a random ID, affectionately known as a 'rando', that can be used to avoid timing
 /// issues and identify unique migration attempts.
 fn rando() -> String {
-    thread_rng().sample_iter(&Alphanumeric).take(16).collect()
+    thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(16)
+        .map(char::from)
+        .collect()
 }
 
 /// Generates a path for a new data store, given the path of the existing data store,

diff --git a/sources/api/netdog/Cargo.toml b/sources/api/netdog/Cargo.toml
@@ -13,7 +13,7 @@ dns-lookup = "1.0"
 ipnet = { version = "2.0", features = ["serde"] }
 envy = "0.4"
 lazy_static = "1.2"
-rand = { version = "0.7", default-features = false, features = ["std"] }
+rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
 regex = "1.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_plain = "0.3.0"

diff --git a/sources/api/servicedog/Cargo.toml b/sources/api/servicedog/Cargo.toml
@@ -17,7 +17,7 @@ log = "0.4"
 models = { path = "../../models" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-simplelog = "0.8"
+simplelog = "0.9"
 snafu = "0.6"
 tokio = { version = "0.2", default-features = false, features = ["macros", "rt-threaded"] }
 # When hyper updates to tokio 0.3:

diff --git a/sources/api/servicedog/src/main.rs b/sources/api/servicedog/src/main.rs
@@ -101,7 +101,7 @@ mod error {
         SystemdCommandFailure { output: Output },
 
         #[snafu(display("Logger setup error: {}", source))]
-        Logger { source: simplelog::TermLogError },
+        Logger { source: log::SetLoggerError },
     }
 }
 

diff --git a/sources/api/settings-committer/Cargo.toml b/sources/api/settings-committer/Cargo.toml
@@ -16,10 +16,10 @@ http = "0.2"
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-simplelog = "0.8"
+simplelog = "0.9"
 tokio = { version = "0.2", default-features = false, features = ["macros", "rt-threaded"] }
-# When hyper updates to tokio 0.3:
-#tokio = { version = "0.3", default-features = false, features = ["macros", "rt-multi-thread"] }
+# When hyper updates to tokio 1:
+#tokio = { version = "1", default-features = false, features = ["macros", "rt-multi-thread"] }
 
 [build-dependencies]
 cargo-readme = "3.1"
diff --git a/sources/api/settings-committer/src/main.rs b/sources/api/settings-committer/src/main.rs
@@ -50,7 +50,7 @@ mod error {
         },
 
         #[snafu(display("Logger setup error: {}", source))]
-        Logger { source: simplelog::TermLogError },
+        Logger { source: log::SetLoggerError },
     }
 }
 

diff --git a/sources/api/storewolf/Cargo.toml b/sources/api/storewolf/Cargo.toml
@@ -14,9 +14,9 @@ bottlerocket-release = { path = "../../bottlerocket-release" }
 datastore = { path = "../datastore" }
 log = "0.4"
 models = { path = "../../models" }
-rand = { version = "0.7", default-features = false, features = ["std"] }
+rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
 semver = "0.11"
-simplelog = "0.8"
+simplelog = "0.9"
 snafu = "0.6"
 toml = "0.5"
 

diff --git a/sources/api/storewolf/src/lib.rs b/sources/api/storewolf/src/lib.rs
@@ -58,7 +58,11 @@ pub fn create_new_datastore<P: AsRef<Path>>(
     };
 
     // Create random string to append to the end of the new datastore path
-    let random_id: String = thread_rng().sample_iter(&Alphanumeric).take(16).collect();
+    let random_id: String = thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(16)
+        .map(char::from)
+        .collect();
 
     // Build the various paths to which we'll symlink
 

diff --git a/sources/api/storewolf/src/main.rs b/sources/api/storewolf/src/main.rs
@@ -103,7 +103,7 @@ mod error {
         DataStoreLinkToRoot { path: PathBuf },
 
         #[snafu(display("Logger setup error: {}", source))]
-        Logger { source: simplelog::TermLogError },
+        Logger { source: log::SetLoggerError },
 
         #[snafu(display("Internal error: {}", msg))]
         Internal { msg: String },

diff --git a/sources/api/sundog/Cargo.toml b/sources/api/sundog/Cargo.toml
@@ -17,7 +17,7 @@ log = "0.4"
 models = { path = "../../models" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-simplelog = "0.8"
+simplelog = "0.9"
 snafu = "0.6"
 tokio = { version = "0.2", default-features = false, features = ["macros", "rt-threaded"] }
 # When hyper updates to tokio 0.3:

diff --git a/sources/api/sundog/src/main.rs b/sources/api/sundog/src/main.rs
@@ -148,7 +148,7 @@ mod error {
         },
 
         #[snafu(display("Logger setup error: {}", source))]
-        Logger { source: simplelog::TermLogError },
+        Logger { source: log::SetLoggerError },
     }
 }
 

diff --git a/sources/api/thar-be-settings/Cargo.toml b/sources/api/thar-be-settings/Cargo.toml
@@ -13,12 +13,12 @@ exclude = ["README.md"]
 apiclient = { path = "../apiclient" }
 handlebars = "3.0"
 http = "0.2"
-itertools = "0.9"
+itertools = "0.10"
 log = "0.4"
 models = { path = "../../models" }
 schnauzer = { path = "../schnauzer" }
 serde_json = "1"
-simplelog = "0.8"
+simplelog = "0.9"
 snafu = "0.6"
 tokio = { version = "0.2", default-features = false, features = ["macros", "rt-threaded"] }
 # When hyper updates to tokio 0.3:

diff --git a/sources/api/thar-be-settings/src/main.rs b/sources/api/thar-be-settings/src/main.rs
@@ -21,7 +21,7 @@ mod error {
     #[snafu(visibility = "pub(super)")]
     pub(super) enum Error {
         #[snafu(display("Logger setup error: {}", source))]
-        Logger { source: simplelog::TermLogError },
+        Logger { source: log::SetLoggerError },
 
         #[snafu(display("Failure to read template '{}' from '{}': {}", name, path.display(), source))]
         TemplateRegister {

diff --git a/sources/api/thar-be-updates/Cargo.toml b/sources/api/thar-be-updates/Cargo.toml
@@ -25,7 +25,7 @@ serde = { version = "1.0.111", features = [ "derive" ] }
 serde_json = "1.0.53"
 serde_plain = "0.3.0"
 signpost = { path = "../../updater/signpost" }
-simplelog = "0.8.0"
+simplelog = "0.9"
 snafu = "0.6.8"
 tempfile = "3.1.0"
 tokio = { version = "0.2", default-features = false, features = ["macros", "rt-threaded"] }

diff --git a/sources/api/thar-be-updates/src/error.rs b/sources/api/thar-be-updates/src/error.rs
@@ -147,7 +147,7 @@ pub enum Error {
     ActivePartition,
 
     #[snafu(display("Logger setup error: {}", source))]
-    Logger { source: simplelog::TermLogError },
+    Logger { source: log::SetLoggerError },
 
     #[snafu(display("Unable to create a tokio runtime: {}", source))]
     Runtime { source: std::io::Error },

diff --git a/sources/clarify.toml b/sources/clarify.toml
@@ -1,3 +1,10 @@
+[clarify.actix-macros]
+expression = "MIT OR Apache-2.0"
+license-files = [
+    { path = "LICENSE-APACHE", hash = 0xe11aded0 },
+    { path = "LICENSE-MIT", hash = 0x6427cfb9 },
+]
+
 [clarify.backtrace-sys]
 # backtrace-sys is MIT/Apache-2.0, libbacktrace is BSD-3-Clause
 expression = "(MIT OR Apache-2.0) AND BSD-3-Clause"

diff --git a/sources/deny.toml b/sources/deny.toml
@@ -11,7 +11,7 @@ confidence-threshold = 0.93
 
 allow = [
     "Apache-2.0",
-    "BSD-2-Clause",
+    #"BSD-2-Clause", # OK but currently unused; commenting to prevent warning
     "BSD-3-Clause",
     "BSL-1.0",
     #"CC0-1.0",  # OK but currently unused; commenting to prevent warning

diff --git a/sources/models/model-derive/Cargo.toml b/sources/models/model-derive/Cargo.toml
@@ -14,7 +14,7 @@ path = "src/lib.rs"
 proc-macro = true
 
 [dependencies]
-darling = "0.10"
+darling = "0.12"
 proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "1.0", default-features = false, features = ["full", "parsing", "printing", "proc-macro", "visit-mut"] }

diff --git a/sources/updater/updog/Cargo.toml b/sources/updater/updog/Cargo.toml
@@ -13,21 +13,22 @@ bottlerocket-release = { path = "../../bottlerocket-release" }
 chrono = "0.4.9"
 log = "0.4"
 lz4 = "1.23.1"
-rand = "0.7.0"
+rand = "0.8"
 reqwest = { version = "0.10.1", default-features = false, features = ["rustls-tls", "blocking"] }
 semver = "0.11.0"
 serde = { version = "1.0.100", features = ["derive"] }
 serde_json = "1.0.40"
 serde_plain = "0.3.0"
 signpost = { path = "../signpost" }
-simplelog = "0.8"
+simplelog = "0.9"
 snafu = "0.6.0"
 tempfile = "3.1.0"
 toml = "0.5.1"
 tough = { version = "0.8", features = ["http"] }
 update_metadata = { path = "../update_metadata" }
 structopt = "0.3"
 url = "2.1.0"
+# TODO - update signal-hook to the latest version. https://github.com/bottlerocket-os/bottlerocket/issues/1268
 signal-hook = "0.1.13"
 models = { path = "../../models" }
 

diff --git a/sources/updater/updog/src/error.rs b/sources/updater/updog/src/error.rs
@@ -68,7 +68,7 @@ pub(crate) enum Error {
     },
 
     #[snafu(display("Logger setup error: {}", source))]
-    Logger { source: simplelog::TermLogError },
+    Logger { source: log::SetLoggerError },
 
     #[snafu(display("Could not mark inactive partition for boot: {}", source))]
     InactivePartitionUpgrade { source: signpost::Error },

diff --git a/sources/webpki-roots-shim/Cargo.toml b/sources/webpki-roots-shim/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webpki-roots"
-version = "0.19.0"
+version = "0.20.0"
 authors = ["iliana destroyer of worlds <[email protected]>"]
 license = "Apache-2.0 OR MIT"
 edition = "2018"