Bump clap in proxy to 4.0

src/proxy-manager/Cargo.toml

@@ -8,17 +8,26 @@ license = "MIT"
 
 [dependencies]
 anyhow = "1.0"
-clap = "2.34"
+clap = { version = "4", features = ["cargo", "string"] }
 env_logger = "0.9"
 futures = "0.3"
-reqwest = { version = "0.11", features = ["json", "stream", "native-tls-vendored"], default-features = false }
+reqwest = { version = "0.11", features = [
+    "json",
+    "stream",
+    "native-tls-vendored",
+], default-features = false }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 storage-queue = { path = "../agent/storage-queue" }
 thiserror = "1.0"
-tokio = { version = "1.24", features = ["macros", "rt-multi-thread", "fs", "process"] }
+tokio = { version = "1.24", features = [
+    "macros",
+    "rt-multi-thread",
+    "fs",
+    "process",
+] }
 url = { version = "2.3", features = ["serde"] }
-reqwest-retry = { path = "../agent/reqwest-retry"}
+reqwest-retry = { path = "../agent/reqwest-retry" }
 onefuzz-telemetry = { path = "../agent/onefuzz-telemetry" }
 uuid = "0.8"
 log = "0.4"

src/proxy-manager/src/config.rs

@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 
 use crate::proxy;
-use anyhow::Result;
+use anyhow::{bail, Result};
 use onefuzz_telemetry::{
-    set_appinsights_clients, EventData, InstanceTelemetryKey, MicrosoftTelemetryKey, Role,
+    info, set_appinsights_clients, EventData, InstanceTelemetryKey, MicrosoftTelemetryKey, Role,
 };
 use reqwest_retry::SendRetry;
 use serde::{Deserialize, Serialize};
@@ -16,9 +16,6 @@ use uuid::Uuid;
 
 #[derive(Error, Debug)]
 pub enum ProxyError {
-    #[error("missing argument {0}")]
-    MissingArg(String),
-
     #[error("missing etag header")]
     EtagError,
 

src/proxy-manager/src/main.rs

@@ -1,19 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#[macro_use]
-extern crate onefuzz_telemetry;
-#[macro_use]
-extern crate anyhow;
-#[macro_use]
-extern crate clap;
-
 mod config;
 mod proxy;
 
 use anyhow::Result;
-use clap::{App, Arg, SubCommand};
-use config::{Config, ProxyError::MissingArg};
+use clap::{Arg, Command};
+use config::Config;
+use onefuzz_telemetry::{error, info};
 use std::{
     io::{stdout, Write},
     time::Instant,
@@ -53,23 +47,18 @@ async fn run(proxy_config: Config) -> Result<()> {
 fn main() -> Result<()> {
     env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
 
-    let license_cmd = SubCommand::with_name("licenses").about("display third-party licenses");
+    let license_cmd = Command::new("licenses").about("display third-party licenses");
 
     let version = format!(
         "{} onefuzz:{} git:{}",
-        crate_version!(),
+        clap::crate_version!(),
         env!("ONEFUZZ_VERSION"),
         env!("GIT_VERSION")
     );
 
-    let app = App::new("onefuzz-proxy")
-        .version(version.as_str())
-        .arg(
-            Arg::with_name("config")
-                .long("config")
-                .short("c")
-                .takes_value(true),
-        )
+    let app = Command::new("onefuzz-proxy")
+        .version(version)
+        .arg(Arg::new("config").long("config").short('c').required(true))
         .subcommand(license_cmd);
     let matches = app.get_matches();
 
@@ -79,8 +68,8 @@ fn main() -> Result<()> {
     }
 
     let config_path = matches
-        .value_of("config")
-        .ok_or_else(|| MissingArg("--config".to_string()))?
+        .get_one::<String>("config")
+        .expect("was required")
         .parse()?;
 
     let rt = Runtime::new()?;

src/proxy-manager/src/proxy.rs

@@ -3,6 +3,7 @@
 
 use crate::config::ConfigData;
 use anyhow::Result;
+use onefuzz_telemetry::{error, info};
 use std::{collections::HashMap, path::Path};
 use tokio::process::Command;