chore: update clap dependency from v3 to v4

cardoso · cardoso · commit a71a7b23991f · 2023-01-26T05:25:21.000-03:00
Signed-off-by: Matheus Cardoso &lt;matheus@cardo.so&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,7 @@ 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"] }
 cloud = { path = "crates/cloud" }
 cloud-openapi = { git = "https://github.com/fermyon/cloud-openapi" }
 comfy-table = "5.0"
diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml
@@ -10,7 +10,7 @@ doctest = false
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1"
-clap = "3"
+clap = "4"
 futures = "0.3"
 futures-util = "0.3.8"
 http = "0.2"
diff --git a/crates/http/src/lib.rs b/crates/http/src/lib.rs
@@ -63,11 +63,11 @@ pub struct CliArgs {
     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")]
+    #[clap(long = "tls-cert", 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")]
+    #[clap(long = "tls-key", env = "SPIN_TLS_KEY", requires = "tls_cert")]
     pub tls_key: Option<PathBuf>,
 }
 
diff --git a/crates/trigger/Cargo.toml b/crates/trigger/Cargo.toml
@@ -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"
diff --git a/crates/trigger/src/cli.rs b/crates/trigger/src/cli.rs
@@ -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,
@@ -43,7 +43,7 @@ where
         long = "disable-cache",
         env = DISABLE_WASMTIME_CACHE,
         conflicts_with = WASMTIME_CACHE_FILE,
-        takes_value = false,
+        num_args = 0,
     )]
     pub disable_cache: bool,
 
@@ -59,9 +59,8 @@ where
     /// Print output for given component(s) to stdout/stderr
     #[clap(
         name = FOLLOW_LOG_OPT,
-        long = "follow",
-        multiple_occurrences = true,
-        )]
+        long = "follow"
+    )]
     pub follow_components: Vec<String>,
 
     /// Print all component output to stdout/stderr
diff --git a/src/commands/bindle.rs b/src/commands/bindle.rs
@@ -41,7 +41,7 @@ pub struct Prepare {
     #[clap(
         name = BUILDINFO_OPT,
         long = "buildinfo",
-        parse(try_from_str = parse_buildinfo),
+        value_parser = parse_buildinfo,
     )]
     pub buildinfo: Option<BuildMetadata>,
 
@@ -69,7 +69,7 @@ pub struct Push {
     #[clap(
         name = BUILDINFO_OPT,
         long = "buildinfo",
-        parse(try_from_str = parse_buildinfo),
+        value_parser = parse_buildinfo,
     )]
     pub buildinfo: Option<BuildMetadata>,
 
@@ -113,7 +113,7 @@ pub struct Push {
         name = INSECURE_OPT,
         short = 'k',
         long = "insecure",
-        takes_value = false,
+        num_args = 0,
     )]
     pub insecure: bool,
 }
diff --git a/src/commands/deploy.rs b/src/commands/deploy.rs
@@ -72,7 +72,7 @@ pub struct DeployCommand {
     #[clap(
         name = BUILDINFO_OPT,
         long = "buildinfo",
-        parse(try_from_str = parse_buildinfo),
+        value_parser = parse_buildinfo,
     )]
     pub buildinfo: Option<BuildMetadata>,
 
diff --git a/src/commands/external.rs b/src/commands/external.rs
@@ -1,6 +1,6 @@
 use crate::opts::PLUGIN_OVERRIDE_COMPATIBILITY_CHECK_FLAG;
 use anyhow::{anyhow, Result};
-use clap::App;
+use clap;
 use spin_plugins::{error::Error, manifest::check_supported_version, PluginStore};
 use std::{collections::HashMap, env, process};
 use tokio::process::Command;
@@ -33,7 +33,10 @@ fn parse_subcommand(mut cmd: Vec<String>) -> anyhow::Result<(String, Vec<String>
 /// Executes a Spin plugin as a subprocess, expecting the first argument to
 /// indicate the plugin to execute. Passes all subsequent arguments on to the
 /// subprocess.
-pub async fn execute_external_subcommand(cmd: Vec<String>, app: App<'_>) -> anyhow::Result<()> {
+pub async fn execute_external_subcommand(
+    cmd: Vec<String>,
+    app: clap::Command,
+) -> anyhow::Result<()> {
     let (plugin_name, args, override_compatibility_check) = parse_subcommand(cmd)?;
     let plugin_store = PluginStore::try_default()?;
     match plugin_store.read_plugin_manifest(&plugin_name) {
diff --git a/src/commands/login.rs b/src/commands/login.rs
@@ -63,7 +63,7 @@ pub struct LoginCommand {
         name = INSECURE_OPT,
         short = 'k',
         long = "insecure",
-        takes_value = false,
+        num_args = 0,
     )]
     pub insecure: bool,
 
@@ -99,7 +99,7 @@ pub struct LoginCommand {
     #[clap(
         name = "status",
         long = "status",
-        takes_value = false,
+        num_args = 0,
         conflicts_with = "list",
         conflicts_with = "get-device-code",
         conflicts_with = "check-device-code"
@@ -110,7 +110,7 @@ pub struct LoginCommand {
     #[clap(
         name = "get-device-code",
         long = "get-device-code",
-        takes_value = false,
+        num_args = 0,
         hide = true,
         conflicts_with = "status",
         conflicts_with = "check-device-code"
@@ -132,7 +132,7 @@ pub struct LoginCommand {
         name = "auth-method",
         long = "auth-method",
         env = "AUTH_METHOD",
-        arg_enum
+        value_enum
     )]
     pub method: Option<AuthMethod>,
 
@@ -149,7 +149,7 @@ pub struct LoginCommand {
     #[clap(
         name = "list",
         long = "list",
-        takes_value = false,
+        num_args = 0,
         conflicts_with = "environment-name",
         conflicts_with = "status",
         conflicts_with = "get-device-code",
@@ -540,7 +540,7 @@ fn ensure(root: &PathBuf) -> Result<()> {
 }
 
 /// The method by which to authenticate the login.
-#[derive(clap::ArgEnum, Clone, Debug, Eq, PartialEq)]
+#[derive(clap::ValueEnum, Clone, Debug, Eq, PartialEq)]
 pub enum AuthMethod {
     #[clap(name = "github")]
     Github,
diff --git a/src/commands/new.rs b/src/commands/new.rs
@@ -30,7 +30,7 @@ pub struct TemplateNewCommandCore {
     pub output_path: Option<PathBuf>,
 
     /// Parameter values to be passed to the template (in name=value format).
-    #[clap(short = 'v', long = "value", multiple_occurrences = true)]
+    #[clap(short = 'v', long = "value")]
     pub values: Vec<ParameterValue>,
 
     /// A TOML file which contains parameter values in name = "value" format.
@@ -41,7 +41,7 @@ pub struct TemplateNewCommandCore {
 
     /// An optional argument that allows to skip prompts for the manifest file
     /// by accepting the defaults if available on the template
-    #[clap(long = "accept-defaults", takes_value = false)]
+    #[clap(long = "accept-defaults", num_args = 0)]
     pub accept_defaults: bool,
 }
 
@@ -157,7 +157,7 @@ impl TemplateNewCommandCore {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct ParameterValue {
     pub name: String,
     pub value: String,
diff --git a/src/commands/plugins.rs b/src/commands/plugins.rs
@@ -80,11 +80,11 @@ pub struct Install {
     pub remote_manifest_src: Option<Url>,
 
     /// Skips prompt to accept the installation of the plugin.
-    #[clap(short = 'y', long = "yes", takes_value = false)]
+    #[clap(short = 'y', long = "yes", num_args = 0)]
     pub yes_to_all: bool,
 
     /// Overrides a failed compatibility check of the plugin with the current version of Spin.
-    #[clap(long = PLUGIN_OVERRIDE_COMPATIBILITY_CHECK_FLAG, takes_value = false)]
+    #[clap(long = PLUGIN_OVERRIDE_COMPATIBILITY_CHECK_FLAG, num_args = 0)]
     pub override_compatibility_check: bool,
 
     /// Specific version of a plugin to be install from the centralized plugins
@@ -164,7 +164,7 @@ pub struct Upgrade {
         conflicts_with = PLUGIN_NAME_OPT,
         conflicts_with = PLUGIN_REMOTE_PLUGIN_MANIFEST_OPT,
         conflicts_with = PLUGIN_LOCAL_PLUGIN_MANIFEST_OPT,
-        takes_value = false,
+        num_args = 0,
     )]
     pub all: bool,
 
@@ -187,11 +187,11 @@ pub struct Upgrade {
     pub remote_manifest_src: Option<Url>,
 
     /// Skips prompt to accept the installation of the plugin[s].
-    #[clap(short = 'y', long = "yes", takes_value = false)]
+    #[clap(short = 'y', long = "yes", num_args = 0)]
     pub yes_to_all: bool,
 
     /// Overrides a failed compatibility check of the plugin with the current version of Spin.
-    #[clap(long = PLUGIN_OVERRIDE_COMPATIBILITY_CHECK_FLAG, takes_value = false)]
+    #[clap(long = PLUGIN_OVERRIDE_COMPATIBILITY_CHECK_FLAG, num_args = 0)]
     pub override_compatibility_check: bool,
 
     /// Specific version of a plugin to be install from the centralized plugins
@@ -207,7 +207,7 @@ pub struct Upgrade {
     pub version: Option<Version>,
 
     /// Allow downgrading a plugin's version.
-    #[clap(short = 'd', long = "downgrade", takes_value = false)]
+    #[clap(short = 'd', long = "downgrade", num_args = 0)]
     pub downgrade: bool,
 }
 
@@ -293,7 +293,7 @@ impl Upgrade {
 #[derive(Parser, Debug)]
 pub struct List {
     /// List only installed plugins.
-    #[clap(long = "installed", takes_value = false)]
+    #[clap(long = "installed", num_args = 0)]
     pub installed: bool,
 }
 
diff --git a/src/commands/up.rs b/src/commands/up.rs
@@ -75,12 +75,12 @@ pub struct UpCommand {
         name = INSECURE_OPT,
         short = 'k',
         long = "insecure",
-        takes_value = false,
+        num_args = 0,
     )]
     pub insecure: bool,
 
     /// Pass an environment variable (key=value) to all components of the application.
-    #[clap(short = 'e', long = "env", parse(try_from_str = parse_env_var))]
+    #[clap(short = 'e', long = "env", value_parser = parse_env_var)]
     pub env: Vec<(String, String)>,
 
     /// Temporary directory for the static assets of the components.
@@ -92,7 +92,7 @@ pub struct UpCommand {
     ///
     /// This allows you to update the assets on the host filesystem such that the updates are visible to the guest
     /// without a restart.  This cannot be used with bindle apps or apps which use file patterns and/or exclusions.
-    #[clap(long, takes_value = false, conflicts_with = BINDLE_ID_OPT)]
+    #[clap(long, num_args = 0, conflicts_with = BINDLE_ID_OPT)]
     pub direct_mounts: bool,
 
     /// All other args, to be passed through to the trigger
