[Rust Server] Update bin/cli.rs to compile (#17876)

Author: azriel-healthpoint

modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache

@@ -72,7 +72,7 @@ cli = [
 {{#apiHasDeleteMethods}}
   "dialoguer",
 {{/apiHasDeleteMethods}}
-  "anyhow", "clap-verbosity-flag", "simple_logger", "structopt", "tokio"
+  "anyhow", "clap", "clap-verbosity-flag", "simple_logger", "tokio"
 ]
 conversion = ["frunk", "frunk_derives", "frunk_core", "frunk-enum-core", "frunk-enum-derive"]
 

modules/openapi-generator/src/main/resources/rust-server/bin-cli.mustache

@@ -1,5 +1,6 @@
 //! CLI tool driving the API client
 use anyhow::{anyhow, Context, Result};
+use clap::Parser;
 {{#apiHasDeleteMethods}}
 use dialoguer::Confirm;
 {{/apiHasDeleteMethods}}
@@ -19,7 +20,6 @@ use {{{externCrateName}}}::{
 {{/apiInfo}}
 };
 use simple_logger::SimpleLogger;
-use structopt::StructOpt;
 use swagger::{AuthData, ContextBuilder, EmptyContext, Push, XSpanIdString};
 
 type ClientContext = swagger::make_context_ty!(
@@ -30,65 +30,65 @@ type ClientContext = swagger::make_context_ty!(
 );
 
 {{! See code in RustServerCodegen if you are adding additional short option usage here. }}
-#[derive(StructOpt, Debug)]
-#[structopt(
+#[derive(Parser, Debug)]
+#[clap(
     name = "{{appName}}",
     version = "{{version}}",
     about = "CLI access to {{appName}}"
 )]
 struct Cli {
-    #[structopt(subcommand)]
+    #[clap(subcommand)]
     operation: Operation,
 
     /// Address or hostname of the server hosting this API, including optional port
-    #[structopt(short = "a", long, default_value = "http://localhost")]
+    #[clap(short = 'a', long, default_value = "http://localhost")]
     server_address: String,
 
     /// Path to the client private key if using client-side TLS authentication
     #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
-    #[structopt(long, requires_all(&["client-certificate", "server-certificate"]))]
+    #[clap(long, requires_all(&["client-certificate", "server-certificate"]))]
     client_key: Option<String>,
 
     /// Path to the client's public certificate associated with the private key
     #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
-    #[structopt(long, requires_all(&["client-key", "server-certificate"]))]
+    #[clap(long, requires_all(&["client-key", "server-certificate"]))]
     client_certificate: Option<String>,
 
     /// Path to CA certificate used to authenticate the server
     #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
-    #[structopt(long)]
+    #[clap(long)]
     server_certificate: Option<String>,
 
     /// If set, write output to file instead of stdout
-    #[structopt(short, long)]
+    #[clap(short, long)]
     output_file: Option<String>,
 
-    #[structopt(flatten)]
+    #[command(flatten)]
     verbosity: clap_verbosity_flag::Verbosity,
 {{#apiHasDeleteMethods}}
 
     /// Don't ask for any confirmation prompts
     #[allow(dead_code)]
-    #[structopt(short, long)]
+    #[clap(short, long)]
     force: bool,
 {{/apiHasDeleteMethods}}
 {{#hasHttpBearerMethods}}
 
     /// Bearer token if used for authentication
-    #[structopt(env = "{{#lambda.uppercase}}{{externCrateName}}{{/lambda.uppercase}}_BEARER_TOKEN", hide_env_values = true)]
+    #[clap(env = "{{#lambda.uppercase}}{{externCrateName}}{{/lambda.uppercase}}_BEARER_TOKEN", hide_env_values = true)]
     bearer_token: Option<String>,
 {{/hasHttpBearerMethods}}
 {{^hasHttpBearerMethods}}
 {{#hasOAuthMethods}}
 
     /// Bearer token if used for authentication
-    #[structopt(env = "{{#lambda.uppercase}}{{externCrateName}}{{/lambda.uppercase}}_BEARER_TOKEN", hide_env_values = true)]
+    #[clap(env = "{{#lambda.uppercase}}{{externCrateName}}{{/lambda.uppercase}}_BEARER_TOKEN", hide_env_values = true)]
     bearer_token: Option<String>,
 {{/hasOAuthMethods}}
 {{/hasHttpBearerMethods}}
 }
 
-#[derive(StructOpt, Debug)]
+#[derive(Parser, Debug)]
 enum Operation {
 {{#apiInfo}}
   {{#apis}}
@@ -103,21 +103,21 @@ enum Operation {
         /// {{{description}}}
         {{/description}}
         {{^isPrimitiveType}}
-        #[structopt(parse(try_from_str = parse_json){{#isArray}}, long{{/isArray}})]
+        #[clap(value_parser = parse_json::<{{{dataType}}}>){{#isArray}}, long{{/isArray}}]
         {{/isPrimitiveType}}
         {{#isByteArray}}
-        #[structopt(parse(try_from_str = parse_json))]
+        #[clap(value_parser = parse_json::<{{{dataType}}}>)]
         {{/isByteArray}}
         {{#isBinary}}
-        #[structopt(parse(try_from_str = parse_json))]
+        #[clap(value_parser = parse_json::<{{{dataType}}}>)]
         {{/isBinary}}
         {{#isBoolean}}
           {{#isPrimitiveType}}
             {{#vendorExtensions.x-provide-cli-short-opt}}
-        #[structopt(short, long)]
+        #[clap(short, long)]
             {{/vendorExtensions.x-provide-cli-short-opt}}
             {{^vendorExtensions.x-provide-cli-short-opt}}
-        #[structopt(long)]
+        #[clap(long)]
             {{/vendorExtensions.x-provide-cli-short-opt}}
           {{/isPrimitiveType}}
         {{/isBoolean}}
@@ -165,7 +165,7 @@ fn create_client(args: &Cli, context: ClientContext) -> Result<Box<dyn ApiNoCont
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    let args = Cli::from_args();
+    let args = Cli::parse();
     if let Some(log_level) = args.verbosity.log_level() {
         SimpleLogger::new().with_level(log_level.to_level_filter()).init()?;
     }
@@ -312,6 +312,6 @@ fn prompt(force: bool, text: &str) -> Result<()> {
 
 // May be unused if all inputs are primitive types
 #[allow(dead_code)]
-fn parse_json<'a, T: serde::de::Deserialize<'a>>(json_string: &'a str) -> Result<T> {
+fn parse_json<T: serde::de::DeserializeOwned>(json_string: &str) -> Result<T> {
     serde_json::from_str(json_string).map_err(|err| anyhow!("Error parsing input: {}", err))
 }