Build CLI without clap's load_yaml. Fixes #880 (#1133)

* Build CLI without clap's load_yaml. See #880

* Formatting

* Require arg in top-level cli invocation

* Remove cli.yaml

Co-authored-by: François Massot <[email protected]>

Author: ddelemeny

Cargo.lock

@@ -22,7 +22,7 @@ path = "src/generate_markdown.rs"
 async-trait = "0.1"
 anyhow = "1"
 byte-unit = { version = "4", default-features = false, features = ["serde"] }
-clap = { version = "=3.0.0-beta.5", features = ["yaml"] }
+clap = { version = "=3.0.14", features = ["yaml", "env"] }
 quickwit-actors = { version = "0.2.0", path = "../quickwit-actors" }
 quickwit-core = { version = "0.2.0", path = "../quickwit-core" }
 quickwit-directories = { version = "0.2.0", path = "../quickwit-directories" }

quickwit-cli/Cargo.toml

@@ -18,13 +18,23 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 use anyhow::bail;
-use clap::ArgMatches;
+use clap::{App, AppSettings, ArgMatches};
 use tracing::Level;
 
-use crate::index::IndexCliCommand;
-use crate::service::ServiceCliCommand;
-use crate::source::SourceCliCommand;
-use crate::split::SplitCliCommand;
+use crate::index::{build_index_command, IndexCliCommand};
+use crate::service::{build_service_command, ServiceCliCommand};
+use crate::source::{build_source_command, SourceCliCommand};
+use crate::split::{build_split_command, SplitCliCommand};
+
+pub fn build_cli<'a>() -> App<'a> {
+    App::new("Quickwit")
+        .subcommand(build_source_command())
+        .subcommand(build_service_command())
+        .subcommand(build_split_command())
+        .subcommand(build_index_command())
+        .setting(AppSettings::DisableHelpSubcommand)
+        .setting(AppSettings::ArgRequiredElseHelp)
+}
 
 #[derive(Debug, PartialEq)]
 pub enum CliCommand {