Updated 'test-services' to remove 'clap-v2'

Signed-off-by: Abhijit Gadgil <agadgil@progress.com>

Author: agadgil-progress

test-services/test-probe/Cargo.toml

@@ -8,7 +8,7 @@ workspace = "../../"
 [dependencies]
 actix-rt = "*"
 actix-web = { version = "*", default-features = false, features = [ "rustls-0_21" ] }
-clap = { git = "https://github.com/habitat-sh/clap.git", branch = "v2-master", features = [ "suggestions", "color", "unstable" ] }
+clap = { version = "4", features = ["env", "derive", "string", "wrap_help"] }
 serde = { version = "*", features = ["derive"] }
 serde_json = "*"
 toml = "*"

test-services/test-probe/src/config.rs

@@ -26,7 +26,7 @@ impl Default for Config {
 }
 
 pub fn from_matches(args: &ArgMatches) -> Result<Config> {
-    if let Some(path) = args.value_of("config") {
+    if let Some(path) = args.get_one::<String>("config") {
         let contents = fs::read_to_string(path)?;
         toml::from_str(&contents).map_err(Error::Toml)
     } else {

test-services/test-probe/src/main.rs

@@ -2,19 +2,19 @@ use actix_web::{web::{self,
                       Data},
                 App as ActixApp,
                 HttpServer};
-use clap::{App,
-           Arg};
+use clap::{Arg,
+           Command};
 
 mod config;
 mod context;
 mod error;
 
-fn app<'a, 'b>() -> App<'a, 'b> {
-    App::new("test-probe").arg(Arg::with_name("config").short("c")
-                                                       .long("config")
-                                                       .value_name("CONFIG")
-                                                       .help("Sets a custom config file")
-                                                       .takes_value(true))
+fn app() -> Command {
+    Command::new("test-probe").arg(Arg::new("config").short('c')
+                                                     .long("config")
+                                                     .value_name("CONFIG")
+                                                     .help("Sets a custom config file")
+                                                     .num_args(1))
 }
 
 #[actix_rt::main]