Merge pull request #50 from cbgbt/workspace-and-envlog

Use workspace dependencies for all dependencies, update env_logger to `0.11`
bottlerocket-os · Aug 9, 2024 · 9404ecd · 9404ecd
2 parents 0450cc5 + 74da0bf
commit 9404ecd
Show file tree

Hide file tree

Showing 32 changed files with 146 additions and 113 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -80,5 +80,33 @@ settings-extension-oci-hooks = { path = "./bottlerocket-settings-models/settings
 settings-extension-pki = { path = "./bottlerocket-settings-models/settings-extensions/pki", version = "0.1" }
 settings-extension-updates = { path = "./bottlerocket-settings-models/settings-extensions/updates", version = "0.1" }
 
+abi_stable = "0.11.3"
+anyhow = "1"
+argh = "0.1"
+base64 = "0.21"
+ctor = "0.2"
+darling = "0.20"
+env_logger = "0.11"
+indexmap = "2"
+lazy_static = "1.4"
+libc = "0.2"
+log = "0.4"
+maplit = "1"
+proc-macro2 = "1"
+quote = "1"
+rand = "0.8"
+regex = "1"
+semver = "1"
+serde = "1"
+serde_json = "1"
+serde_plain = "1"
+snafu = "0.8"
+syn = { version = "2", default-features = false }
+toml = "0.8"
+tracing = "0.1"
+url = "2"
+walkdir = "2"
+x509-parser = "0.16"
+
 [workspace.lints.clippy]
 indexing_slicing = "deny"
diff --git a/bottlerocket-defaults-helper/Cargo.toml b/bottlerocket-defaults-helper/Cargo.toml
@@ -12,9 +12,9 @@ authors = [
 ]
 
 [dependencies]
-snafu = "0.8"
-toml = "0.8"
-walkdir = "2"
+snafu.workspace = true
+toml.workspace = true
+walkdir.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-derive/Cargo.toml b/bottlerocket-settings-derive/Cargo.toml
@@ -10,10 +10,10 @@ readme = "../README.md"
 proc-macro = true
 
 [dependencies]
-darling = "0.20.8"
-proc-macro2 = "1.0.81"
-quote = "1.0.36"
-syn = "2.0.60"
+darling.workspace = true
+proc-macro2.workspace = true
+quote.workspace = true
+syn = { workspace = true, features = ["default"] }
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/model-derive/Cargo.toml b/bottlerocket-settings-models/model-derive/Cargo.toml
@@ -13,9 +13,9 @@ path = "src/lib.rs"
 proc-macro = true
 
 [dependencies]
-darling = "0.20"
-quote = "1"
-syn = { version = "2", default-features = false, features = ["full", "parsing", "printing", "proc-macro", "visit-mut"] }
+darling.workspace = true
+quote.workspace = true
+syn = { workspace = true, features = ["full", "parsing", "printing", "proc-macro", "visit-mut"] }
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/modeled-types/Cargo.toml b/bottlerocket-settings-models/modeled-types/Cargo.toml
@@ -13,17 +13,17 @@ bottlerocket-scalar.workspace = true
 bottlerocket-scalar-derive.workspace = true
 bottlerocket-string-impls-for.workspace = true
 bottlerocket-model-derive.workspace = true
-base64 = "0.21"
-indexmap = { version = "2", features = ["serde"] }
-lazy_static = "1"
-regex = "1"
-semver = "1"
-serde = "1"
-serde_json = "1"
-serde_plain = "1"
-snafu = "0.8"
-url = "2"
-x509-parser = "0.16"
+base64.workspace = true
+indexmap = { workspace = true, features = ["serde"] }
+lazy_static.workspace = true
+regex.workspace = true
+semver.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+serde_plain.workspace = true
+snafu.workspace = true
+url.workspace = true
+x509-parser.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/scalar-derive/Cargo.toml b/bottlerocket-settings-models/scalar-derive/Cargo.toml
@@ -13,13 +13,13 @@ path = "src/lib.rs"
 proc-macro = true
 
 [dependencies]
-darling = "0.20"
-proc-macro2 = "1"
-quote = "1"
+darling.workspace = true
+proc-macro2.workspace = true
+quote.workspace = true
 bottlerocket-scalar.workspace = true
-serde = { version = "1", features = ["derive"] }
-serde_plain = "1"
-syn = { version = "2", default-features = false, features = ["full", "parsing", "printing", "proc-macro", "visit-mut"] }
+serde = { workspace = true, features = ["derive"] }
+serde_plain.workspace = true
+syn = { workspace = true, features = ["full", "parsing", "printing", "proc-macro", "visit-mut"] }
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/scalar/Cargo.toml b/bottlerocket-settings-models/scalar/Cargo.toml
@@ -9,8 +9,8 @@ publish = false
 exclude = ["README.md"]
 
 [dependencies]
-serde = "1"
-serde_plain = "1"
+serde.workspace = true
+serde_plain.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/autoscaling/Cargo.toml b/bottlerocket-settings-models/settings-extensions/autoscaling/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/aws/Cargo.toml b/bottlerocket-settings-models/settings-extensions/aws/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/bootstrap-containers/Cargo.toml b/bottlerocket-settings-models/settings-extensions/bootstrap-containers/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/cloudformation/Cargo.toml b/bottlerocket-settings-models/settings-extensions/cloudformation/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/container-registry/Cargo.toml b/bottlerocket-settings-models/settings-extensions/container-registry/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/container-runtime/Cargo.toml b/bottlerocket-settings-models/settings-extensions/container-runtime/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/dns/Cargo.toml b/bottlerocket-settings-models/settings-extensions/dns/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/ecs/Cargo.toml b/bottlerocket-settings-models/settings-extensions/ecs/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/host-containers/Cargo.toml b/bottlerocket-settings-models/settings-extensions/host-containers/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/kernel/Cargo.toml b/bottlerocket-settings-models/settings-extensions/kernel/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/metrics/Cargo.toml b/bottlerocket-settings-models/settings-extensions/metrics/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/motd/Cargo.toml b/bottlerocket-settings-models/settings-extensions/motd/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
 [dependencies]
 bottlerocket-settings-sdk.workspace = true
 bottlerocket-string-impls-for.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/network/Cargo.toml b/bottlerocket-settings-models/settings-extensions/network/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/ntp/Cargo.toml b/bottlerocket-settings-models/settings-extensions/ntp/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/nvidia-container-runtime/Cargo.toml b/bottlerocket-settings-models/settings-extensions/nvidia-container-runtime/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/oci-defaults/Cargo.toml b/bottlerocket-settings-models/settings-extensions/oci-defaults/Cargo.toml
@@ -10,10 +10,10 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-toml = "0.8"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+toml.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/oci-hooks/Cargo.toml b/bottlerocket-settings-models/settings-extensions/oci-hooks/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/pki/Cargo.toml b/bottlerocket-settings-models/settings-extensions/pki/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
 bottlerocket-settings-sdk.workspace = true
-env_logger = "0.10"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true
diff --git a/bottlerocket-settings-models/settings-extensions/updates/Cargo.toml b/bottlerocket-settings-models/settings-extensions/updates/Cargo.toml
@@ -10,10 +10,10 @@ publish = false
 bottlerocket-settings-sdk.workspace = true
 bottlerocket-modeled-types.workspace = true
 bottlerocket-model-derive.workspace = true
-env_logger = "0.10"
-rand = "0.8"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+env_logger.workspace = true
+rand.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
 
 [lints]
 workspace = true