diff --git a/Cargo.lock b/Cargo.lock index 7b57e9aa..63259c72 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,6 +41,55 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "async-trait" version = "0.1.79" @@ -92,7 +141,7 @@ dependencies = [ "aws-nitro-enclaves-cose", "byteorder", "chrono", - "clap", + "clap 3.2.25", "crc", "hex", "num-derive 0.3.3", @@ -298,13 +347,34 @@ checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags 1.3.2", - "clap_lex", + "clap_lex 0.2.4", "indexmap 1.9.3", - "strsim", + "strsim 0.10.0", "termcolor", "textwrap", ] +[[package]] +name = "clap" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 0.7.1", + "strsim 0.11.1", +] + [[package]] name = "clap_lex" version = "0.2.4" @@ -314,12 +384,24 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + [[package]] name = "command-executer" version = "0.1.0" dependencies = [ "byteorder", - "clap", + "clap 4.5.8", "log", "nix 0.26.4", "num", @@ -426,7 +508,7 @@ dependencies = [ "aws-nitro-enclaves-image-format", "base64 0.22.0", "bollard", - "clap", + "clap 4.5.8", "flate2", "futures", "log", @@ -1028,6 +1110,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.12.1" @@ -1180,7 +1268,7 @@ dependencies = [ "aws-nitro-enclaves-image-format", "bindgen", "chrono", - "clap", + "clap 4.5.8", "driver-bindings", "eif_loader", "enclave_build", @@ -1846,6 +1934,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "syn" version = "1.0.109" @@ -2115,6 +2209,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "vcpkg" version = "0.2.15" @@ -2152,7 +2252,7 @@ name = "vsock-proxy" version = "1.0.1" dependencies = [ "chrono", - "clap", + "clap 4.5.8", "ctor", "env_logger", "hickory-resolver", diff --git a/Cargo.toml b/Cargo.toml index 9791a416..23c79d06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ rust-version = "1.68" [dependencies] serde = { version = ">=1.0", features = ["derive"] } chrono = "0.4" -clap = "3.2" +clap = "4.5" inotify = "0.10" serde_json = "1.0" nix = "0.26" diff --git a/enclave_build/Cargo.toml b/enclave_build/Cargo.toml index e8383a6d..7a47f806 100644 --- a/enclave_build/Cargo.toml +++ b/enclave_build/Cargo.toml @@ -9,7 +9,7 @@ rust-version = "1.68" [dependencies] bollard = "0.16.0" -clap = "3.2" +clap = "4.5" serde = { version = "1.0", features = ["derive"] } serde_yaml = "0.8" serde_json = "1.0" diff --git a/samples/command_executer/Cargo.toml b/samples/command_executer/Cargo.toml index 226102e4..619faca0 100644 --- a/samples/command_executer/Cargo.toml +++ b/samples/command_executer/Cargo.toml @@ -8,7 +8,7 @@ rust-version = "1.68" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -clap = "3.2" +clap = "4.5" log = "0.4" nix = "0.26" serde = { version = ">=1.0", features = ["derive"] } diff --git a/vsock_proxy/Cargo.toml b/vsock_proxy/Cargo.toml index c27c3e77..bf0cc478 100644 --- a/vsock_proxy/Cargo.toml +++ b/vsock_proxy/Cargo.toml @@ -9,7 +9,7 @@ rust-version = "1.68" [dependencies] chrono = "0.4" -clap = "3.2" +clap = "4.5" env_logger = "0.10" hickory-resolver = "0.24" idna = "0.3.0"