move context arg back at the root level.

Not the nicest solution but fixes #70 for now until we move to clap v3

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drg"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Jean-Baptiste Trystram <jbtrystram@redhat.com>"]
 edition = "2018"
 license = "Apache-2.0"

src/arguments.rs

@@ -150,13 +150,13 @@ pub fn parse_arguments() -> ArgMatches<'static> {
         .about("Allows to manage drogue apps and devices in a drogue-cloud instance")
         .arg(config_file_arg)
         .arg(verbose)
+        .arg(&context_arg)
         .setting(AppSettings::SubcommandRequiredElseHelp)
         .subcommand(
             SubCommand::with_name(Verbs::create.as_ref())
                 .visible_alias("add")
                 .about("create a resource in the drogue-cloud registry")
                 .setting(AppSettings::ArgRequiredElseHelp)
-                .arg(&context_arg)
                 .subcommand(
                     SubCommand::with_name(Resources::device.as_ref())
                         .about("create a device.")
@@ -178,7 +178,6 @@ pub fn parse_arguments() -> ArgMatches<'static> {
                 .visible_alias("remove")
                 .about("delete a resource in the drogue-cloud registry")
                 .setting(AppSettings::ArgRequiredElseHelp)
-                .arg(&context_arg)
                 .subcommand(
                     SubCommand::with_name(Resources::device.as_ref())
                         .about("delete a device.")
@@ -195,7 +194,6 @@ pub fn parse_arguments() -> ArgMatches<'static> {
             SubCommand::with_name(Verbs::get.as_ref())
                 .about("Display one or many resources from the drogue-cloud registry")
                 .setting(AppSettings::ArgRequiredElseHelp)
-                .arg(&context_arg)
                 .subcommand(
                     SubCommand::with_name(Resources::device.as_ref())
                         .about("Retrieve a device spec.")
@@ -228,7 +226,6 @@ pub fn parse_arguments() -> ArgMatches<'static> {
                 .visible_alias("update")
                 .about("Update a resource from the drogue-cloud registry")
                 .setting(AppSettings::ArgRequiredElseHelp)
-                .arg(&context_arg)
                 .subcommand(
                     SubCommand::with_name(Resources::device.as_ref())
                         .about("Edit a device spec.")
@@ -245,27 +242,23 @@ pub fn parse_arguments() -> ArgMatches<'static> {
         )
         .subcommand(
             SubCommand::with_name(Other_commands::version.as_ref())
-                .arg(&context_arg)
                 .about("Print version information."),
         )
         .subcommand(
             SubCommand::with_name(Other_commands::login.as_ref())
                 .arg(&token_arg)
                 .about("Log into a drogue cloud installation.")
                 .arg(&url_arg)
-                .arg(&context_arg)
                 .arg(&login_keep_current),
         )
         // todo : deprecated
         .subcommand(
             SubCommand::with_name(Other_commands::token.as_ref())
-                .arg(&context_arg)
                 .about("--token is deprecated, use 'drg whoami --token' instead"),
         )
         .subcommand(
             SubCommand::with_name(Other_commands::whoami.as_ref())
                 .about("Print cluster adress, version and default app(if any)")
-                .arg(&context_arg)
                 .arg(
                     token_arg
                         .clone()

src/main.rs

@@ -19,13 +19,9 @@ fn main() -> Result<()> {
     let matches = arguments::parse_arguments();
     let config_path = matches.value_of(Parameters::config);
     let (command, submatches) = matches.subcommand();
-    let context_arg = if let Some(submatches) = submatches {
-        submatches
+    let context_arg = matches
             .value_of(Parameters::context)
-            .map(|s| s.to_string())
-    } else {
-        None
-    };
+            .map(|s| s.to_string());
 
     simple_logger::SimpleLogger::new()
         .with_level(util::log_level(&matches))