Fix Time enum variants

Relates: elastic/elasticsearch#49368

This commit fixes a bug in the rest specs with the Time enum. The values contain
unit names in parentheses in the spec which results in incorrect enum variants
and serde rename values being generated.

A PR has been submitted to fix the rest spec, which will align with the fix applied in this commit

Author: russcam

api_generator/Cargo.toml

@@ -12,8 +12,10 @@ dialoguer = "0.3.0"
 failure = "0.1.5"
 Inflector = "0.11.4"
 indicatif = "0.12.0"
+lazy_static = "1.4.0"
 quote = "~0.3"
 reduce = "0.1.2"
+regex = "1.3.1"
 reqwest = "~0.9"
 rustfmt-nightly="1.4.8"
 serde = "~1"

api_generator/src/api_generator/code_gen/params.rs

@@ -2,6 +2,7 @@ use crate::api_generator::*;
 
 use inflector::Inflector;
 use quote::Tokens;
+use regex::Regex;
 
 pub fn generate(api: &Api) -> Result<String, failure::Error> {
     let mut tokens = quote::Tokens::new();
@@ -18,20 +19,30 @@ pub fn generate(api: &Api) -> Result<String, failure::Error> {
 
 fn generate_param(tokens: &mut Tokens, e: &ApiEnum) {
     let name = syn::Ident::from(e.name.to_pascal_case());
-    let renames = e
+    let (renames, variants): (Vec<String>, Vec<syn::Ident>) = e
         .values
         .iter()
         .filter(|v| !v.is_empty())
-        .collect::<Vec<_>>();
-    let values: Vec<syn::Ident> = renames
-        .iter()
-        .map(|v| syn::Ident::from(v.to_pascal_case()))
-        .collect();
+        .map(|v| {
+            if !v.contains("(") {
+                (v.to_owned(), syn::Ident::from(v.to_pascal_case()))
+            } else {
+                lazy_static! {
+                    static ref PARENS_REGEX: Regex = Regex::new(r"^(.*?)\s*\(.*?\)\s*$").unwrap();
+                }
+                if let Some(c) = PARENS_REGEX.captures(v) {
+                    (c.get(1).unwrap().as_str().to_owned(), syn::Ident::from(c.get(1).unwrap().as_str().to_pascal_case()))
+                } else {
+                    (v.to_owned(), syn::Ident::from(v.to_pascal_case()))
+                }
+            }
+        })
+        .unzip();
 
     let generated_enum_tokens = quote!(
         #[derive(Debug, PartialEq, Deserialize, Serialize, Clone, Copy)]
         pub enum #name {
-            #(#[serde(rename = #renames)] #values),*
+            #(#[serde(rename = #renames)] #variants),*
         }
     );
 

api_generator/src/main.rs

@@ -1,4 +1,8 @@
 extern crate dialoguer;
+
+#[macro_use]
+extern crate lazy_static;
+
 #[macro_use]
 extern crate quote;
 

elasticsearch/src/generated/params.rs

@@ -139,20 +139,20 @@ pub enum SuggestMode {
 }
 #[derive(Debug, PartialEq, Deserialize, Serialize, Clone, Copy)]
 pub enum Time {
-    #[serde(rename = "d (Days)")]
-    DDays,
-    #[serde(rename = "h (Hours)")]
-    HHours,
-    #[serde(rename = "m (Minutes)")]
-    MMinutes,
-    #[serde(rename = "s (Seconds)")]
-    SSeconds,
-    #[serde(rename = "ms (Milliseconds)")]
-    MsMilliseconds,
-    #[serde(rename = "micros (Microseconds)")]
-    MicrosMicroseconds,
-    #[serde(rename = "nanos (Nanoseconds)")]
-    NanosNanoseconds,
+    #[serde(rename = "d")]
+    D,
+    #[serde(rename = "h")]
+    H,
+    #[serde(rename = "m")]
+    M,
+    #[serde(rename = "s")]
+    S,
+    #[serde(rename = "ms")]
+    Ms,
+    #[serde(rename = "micros")]
+    Micros,
+    #[serde(rename = "nanos")]
+    Nanos,
 }
 #[derive(Debug, PartialEq, Deserialize, Serialize, Clone, Copy)]
 pub enum Type {