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

@@ -1,32 +1,31 @@
-use crate::error::{Error,
-                   Result};
+use crate::error::{Error, Result};
 use clap::ArgMatches;
-use serde::{Deserialize,
-            Serialize};
-use std::{fs,
-          path::PathBuf};
+use serde::{Deserialize, Serialize};
+use std::{fs, path::PathBuf};
 
 pub const DEFAULT_JSON_SOURCE: &str = "/hab/svc/test-probe/config/render_context_file.json";
 pub const DEFAULT_HOST: &str = "0.0.0.0";
 pub const DEFAULT_PORT: u16 = 8000;
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Config {
-    pub host:                String,
-    pub port:                u16,
+    pub host: String,
+    pub port: u16,
     pub render_context_file: PathBuf,
 }
 
 impl Default for Config {
     fn default() -> Self {
-        Config { host:                DEFAULT_HOST.to_string(),
-                 port:                DEFAULT_PORT,
-                 render_context_file: PathBuf::from(DEFAULT_JSON_SOURCE), }
+        Config {
+            host: DEFAULT_HOST.to_string(),
+            port: DEFAULT_PORT,
+            render_context_file: PathBuf::from(DEFAULT_JSON_SOURCE),
+        }
     }
 }
 
 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

@@ -1,20 +1,22 @@
-use actix_web::{web::{self,
-                      Data},
-                App as ActixApp,
-                HttpServer};
-use clap::{App,
-           Arg};
+use actix_web::{
+    web::{self, Data},
+    App as ActixApp, HttpServer,
+};
+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]
@@ -23,11 +25,13 @@ async fn main() -> std::io::Result<()> {
     let config = config::from_matches(&matches).expect("Could not create application");
     let bind_addr = format!("{}:{}", config.host, config.port);
     let server = HttpServer::new(move || {
-                     ActixApp::new().app_data(Data::new(config.clone()))
-                                    .route("context", web::get().to(context::show))
-                                    .route("context/{path:.*}", web::get().to(context::show))
-                 }).workers(1)
-                   .bind(&bind_addr)?;
+        ActixApp::new()
+            .app_data(Data::new(config.clone()))
+            .route("context", web::get().to(context::show))
+            .route("context/{path:.*}", web::get().to(context::show))
+    })
+    .workers(1)
+    .bind(&bind_addr)?;
 
     println!("Starting test-probe on {}", bind_addr);
     server.run().await