[Merged by Bors] - Bump clap to 4.0

CHANGELOG.md

@@ -7,6 +7,10 @@
 - Added Listener operator to supported operators ([#143](https://github.com/stackabletech/stackablectl/pull/143))
 - Support listing distributed MinIO instances ([#148](https://github.com/stackabletech/stackablectl/pull/148))
 
+### Changed
+
+- Bump to clap 4.0 ([#150](https://github.com/stackabletech/stackablectl/pull/150))
+
 ## [0.5.0] - 2022-09-14
 
 ### Added

Cargo.toml

@@ -9,8 +9,8 @@ repository = "https://github.com/stackabletech/stackablectl"
 
 [dependencies]
 cached = "0.39"
-clap = { version = "3.2", features = ["derive", "cargo"] }
-clap_complete = "3.2"
+clap = { version = "4.0", features = ["derive", "cargo"] }
+clap_complete = "4.0"
 cli-table = "0.4"
 env_logger = "0.9"
 indexmap = { version = "1.9", features = ["serde"] }

src/arguments.rs

@@ -2,7 +2,7 @@ use crate::{
     demo::CliCommandDemo, operator::CliCommandOperator, release::CliCommandRelease,
     services::CliCommandServices, stack::CliCommandStack,
 };
-use clap::{ArgEnum, Command, Parser, ValueHint};
+use clap::{Command, Parser, ValueEnum, ValueHint};
 use clap_complete::{generate, Generator, Shell};
 use log::LevelFilter;
 use std::io;
@@ -14,7 +14,7 @@ pub struct CliArgs {
     pub cmd: CliCommand,
 
     /// Log level.
-    #[clap(short, long, arg_enum, default_value = "info")]
+    #[clap(short, long, value_enum, default_value = "info")]
     pub log_level: LogLevel,
 
     /// Namespace where to deploy the products and operators
@@ -60,7 +60,7 @@ pub struct CliArgs {
     /// Have a look at <https://raw.githubusercontent.com/stackabletech/release/main/releases.yaml> for the structure.
     /// Can either be a URL or a path to a file, e.g. `https://my.server/my-releases.yaml`, '/etc/my-releases.yaml' or `C:\Users\Bob\my-releases.yaml`.
     /// Can be specified multiple times.
-    #[clap(long, multiple_occurrences(true), value_hint = ValueHint::FilePath)]
+    #[clap(long, value_hint = ValueHint::FilePath)]
     pub additional_releases_file: Vec<String>,
 
     /// Adds a YAML file containing custom stacks
@@ -69,7 +69,7 @@ pub struct CliArgs {
     /// Have a look at <https://raw.githubusercontent.com/stackabletech/stackablectl/main/stacks/stacks-v1.yaml> for the structure.
     /// Can either be a URL or a path to a file, e.g. `https://my.server/my-stacks.yaml`, '/etc/my-stacks.yaml' or `C:\Users\Bob\my-stacks.yaml`.
     /// Can be specified multiple times.
-    #[clap(long, multiple_occurrences(true), value_hint = ValueHint::FilePath)]
+    #[clap(long, value_hint = ValueHint::FilePath)]
     pub additional_stacks_file: Vec<String>,
 
     /// Adds a YAML file containing custom demos
@@ -78,7 +78,7 @@ pub struct CliArgs {
     /// Have a look at <https://raw.githubusercontent.com/stackabletech/stackablectl/main/demos/demos-v1.yaml> for the structure.
     /// Can either be a URL or a path to a file, e.g. `https://my.server/my-demos.yaml`, '/etc/my-demos.yaml' or `C:\Users\Bob\my-demos.yaml`.
     /// Can be specified multiple times.
-    #[clap(long, multiple_occurrences(true), value_hint = ValueHint::FilePath)]
+    #[clap(long, value_hint = ValueHint::FilePath)]
     pub additional_demos_file: Vec<String>,
 }
 
@@ -108,14 +108,14 @@ pub enum CliCommand {
     Completion(CliCommandCompletion),
 }
 
-#[derive(Clone, Parser, ArgEnum)]
+#[derive(Clone, Parser, ValueEnum)]
 pub enum OutputType {
     Text,
     Json,
     Yaml,
 }
 
-#[derive(Clone, Copy, Parser, Debug, ArgEnum)]
+#[derive(Clone, Copy, Parser, Debug, ValueEnum)]
 pub enum LogLevel {
     Error,
     Warn,
@@ -139,7 +139,7 @@ impl From<LogLevel> for LevelFilter {
 #[derive(Parser)]
 pub struct CliCommandCompletion {
     // Shell to generate the completions for
-    #[clap(arg_enum, value_parser)]
+    #[clap(value_enum, value_parser)]
     pub shell: Shell,
 }
 

src/demo.rs

@@ -24,7 +24,7 @@ pub enum CliCommandDemo {
     /// List all the available demos
     #[clap(alias("ls"))]
     List {
-        #[clap(short, long, arg_enum, default_value = "text")]
+        #[clap(short, long, value_enum, default_value = "text")]
         output: OutputType,
     },
     /// Show details of a specific demo
@@ -34,7 +34,7 @@ pub enum CliCommandDemo {
         #[clap(required = true, value_hint = ValueHint::Other)]
         demo: String,
 
-        #[clap(short, long, arg_enum, default_value = "text")]
+        #[clap(short, long, value_enum, default_value = "text")]
         output: OutputType,
     },
     /// Install a specific demo
@@ -55,7 +55,7 @@ pub enum CliCommandDemo {
         #[clap(
             long,
             default_value = "stackable-data-platform",
-            requires = "kind-cluster",
+            requires = "kind_cluster",
             value_hint = ValueHint::Other,
         )]
         kind_cluster_name: String,

src/main.rs

@@ -1,6 +1,6 @@
 use crate::arguments::CliCommand;
 use arguments::CliArgs;
-use clap::{IntoApp, Parser};
+use clap::{CommandFactory, Parser};
 use lazy_static::lazy_static;
 use log::error;
 use std::{error::Error, process::exit, sync::Mutex};

src/operator.rs

@@ -11,7 +11,7 @@ pub enum CliCommandOperator {
     /// List all the available operators
     #[clap(alias("ls"))]
     List {
-        #[clap(short, long, arg_enum, default_value = "text")]
+        #[clap(short, long, value_enum, default_value = "text")]
         output: OutputType,
     },
     /// Show details of a specific operator
@@ -21,7 +21,7 @@ pub enum CliCommandOperator {
         #[clap(required = true, value_hint = ValueHint::Other)]
         operator: String,
 
-        #[clap(short, long, arg_enum, default_value = "text")]
+        #[clap(short, long, value_enum, default_value = "text")]
         output: OutputType,
     },
     /// Install one or multiple operators
@@ -31,7 +31,7 @@ pub enum CliCommandOperator {
         /// Must have the form `name[=version]` e.g. `superset`, `superset=0.3.0`, `superset=0.3.0-nightly` or `superset=0.3.0-pr123`.
         /// If no version is specified the latest nightly version - build from the main branch - will be used.
         /// You can get the available versions with `stackablectl operator list` or `stackablectl operator describe superset`
-        #[clap(multiple_occurrences(true), required = true, value_hint = ValueHint::Other)]
+        #[clap(required = true, value_hint = ValueHint::Other)]
         operators: Vec<Operator>,
 
         /// If specified, a local Kubernetes cluster consisting of 4 nodes (1 for control-plane and 3 workers) for testing purposes will be created.
@@ -45,7 +45,7 @@ pub enum CliCommandOperator {
         #[clap(
             long,
             default_value = "stackable-data-platform",
-            requires = "kind-cluster",
+            requires = "kind_cluster",
             value_hint = ValueHint::Other,
         )]
         kind_cluster_name: String,
@@ -54,12 +54,12 @@ pub enum CliCommandOperator {
     #[clap(alias("un"))]
     Uninstall {
         /// Space separated list of operators to uninstall.
-        #[clap(multiple_occurrences(true), required = true, value_hint = ValueHint::Other)]
+        #[clap(required = true, value_hint = ValueHint::Other)]
         operators: Vec<String>,
     },
     /// List installed operators
     Installed {
-        #[clap(short, long, arg_enum, default_value = "text")]
+        #[clap(short, long, value_enum, default_value = "text")]
         output: OutputType,
     },
 }
@@ -271,7 +271,7 @@ fn list_installed_operators(output_type: &OutputType) -> Result<(), Box<dyn Erro
     Ok(())
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct Operator {
     pub name: String,
     pub version: Option<String>,

src/release.rs

@@ -18,7 +18,7 @@ pub enum CliCommandRelease {
     /// List all the available releases
     #[clap(alias("ls"))]
     List {
-        #[clap(short, long, arg_enum, default_value = "text")]
+        #[clap(short, long, value_enum, default_value = "text")]
         output: OutputType,
     },
     /// Show details of a specific release
@@ -28,15 +28,15 @@ pub enum CliCommandRelease {
         #[clap(required = true, value_hint = ValueHint::Other)]
         release: String,
 
-        #[clap(short, long, arg_enum, default_value = "text")]
+        #[clap(short, long, value_enum, default_value = "text")]
         output: OutputType,
     },
     /// Install a specific release
     #[clap(alias("in"))]
     #[clap(group(
-        ArgGroup::new("list-of-products")
+        ArgGroup::new("list_of_products")
             .required(false)
-            .args(&["include-products", "exclude-products"]),
+            .args(&["include_products", "exclude_products"]),
     ))]
     Install {
         /// Name of the release to install
@@ -64,7 +64,7 @@ pub enum CliCommandRelease {
         #[clap(
             long,
             default_value = "stackable-data-platform",
-            requires = "kind-cluster",
+            requires = "kind_cluster",
             value_hint = ValueHint::Other,
         )]
         kind_cluster_name: String,

src/services.rs

@@ -136,7 +136,7 @@ pub enum CliCommandServices {
         #[clap(long)]
         show_versions: bool,
 
-        #[clap(short, long, arg_enum, default_value = "text")]
+        #[clap(short, long, value_enum, default_value = "text")]
         output: OutputType,
     },
 }

src/stack.rs

@@ -19,7 +19,7 @@ pub enum CliCommandStack {
     /// List all the available stacks
     #[clap(alias("ls"))]
     List {
-        #[clap(short, long, arg_enum, default_value = "text")]
+        #[clap(short, long, value_enum, default_value = "text")]
         output: OutputType,
     },
     /// Show details of a specific stack
@@ -29,7 +29,7 @@ pub enum CliCommandStack {
         #[clap(required = true, value_hint = ValueHint::Other)]
         stack: String,
 
-        #[clap(short, long, arg_enum, default_value = "text")]
+        #[clap(short, long, value_enum, default_value = "text")]
         output: OutputType,
     },
     /// Install a specific stack
@@ -50,7 +50,7 @@ pub enum CliCommandStack {
         #[clap(
             long,
             default_value = "stackable-data-platform",
-            requires = "kind-cluster",
+            requires = "kind_cluster",
             value_hint = ValueHint::Other,
         )]
         kind_cluster_name: String,