Merge pull request #9811 from habitat-sh/agadgil/prune-clap-v2-support-hab-cli

pruned `clapv2` from habitat

Author: mwrock

Cargo.lock

@@ -10,11 +10,6 @@ workspace = "../../"
 async-trait = "*"
 bimap = "*"
 bitflags = "*"
-clap = { git = "https://github.com/habitat-sh/clap.git", branch = "v2-master", features = [
-  "suggestions",
-  "color",
-  "unstable",
-] , optional = true }
 # TODO: When we finally get rid of everything, in clap_v2 make it just `clap`.
 # This is required right now because we would like to start common Validation code for all
 # the other packages that are using it.
@@ -69,9 +64,7 @@ nix = { version = "*", features = ["signal", "user"] }
 winapi = { version = "^0.3", features = ["consoleapi", "processenv"] }
 
 [features]
-v2 = ["clap"]
-v4 = []
-default = ["v4"]
+default = []
 deadlock_detection = []
 lock_as_rwlock = []
 lock_as_mutex = []

components/common/Cargo.toml

@@ -2,9 +2,6 @@
 //! for use in the clap layer of the application. This is not the final form for defaults.
 //! Eventually this will be composed of fully typed default values. But as a first step we
 //! need a spot to consolidate those values and help simplify some of the logic around them.
-#[cfg(feature = "v2")]
-use clap::{value_t,
-           ArgMatches};
 use habitat_core::{self,
                    os::process::{ShutdownSignal,
                                  ShutdownTimeout},
@@ -47,18 +44,6 @@ pub const DEFAULT_BINLINK_DIR: &str = "/bin";
 #[cfg(target_os = "macos")]
 pub const DEFAULT_BINLINK_DIR: &str = "/usr/local/bin";
 
-#[cfg(feature = "v2")]
-pub fn key_cache_from_matches(matches: &ArgMatches<'_>)
-                              -> crate::error::Result<habitat_core::crypto::keys::KeyCache> {
-    use habitat_core::crypto::keys::KeyCache;
-    use std::path::PathBuf;
-
-    let path = value_t!(matches, "CACHE_KEY_PATH", PathBuf).expect("CACHE_KEY_PATH required");
-    let key_cache = KeyCache::new(path);
-    key_cache.setup()?;
-    Ok(key_cache)
-}
-
 pub fn is_toml_file(val: &str) -> bool {
     let extension = Path::new(&val).extension().and_then(OsStr::to_str);
     matches!(extension, Some("toml"))

components/common/src/cli.rs

@@ -89,8 +89,7 @@ impl clap_v4::builder::TypedValueParser for FileExistsValueParser {
     }
 }
 
-// TODO: This will be used by `hab config`. This implements the functionality of
-// `file_exists_or_stdin` validator in Clap v2.
+// This validator will be used by `hab config`
 /// Struct implementing validator that validates the valie is a valid 'file' or 'stdin'
 #[derive(Clone)]
 pub struct FileExistsOrStdinValueParser;

components/common/src/cli/clap_validators.rs

@@ -1,7 +1,5 @@
 use crate::{error::Error,
             util};
-#[cfg(feature = "v2")]
-use clap::ArgMatches;
 
 use native_tls::Certificate;
 use serde::{Deserialize,
@@ -141,18 +139,6 @@ impl EventStreamToken {
     }
 }
 
-#[cfg(feature = "v2")]
-impl<'a> From<&'a ArgMatches<'a>> for EventStreamToken {
-    /// Create an instance of `EventStreamToken` from validated
-    /// user input.
-    fn from(m: &ArgMatches) -> Self {
-        m.value_of(Self::ARG_NAME)
-         .expect("HAB_AUTOMATE_AUTH_TOKEN should be set")
-         .parse()
-         .expect("HAB_AUTOMATE_AUTH_TOKEN should be validated at this point")
-    }
-}
-
 impl FromStr for EventStreamToken {
     type Err = Error;
 
@@ -252,15 +238,6 @@ impl EventStreamServerCertificate {
     pub fn validate(value: String) -> result::Result<(), String> {
         value.parse::<Self>().map(|_| ()).map_err(|e| e.to_string())
     }
-
-    #[cfg(feature = "v2")]
-    /// Create an instance of `EventStreamServerCertificate` from validated user input.
-    pub fn from_arg_matches(m: &ArgMatches) -> Option<Self> {
-        m.value_of(Self::ARG_NAME).map(|value| {
-                                      value.parse().expect("EVENT_STREAM_SERVER_CERTIFICATE \
-                                                            should be validated")
-                                  })
-    }
 }
 
 impl FromStr for EventStreamServerCertificate {

components/common/src/types.rs

@@ -54,11 +54,7 @@ rustls-webpki = { version = "*", features = ["alloc"] }
 tempfile = "*"
 
 
-clap = { git = "https://github.com/habitat-sh/clap.git", branch = "v2-master", features = [ "suggestions", "color", "unstable" ] , optional = true}
-configopt = { git = "https://github.com/habitat-sh/configopt.git" , optional = true}
-structopt = { git = "https://github.com/habitat-sh/structopt.git" , optional = true}
-
-clap_v4 = { version = "4", package = "clap", features = ["env", "derive", "string", "wrap_help"], optional = true }
+clap_v4 = { version = "4", package = "clap", features = ["env", "derive", "string", "wrap_help"]}
 
 clap_complete = "*"
 
@@ -72,9 +68,7 @@ winapi = { version = "^0.3", features = ["winuser", "windef"] }
 winreg = "*"
 
 [features]
-v2 = [ "clap", "configopt", "structopt" ]
-v4 = [ "clap_v4" ]
-default = ["supported_targets", "v4"]
+default = ["supported_targets"]
 functional = []
 supported_targets = ["habitat_core/supported_targets"]
 aarch64-linux = ["habitat_core/aarch64-linux"]