Merge pull request #1462 from tjkirch/rust-sources-deps

Update Rust deps in the sources workspace
bottlerocket-os · Apr 7, 2021 · eace86a · eace86a
2 parents 4601f16 + 6091367
commit eace86a
Show file tree

Hide file tree

Showing 20 changed files with 185 additions and 164 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
@@ -23,7 +23,7 @@ rand = "0.8"
 reqwest = { version = "0.10.1", default-features = false, features = ["rustls-tls"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-simplelog = "0.9"
+simplelog = "0.10"
 snafu = { version = "0.6", features = ["futures"] }
 tokio = { version = "0.2", default-features = false, features = ["fs", "io-std", "macros", "rt-threaded", "time"] }
 # When we update hyper to 0.14+ which has tokio 1:

diff --git a/sources/api/apiclient/src/main.rs b/sources/api/apiclient/src/main.rs
@@ -9,7 +9,9 @@
 use apiclient::{apply, reboot, set, update};
 use datastore::{serialize_scalar, Key, KeyType};
 use log::{info, log_enabled, trace, warn};
-use simplelog::{ConfigBuilder as LogConfigBuilder, LevelFilter, TermLogger, TerminalMode};
+use simplelog::{
+    ColorChoice, ConfigBuilder as LogConfigBuilder, LevelFilter, TermLogger, TerminalMode,
+};
 use snafu::ResultExt;
 use std::collections::HashMap;
 use std::env;
@@ -508,6 +510,7 @@ async fn run() -> Result<()> {
             .add_filter_allow_str("apiclient")
             .build(),
         TerminalMode::Stderr,
+        ColorChoice::Auto,
     )
     .context(error::Logger)?;
 

diff --git a/sources/api/apiserver/Cargo.toml b/sources/api/apiserver/Cargo.toml
@@ -20,13 +20,13 @@ libc = "0.2"
 log = "0.4"
 models = { path = "../../models" }
 nix = "0.20.0"
-num = "0.3.0"
+num = "0.4"
 percent-encoding = "2.1"
 semver = "0.11"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 signal-hook = "0.3"
-simplelog = "0.9"
+simplelog = "0.10"
 snafu = "0.6"
 thar-be-updates = { path = "../thar-be-updates" }
 walkdir = "2.2"

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.9"
+simplelog = "0.10"
 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/Cargo.toml b/sources/api/early-boot-config/Cargo.toml
@@ -20,7 +20,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
 serde_plain = "0.3"
 serde-xml-rs = "0.4.1"
-simplelog = "0.9"
+simplelog = "0.10"
 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/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.9"
+simplelog = "0.10"
 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/migration/migrator/Cargo.toml b/sources/api/migration/migrator/Cargo.toml
@@ -18,7 +18,7 @@ pentacle = "1.0.0"
 rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
 regex = "1.1"
 semver = "0.11"
-simplelog = "0.9"
+simplelog = "0.10"
 snafu = "0.6"
 tough = "0.10"
 update_metadata = { path = "../../../updater/update_metadata" }

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.9"
+simplelog = "0.10"
 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/settings-committer/Cargo.toml b/sources/api/settings-committer/Cargo.toml
@@ -16,7 +16,7 @@ http = "0.2"
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-simplelog = "0.9"
+simplelog = "0.10"
 tokio = { version = "0.2", default-features = false, features = ["macros", "rt-threaded"] }
 # When hyper updates to tokio 1:
 #tokio = { version = "1", default-features = false, features = ["macros", "rt-multi-thread"] }

diff --git a/sources/api/shibaken/Cargo.toml b/sources/api/shibaken/Cargo.toml
@@ -15,7 +15,7 @@ log = "0.4"
 reqwest = { version = "0.10", default-features = false, features = ["blocking"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-simplelog = "0.9"
+simplelog = "0.10"
 snafu = "0.6"
 
 [build-dependencies]

diff --git a/sources/api/shibaken/src/main.rs b/sources/api/shibaken/src/main.rs
@@ -14,7 +14,7 @@ AWS instance metadata service (IMDS).
 use log::{debug, info, warn};
 use reqwest::blocking::Client;
 use serde::Serialize;
-use simplelog::{Config as LogConfig, LevelFilter, TermLogger, TerminalMode};
+use simplelog::{ColorChoice, Config as LogConfig, LevelFilter, TermLogger, TerminalMode};
 use snafu::{OptionExt, ResultExt};
 use std::str::FromStr;
 use std::{env, process};
@@ -201,8 +201,13 @@ fn run() -> Result<()> {
 
     // TerminalMode::Stderr will send all logs to stderr, as sundog only expects the json output of
     // the setting on stdout.
-    TermLogger::init(args.log_level, LogConfig::default(), TerminalMode::Stderr)
-        .context(error::Logger)?;
+    TermLogger::init(
+        args.log_level,
+        LogConfig::default(),
+        TerminalMode::Stderr,
+        ColorChoice::Auto,
+    )
+    .context(error::Logger)?;
 
     info!("shibaken started");
 

diff --git a/sources/api/static-pods/Cargo.toml b/sources/api/static-pods/Cargo.toml
@@ -16,7 +16,7 @@ models = { path = "../../models" }
 schnauzer = { path = "../schnauzer" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-simplelog = "0.9"
+simplelog = "0.10"
 snafu = "0.6"
 tokio = { version = "0.2", default-features = false, features = ["macros", "rt-threaded"] }
 # When we update hyper to 0.14+ which has tokio 1:

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

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.9"
+simplelog = "0.10"
 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/Cargo.toml b/sources/api/thar-be-settings/Cargo.toml
@@ -18,7 +18,7 @@ log = "0.4"
 models = { path = "../../models" }
 schnauzer = { path = "../schnauzer" }
 serde_json = "1"
-simplelog = "0.9"
+simplelog = "0.10"
 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-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.9"
+simplelog = "0.10"
 snafu = "0.6.8"
 tempfile = "3.1.0"
 tokio = { version = "0.2", default-features = false, features = ["macros", "rt-threaded"] }

diff --git a/sources/clarify.toml b/sources/clarify.toml
@@ -124,3 +124,10 @@ license-files = [
     { path = "LICENSE-MIT", hash = 0x28392cf3 },
 ]
 
+[clarify.typenum]
+expression = "MIT OR Apache-2.0"
+license-files = [
+    { path = "LICENSE", hash = 0xa4618a29 },
+    { path = "LICENSE-MIT", hash = 0xb9f15462 },
+    { path = "LICENSE-APACHE", hash = 0x91d5a0a7 },
+]
diff --git a/sources/metricdog/Cargo.toml b/sources/metricdog/Cargo.toml
@@ -13,7 +13,7 @@ bottlerocket-release = { path = "../bottlerocket-release"}
 log = "0.4"
 reqwest = { version = "0.10.1", default-features = false, features = ["blocking", "rustls-tls"] }
 serde = { version = "1.0.100", features = ["derive"] }
-simplelog = "0.9"
+simplelog = "0.10"
 snafu = { version = "0.6" }
 structopt = "0.3.17"
 toml = "0.5.1"

diff --git a/sources/updater/updog/Cargo.toml b/sources/updater/updog/Cargo.toml
@@ -20,7 +20,7 @@ serde = { version = "1.0.100", features = ["derive"] }
 serde_json = "1.0.40"
 serde_plain = "0.3.0"
 signpost = { path = "../signpost" }
-simplelog = "0.9"
+simplelog = "0.10"
 snafu = "0.6.0"
 toml = "0.5.1"
 tough = { version = "0.10", features = ["http"] }