Merge pull request #1443 from Overflow0xFFFF/feature/1236-upgrade-clap

Upgrade clap to v4

crates/libcgroups/Cargo.toml

@@ -37,7 +37,7 @@ libc = { version = "0.2.138", optional = true }
 oci-spec = { version = "0.5.8", features = ["proptests", "runtime"] }
 quickcheck = "1"
 mockall = { version = "0.11.3", features = [] }
-clap = "3.2.23"
+clap = "4.0.32"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 env_logger = "0.10"

crates/liboci-cli/Cargo.toml

@@ -11,6 +11,6 @@ edition = "2021"
 keywords = ["youki", "container", "oci"]
 
 [dependencies.clap]
-version = "3.2.23"
+version = "4.0.32"
 default-features = false
-features = ["std", "suggestions", "derive", "cargo"]
+features = ["std", "suggestions", "derive", "cargo", "help", "usage", "error-context"]

crates/liboci-cli/src/checkpoint.rs

@@ -4,7 +4,7 @@ use std::path::PathBuf;
 /// Checkpoint a running container
 #[derive(Parser, Debug)]
 pub struct Checkpoint {
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
     /// Allow external unix sockets
     #[clap(long)]

crates/liboci-cli/src/create.rs

@@ -19,6 +19,6 @@ pub struct Create {
     #[clap(long, default_value = "0")]
     pub preserve_fds: i32,
     /// name of the container instance to be started
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
 }

crates/liboci-cli/src/delete.rs

@@ -3,7 +3,7 @@ use clap::Parser;
 /// Release any resources held by the container
 #[derive(Parser, Debug)]
 pub struct Delete {
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
     /// forces deletion of the container if it is still running (using SIGKILL)
     #[clap(short, long)]

crates/liboci-cli/src/events.rs

@@ -10,6 +10,6 @@ pub struct Events {
     #[clap(long)]
     pub stats: bool,
     /// Name of the container instance
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
 }

crates/liboci-cli/src/exec.rs

@@ -18,7 +18,7 @@ pub struct Exec {
     /// The file to which the pid of the container process should be written to
     pub pid_file: Option<PathBuf>,
     /// Environment variables that should be set in the container
-    #[clap(short, long, parse(try_from_str = parse_key_val), number_of_values = 1)]
+    #[clap(short, long, value_parser = parse_key_val::<String, String>, number_of_values = 1)]
     pub env: Vec<(String, String)>,
     /// Prevent the process from gaining additional privileges
     #[clap(long)]
@@ -30,7 +30,7 @@ pub struct Exec {
     #[clap(short, long)]
     pub detach: bool,
     /// Identifier of the container
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
     /// Command that should be executed in the container
     #[clap(required = false)]

crates/liboci-cli/src/kill.rs

@@ -3,7 +3,7 @@ use clap::Parser;
 /// Send the specified signal to the container
 #[derive(Parser, Debug)]
 pub struct Kill {
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
     pub signal: String,
     #[clap(short, long)]

crates/liboci-cli/src/pause.rs

@@ -3,6 +3,6 @@ use clap::Parser;
 /// Suspend the processes within the container
 #[derive(Parser, Debug)]
 pub struct Pause {
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
 }

crates/liboci-cli/src/ps.rs

@@ -6,7 +6,7 @@ pub struct Ps {
     /// format to display processes: table or json (default: "table")
     #[clap(short, long, default_value = "table")]
     pub format: String,
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
     /// options will be passed to the ps utility
     #[clap(last = true)]

crates/liboci-cli/src/resume.rs

@@ -3,6 +3,6 @@ use clap::Parser;
 /// Resume the processes within the container
 #[derive(Parser, Debug)]
 pub struct Resume {
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
 }

crates/liboci-cli/src/run.rs

@@ -18,6 +18,6 @@ pub struct Run {
     #[clap(long, default_value = "0")]
     pub preserve_fds: i32,
     /// name of the container instance to be started
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
 }

crates/liboci-cli/src/start.rs

@@ -3,6 +3,6 @@ use clap::Parser;
 /// Start a previously created container
 #[derive(Parser, Debug)]
 pub struct Start {
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
 }

crates/liboci-cli/src/state.rs

@@ -3,6 +3,6 @@ use clap::Parser;
 /// Show the container state
 #[derive(Parser, Debug)]
 pub struct State {
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
 }

crates/liboci-cli/src/update.rs

@@ -4,7 +4,7 @@ use std::path::PathBuf;
 /// Update running container resource constraints
 #[derive(Parser, Debug)]
 pub struct Update {
-    #[clap(forbid_empty_values = true, required = true)]
+    #[clap(value_parser = clap::builder::NonEmptyStringValueParser::new(), required = true)]
     pub container_id: String,
 
     /// Read the new resource limits from the given json file. Use - to read from stdin.

crates/youki/Cargo.toml

@@ -21,9 +21,9 @@ wasm-wasmedge = ["libcontainer/wasm-wasmedge"]
 wasm-wasmtime = ["libcontainer/wasm-wasmtime"]
 
 [dependencies.clap]
-version = "3.2.23"
+version = "4.0.32"
 default-features = false
-features = ["std", "suggestions", "derive", "cargo"]
+features = ["std", "suggestions", "derive", "cargo", "help", "usage", "error-context"]
 
 [dependencies]
 anyhow = "1.0.65"
@@ -40,7 +40,7 @@ procfs = "0.14.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tabwriter = "1"
-clap_complete = "3.2.5"
+clap_complete = "4.0.7"
 caps = "0.5.5"
 
 [dev-dependencies]

crates/youki/src/commands/completion.rs

@@ -7,7 +7,7 @@ use std::io;
 #[derive(Debug, Parser)]
 /// Generate scripts for shell completion
 pub struct Completion {
-    #[clap(long = "shell", short = 's', arg_enum)]
+    #[clap(long = "shell", short = 's', value_enum)]
     pub shell: Shell,
 }
 

crates/youki/src/main.rs

@@ -7,7 +7,7 @@ mod logger;
 use anyhow::bail;
 use anyhow::Context;
 use anyhow::Result;
-use clap::IntoApp;
+use clap::CommandFactory;
 use clap::{crate_version, Parser};
 use nix::libc;
 use std::fs;

tests/rust-integration-tests/integration_test/Cargo.toml

@@ -25,9 +25,9 @@ uuid = "1.2"
 which = "4.3.0"
 
 [dependencies.clap]
-version = "3.2.23"
+version = "4.0.32"
 default-features = false
-features = ["std", "suggestions", "derive", "cargo"]
+features = ["std", "suggestions", "derive", "cargo", "help", "usage", "error-context"]
 
 [dependencies.clap_derive]
 version = "4.0.21"

tests/rust-integration-tests/integration_test/src/main.rs

@@ -47,7 +47,7 @@ struct Run {
     /// Selected tests to be run, format should be
     /// space separated groups, eg
     /// -t group1::test1,test3 group2 group3::test5
-    #[clap(short, long, multiple_values = true, value_delimiter = ' ')]
+    #[clap(short, long, num_args(1..), value_delimiter = ' ')]
     tests: Option<Vec<String>>,
 }