chore: update clap dependency from v3 to v4

Signed-off-by: Matheus Cardoso <matheus@cardo.so>

Author: cardoso

Cargo.lock

@@ -17,7 +17,9 @@ async-trait = "0.1"
 bindle = { workspace = true }
 bytes = "1.1"
 chrono = "0.4"
-clap = { version = "3.1.15", features = ["derive", "env"] }
+clap = { version = "4.1", features = ["derive", "env"] }
+clap_complete = { version = "4.1", optional = true }
+clap_complete_fig = { version = "4.1", optional = true }
 cloud = { path = "crates/cloud" }
 cloud-openapi = { git = "https://github.com/fermyon/cloud-openapi" }
 comfy-table = "5.0"
@@ -80,12 +82,13 @@ vergen = { version = "7", default-features = false, features = [
 ] }
 
 [features]
-default = []
+default = ["generate-completions"]
 e2e-tests = []
 outbound-redis-tests = []
 config-provider-tests = []
 outbound-pg-tests = []
 outbound-mysql-tests = []
+generate-completions = ["dep:clap_complete", "dep:clap_complete_fig"]
 
 [workspace]
 members = [

Cargo.toml

@@ -7,7 +7,7 @@ edition = { workspace = true }
 [dependencies]
 anyhow = "1.0.44"
 cap-std = "0.26.1"
-clap = { version = "3.1.15", features = ["derive", "env"] }
+clap = { version = "4.1", features = ["derive", "env"] }
 rand = "0.8.5"
 rand_chacha = "0.3.1"
 rand_core = "0.6.3"

crates/abi-conformance/Cargo.toml

@@ -8,18 +8,18 @@ use std::{
 use wasmtime::{Config, Engine, Module};
 
 #[derive(Parser)]
-#[clap(author, version, about)]
+#[command(author, version, about)]
 pub struct Options {
     /// Name of Wasm file to test (or stdin if not specified)
-    #[clap(short, long)]
+    #[arg(short, long)]
     pub input: Option<PathBuf>,
 
     /// Name of JSON file to write report to (or stdout if not specified)
-    #[clap(short, long)]
+    #[arg(short, long)]
     pub output: Option<PathBuf>,
 
     /// Name of TOML configuration file to use
-    #[clap(short, long)]
+    #[arg(short, long)]
     pub config: Option<PathBuf>,
 }
 

crates/abi-conformance/src/bin/spin-abi-conformance.rs

@@ -10,7 +10,7 @@ doctest = false
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1"
-clap = "3"
+clap = "4.1"
 futures = "0.3"
 futures-util = "0.3.8"
 http = "0.2"

crates/http/Cargo.toml

@@ -8,7 +8,7 @@ mod wagi;
 use std::{
     collections::HashMap,
     future::ready,
-    net::{Ipv4Addr, SocketAddr, ToSocketAddrs},
+    net::{Ipv4Addr, SocketAddr, SocketAddrV4, ToSocketAddrs},
     path::PathBuf,
     sync::Arc,
 };
@@ -59,15 +59,15 @@ pub struct HttpTrigger {
 #[derive(Args)]
 pub struct CliArgs {
     /// IP address and port to listen on
-    #[clap(long = "listen", default_value = "127.0.0.1:3000", value_parser = parse_listen_addr)]
+    #[arg(long = "listen", default_value_t = std::net::SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(127, 0, 0, 1), 3000)), value_parser = parse_listen_addr)]
     pub address: SocketAddr,
 
     /// The path to the certificate to use for https, if this is not set, normal http will be used. The cert should be in PEM format
-    #[clap(long, env = "SPIN_TLS_CERT", requires = "tls-key")]
+    #[arg(long, env = "SPIN_TLS_CERT", requires = "tls_key")]
     pub tls_cert: Option<PathBuf>,
 
     /// The path to the certificate key to use for https, if this is not set, normal http will be used. The key should be in PKCS#8 format
-    #[clap(long, env = "SPIN_TLS_KEY", requires = "tls-cert")]
+    #[arg(long, env = "SPIN_TLS_KEY", requires = "tls_cert")]
     pub tls_key: Option<PathBuf>,
 }
 

crates/http/src/lib.rs

@@ -7,7 +7,7 @@ edition = { workspace = true }
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1"
-clap = { version = "3.1.15", features = ["derive", "env"] }
+clap = { version = "4.1", features = ["derive", "env"] }
 ctrlc = { version = "3.2", features = ["termination"] }
 dirs = "4"
 futures = "0.3"

crates/trigger/Cargo.toml

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use anyhow::{Context, Result};
-use clap::{Args, IntoApp, Parser};
+use clap::{Args, CommandFactory, Parser};
 use serde::de::DeserializeOwned;
 use tokio::{
     task::JoinHandle,
@@ -24,69 +24,67 @@ pub const SPIN_WORKING_DIR: &str = "SPIN_WORKING_DIR";
 
 /// A command that runs a TriggerExecutor.
 #[derive(Parser, Debug)]
-#[clap(next_help_heading = "TRIGGER OPTIONS")]
+#[command(next_help_heading = "TRIGGER OPTIONS")]
 pub struct TriggerExecutorCommand<Executor: TriggerExecutor>
 where
     Executor::RunConfig: Args,
 {
     /// Log directory for the stdout and stderr of components.
-    #[clap(
-            name = APP_LOG_DIR,
-            short = 'L',
-            long = "log-dir",
-            )]
+    #[arg(
+        short = 'L',
+        long = "log-dir",
+        id = APP_LOG_DIR,
+    )]
     pub log: Option<PathBuf>,
 
     /// Disable Wasmtime cache.
-    #[clap(
-        name = DISABLE_WASMTIME_CACHE,
+    #[arg(
         long = "disable-cache",
+        id = DISABLE_WASMTIME_CACHE,
         env = DISABLE_WASMTIME_CACHE,
-        conflicts_with = WASMTIME_CACHE_FILE,
-        takes_value = false,
+        conflicts_with = WASMTIME_CACHE_FILE
     )]
     pub disable_cache: bool,
 
     /// Wasmtime cache configuration file.
-    #[clap(
-        name = WASMTIME_CACHE_FILE,
+    #[arg(
         long = "cache",
+        id = WASMTIME_CACHE_FILE,
         env = WASMTIME_CACHE_FILE,
         conflicts_with = DISABLE_WASMTIME_CACHE,
     )]
     pub cache: Option<PathBuf>,
 
     /// Print output for given component(s) to stdout/stderr
-    #[clap(
-        name = FOLLOW_LOG_OPT,
+    #[arg(
         long = "follow",
-        multiple_occurrences = true,
-        )]
+        id = FOLLOW_LOG_OPT
+    )]
     pub follow_components: Vec<String>,
 
     /// Print all component output to stdout/stderr
-    #[clap(
+    #[arg(
         long = "follow-all",
-        conflicts_with = FOLLOW_LOG_OPT,
-        )]
+        conflicts_with = FOLLOW_LOG_OPT
+    )]
     pub follow_all_components: bool,
 
     /// Set the static assets of the components in the temporary directory as writable.
-    #[clap(long = "allow-transient-write")]
+    #[arg(long)]
     pub allow_transient_write: bool,
 
     /// Configuration file for config providers and wasmtime config.
-    #[clap(
-        name = RUNTIME_CONFIG_FILE,
+    #[arg(
         long = "runtime-config-file",
+        id = RUNTIME_CONFIG_FILE,
         env = RUNTIME_CONFIG_FILE,
     )]
     pub runtime_config_file: Option<PathBuf>,
 
-    #[clap(flatten)]
+    #[command(flatten)]
     pub run_config: Executor::RunConfig,
 
-    #[clap(long = "help-args-only", hide = true)]
+    #[arg(long, hide = true)]
     pub help_args_only: bool,
 
     #[clap(long = "oci")]