Merge pull request #348 from cbgbt/stabilize-ssm-validate

pubsys: improve stability of SSM parameter validation

Cargo.toml

@@ -36,6 +36,95 @@ installers = []
 # Target platforms to build apps for (Rust target-triple syntax)
 targets = ["x86_64-unknown-linux-musl", "aarch64-unknown-linux-musl"]
 
+[workspace.dependencies]
+bottlerocket-types = { version = "0.0.14", git = "https://github.com/bottlerocket-os/bottlerocket-test-system", tag = "v0.0.14" }
+bottlerocket-variant = { version = "0.1", path = "tools/bottlerocket-variant" }
+buildsys = { version = "0.1", path = "tools/buildsys", lib = true, artifact = [ "bin:buildsys", "bin:bottlerocket-variant" ] }
+buildsys-config = { version = "0.1", path = "tools/buildsys-config" }
+oci-cli-wrapper = { version = "0.1", path = "tools/oci-cli-wrapper" }
+parse-datetime = { version = "0.1", path = "tools/parse-datetime" }
+pipesys = { version = "0.1", path = "tools/pipesys", lib = true, artifact = [ "bin:pipesys" ] }
+pubsys = { version = "0.1", path = "tools/pubsys", artifact = [ "bin:pubsys" ] }
+pubsys-config = { version = "0.1", path = "tools/pubsys-config" }
+pubsys-setup = { version = "0.1", path = "tools/pubsys-setup", artifact = [ "bin:pubsys-setup" ] }
+testsys = { version = "0.1", path = "tools/testsys", artifact = [ "bin:testsys" ] }
+testsys-config = { version = "0.1", path = "tools/testsys-config" }
+testsys-model = { version = "0.0.14", git = "https://github.com/bottlerocket-os/bottlerocket-test-system", tag = "v0.0.14" }
+twoliter = { version = "0", path = "twoliter", artifact = [ "bin:twoliter" ] }
+unplug = { version = "0.1", path = "tools/unplug", artifact = [ "bin:unplug" ] }
+update-metadata = { version = "0.1", path = "tools/update-metadata" }
+
+anyhow = "1"
+async-recursion = "1"
+async-stream = "0.3"
+async-trait = "0.1"
+async-walkdir = "1"
+aws-config = "1"
+aws-credential-types = "1"
+aws-sdk-ebs = "1"
+aws-sdk-ec2 = "1"
+aws-sdk-kms = "1"
+aws-sdk-ssm = "1"
+aws-sdk-sts = "1"
+aws-smithy-types = "1"
+aws-types = "1"
+base64 = "0.22"
+bytes = "1"
+chrono = { version = "0.4", default-features = false }
+clap = "4"
+coldsnap = { version = "0.6", default-features = false }
+daemonize = "0.5"
+duct = "0.13"
+env_logger = "0.11"
+fastrand = "2"
+filetime = "0.2"
+flate2 = "1"
+futures = "0.3"
+governor = "0.6"
+guppy = "0.17"
+handlebars = "5"
+hex = "0.4"
+home = "0.5"
+indicatif = "0.17"
+lazy_static = "1"
+log = "0.4"
+maplit = "1"
+nix = "0.28"
+nonzero_ext = "0.3"
+num_cpus = "1"
+olpc-cjson = "0.1"
+rand = { version = "0.8", default-features = false }
+regex = "1"
+reqwest = { version = "0.11", default-features = false }
+semver = "1"
+serde = "1"
+serde_json = "1"
+serde_plain = "1"
+serde_yaml = "0.9"
+sha2 = "0.10"
+shell-words = "1"
+simplelog = "0.12"
+snafu = "0.8"
+tabled = "0.10"
+tar = "0.4"
+tempfile = "3"
+term_size = "0.3"
+tinytemplate = "1"
+tokio = "1"
+tokio-stream = "0.1"
+tokio-retry = "0.3"
+toml = "0.8"
+tough = "0.17"
+tough-kms = "0.9"
+tough-ssm = "0.12"
+tracing = "0.1"
+tuftool = { version = "0.10", artifact = [ "bin:tuftool" ] }
+unescape = "0.1"
+url = "2"
+uuid = "1"
+walkdir = "2"
+which = "6"
+
 # The profile that 'cargo dist' will build with
 [profile.dist]
 inherits = "release"

deny.toml

@@ -74,16 +74,8 @@ skip = [
     { name = "http", version = "=0.2" },
     # dependencies are using different versions of http-body
     { name = "http-body", version = "=0.4" },
-    # kube-client uses an older version of pem
-    { name = "pem", version = "=1" },
     # dependencies are using different versions of redox_syscall
     { name = "redox_syscall", version = "=0.4" },
-    # several dependencies are using an old version of serde_yaml
-    { name = "serde_yaml", version = "=0.8" },
-    # dependencies are using different versions of snafu
-    { name = "snafu", version = "=0.7" },
-    # dependencies are using different versions of snafu-derive
-    { name = "snafu-derive", version = "=0.7" },
     # dependencies are using different versions of strsim
     { name = "strsim", version = "=0.10" },
     # multiple deps are using an older version of syn

tests/integration-tests/Cargo.toml

@@ -5,5 +5,5 @@ edition = "2021"
 license = "MIT OR Apache-2.0"
 
 [dev-dependencies]
-tokio = { version = "1", default-features = false, features = ["process", "fs", "rt-multi-thread"] }
-twoliter = { version = "0", path = "../../twoliter", artifact = [ "bin:twoliter" ] }
+tokio = { workspace = true, features = ["fs", "process", "rt-multi-thread"] }
+twoliter = { workspace = true }

tools/bottlerocket-variant/Cargo.toml

@@ -9,6 +9,6 @@ publish = false
 exclude = ["README.md"]
 
 [dependencies]
-serde = "1"
-snafu = "0.8"
+serde.workspace = true
+snafu.workspace = true
 

tools/buildsys/Cargo.toml

@@ -9,27 +9,27 @@ publish = false
 exclude = ["README.md"]
 
 [dependencies]
-bottlerocket-variant = { version = "0.1", path = "../bottlerocket-variant" }
-buildsys-config = { version = "0.1", path = "../buildsys-config" }
-clap = { version = "4", features = ["derive", "env"] }
-duct = "0.13"
-guppy = "0.17"
-hex = "0.4"
-lazy_static = "1"
-pipesys = { version = "0.1", path = "../pipesys" }
-rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
-regex = "1"
-reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "blocking"] }
-serde = { version = "1", features = ["derive"] }
-serde_plain = "1"
-serde_json = "1"
-sha2 = "0.10"
-snafu = "0.8"
-tokio = { version = "1", features = ["fs", "macros", "rt-multi-thread"] }
-toml = "0.8"
-url = { version = "2", features = ["serde"] }
-walkdir = "2"
-nonzero_ext = "0.3"
+bottlerocket-variant.workspace = true
+buildsys-config.workspace = true
+clap = { workspace = true, features = ["derive", "env"] }
+duct.workspace = true
+guppy.workspace = true
+hex.workspace = true
+lazy_static.workspace = true
+pipesys.workspace = true
+rand = { workspace = true, features = ["std", "std_rng"] }
+regex.workspace = true
+reqwest = { workspace = true, features = ["blocking", "rustls-tls"] }
+serde = { workspace = true, features = ["derive"] }
+serde_plain.workspace = true
+serde_json.workspace = true
+sha2.workspace = true
+snafu.workspace = true
+tokio = { workspace = true, features = ["fs", "macros", "rt-multi-thread"] }
+toml.workspace = true
+url = { workspace = true, features = ["serde"] }
+walkdir.workspace = true
+nonzero_ext.workspace = true
 
 [dev-dependencies]
-tempfile = "3"
+tempfile.workspace = true

tools/oci-cli-wrapper/Cargo.toml

@@ -7,14 +7,14 @@ edition = "2021"
 publish = false
 
 [dependencies]
-async-trait = "0.1"
-log = "0.4"
-olpc-cjson = "0.1"
-regex = "1"
-serde = { version = "1", features = ["derive"]}
-serde_json = "1"
-snafu = "0.8"
-tar = "0.4"
-tempfile = "3"
-tokio = { version = "1.32", features = ["process"] }
-which = "6"
+async-trait.workspace = true
+log.workspace = true
+olpc-cjson.workspace = true
+regex.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+snafu.workspace = true
+tar.workspace = true
+tempfile.workspace = true
+tokio = { workspace = true, features = ["process"] }
+which.workspace = true

tools/parse-datetime/Cargo.toml

@@ -9,5 +9,5 @@ publish = false
 exclude = ["README.md"]
 
 [dependencies]
-chrono = { version = "0.4", default-features = false, features = ["std", "clock"] }
-snafu = { version = "0.8", features = ["backtraces-impl-backtrace-crate"] }
+chrono = { workspace = true, features = ["clock", "std"] }
+snafu = { workspace = true, features = ["backtraces-impl-backtrace-crate"] }

tools/pipesys/Cargo.toml

@@ -7,14 +7,14 @@ edition = "2021"
 publish = false
 
 [dependencies]
-anyhow = "1.0.75"
-clap = { version = "4", features = ["derive"] }
-daemonize = "0.5.0"
-env_logger = "0.11.3"
-futures = "0.3.28"
-log = "0.4.20"
-nix = { version = "0.28.0", features = ["fs"] }
-tokio = { version = "1", features = ["fs", "macros", "rt-multi-thread"] }
+anyhow.workspace = true
+clap = { workspace = true, features = ["derive"] }
+daemonize.workspace = true
+env_logger.workspace = true
+futures.workspace = true
+log.workspace = true
+nix = { workspace = true, features = ["fs"] }
+tokio = { workspace = true, features = ["fs", "macros", "rt-multi-thread"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 inotify = "0.10.2"

tools/pubsys-config/Cargo.toml

@@ -7,13 +7,13 @@ edition = "2021"
 publish = false
 
 [dependencies]
-chrono = { version = "0.4", default-features = false, features = ["std", "clock"] }
-home = "0.5"
-lazy_static = "1"
-log = "0.4"
-parse-datetime = { path = "../parse-datetime", version = "0.1" }
-serde = { version = "1", features = ["derive"]  }
-serde_yaml = "0.9"
-snafu = "0.8"
-toml = "0.8"
-url = { version = "2", features = ["serde"] }
+chrono = { workspace = true, features = ["clock", "std"] }
+home.workspace = true
+lazy_static.workspace = true
+log.workspace = true
+parse-datetime.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_yaml.workspace = true
+snafu.workspace = true
+toml.workspace = true
+url = { workspace = true, features = ["serde"] }

tools/pubsys-setup/Cargo.toml

@@ -7,14 +7,14 @@ edition = "2021"
 publish = false
 
 [dependencies]
-clap = { version = "4", features = ["derive"] }
-hex = "0.4"
-log = "0.4"
-pubsys-config = { path = "../pubsys-config/", version = "0.1" }
-reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "blocking"] }
-sha2 = "0.10"
-shell-words = "1"
-simplelog = "0.12"
-snafu = "0.8"
-tempfile = "3"
-url = { version = "2", features = ["serde"] }
+clap = { workspace = true, features = ["derive"] }
+hex.workspace = true
+log.workspace = true
+pubsys-config.workspace = true
+reqwest = { workspace = true, features = ["blocking", "rustls-tls"] }
+sha2.workspace = true
+shell-words.workspace = true
+simplelog.workspace = true
+snafu.workspace = true
+tempfile.workspace = true
+url = { workspace = true, features = ["serde"] }