work around batch svc enum spec errors (#452)

Author: bmc-msft

services/autorust/codegen/examples/gen_svc.rs

@@ -37,23 +37,7 @@ const INVALID_TYPE_WORKAROUND: &[(&str, &str, &str)] = &[(
     "rows",
 )];
 
-const FIX_CASE_PROPERTIES: &[(&str, &str, &str)] = &[
-    (
-        "../../../azure-rest-api-specs/specification/batch/data-plane/Microsoft.Batch/stable/2021-06-01.14.0/BatchService.json",
-        "TaskSchedulingPolicy",
-        "nodeFillType",
-    ),
-    (
-        "../../../azure-rest-api-specs/specification/batch/data-plane/Microsoft.Batch/stable/2021-06-01.14.0/BatchService.json",
-        "NodePlacementConfiguration",
-        "policy",
-    ),
-    (
-        "../../../azure-rest-api-specs/specification/batch/data-plane/Microsoft.Batch/stable/2021-06-01.14.0/BatchService.json",
-        "PublicIPAddressConfiguration",
-        "provision",
-    ),
-];
+const FIX_CASE_PROPERTIES: &[&str] = &["BatchServiceClient", "BatchService"];
 
 // because of recursive types, some properties have to be boxed
 // https://github.com/ctaggart/autorust/issues/73
@@ -179,12 +163,8 @@ fn gen_crate(spec: &SpecReadme) -> Result<()> {
     let mut feature_mod_names = Vec::new();
 
     let mut fix_case_properties = HashSet::new();
-    for (file_path, schema_name, property_name) in FIX_CASE_PROPERTIES {
-        fix_case_properties.insert(PropertyName {
-            file_path: PathBuf::from(file_path),
-            schema_name: schema_name.to_string(),
-            property_name: property_name.to_string(),
-        });
+    for spec_title in FIX_CASE_PROPERTIES {
+        fix_case_properties.insert(spec_title.to_string());
     }
 
     let mut box_properties = HashSet::new();

services/autorust/codegen/src/codegen.rs

@@ -28,12 +28,12 @@ impl CodeGen {
         &self.config.output_folder
     }
 
-    pub fn has_case_workaround(&self, path: &Path) -> bool {
-        self.config.fix_case_properties.iter().any(|x| x.file_path == path)
-    }
-
-    pub fn should_workaround_case(&self, prop_nm: &PropertyName) -> bool {
-        self.config.fix_case_properties.contains(prop_nm)
+    pub fn should_workaround_case(&self) -> bool {
+        if let Some(title) = self.spec.title() {
+            self.config.fix_case_properties.contains(title)
+        } else {
+            false
+        }
     }
 
     pub fn should_force_optional(&self, prop_nm: &PropertyName) -> bool {

services/autorust/codegen/src/codegen_models.rs

@@ -21,7 +21,7 @@ pub fn create_models(cg: &CodeGen) -> Result<TokenStream, Error> {
     let mut file = TokenStream::new();
     file.extend(create_generated_by_header());
 
-    let has_case_workaround = cg.spec.input_docs().any(|(x, _)| cg.has_case_workaround(x));
+    let has_case_workaround = cg.should_workaround_case();
 
     file.extend(quote! {
         #![allow(non_camel_case_types)]
@@ -201,7 +201,7 @@ fn create_struct(cg: &CodeGen, doc_file: &Path, struct_name: &str, schema: &Reso
             property_name: property_name.to_string(),
         };
 
-        let lowercase_workaround = cg.should_workaround_case(prop_nm);
+        let lowercase_workaround = cg.should_workaround_case();
 
         let (mut field_tp_name, field_tp) = create_struct_field_type(cg, doc_file, &ns, property_name, property, lowercase_workaround)?;
         // uncomment the next two lines to help identify entries that need boxed

services/autorust/codegen/src/lib.rs

@@ -66,7 +66,7 @@ pub struct Config {
     pub output_folder: PathBuf,
     pub box_properties: HashSet<PropertyName>,
     pub optional_properties: HashSet<PropertyName>,
-    pub fix_case_properties: HashSet<PropertyName>,
+    pub fix_case_properties: HashSet<String>,
     pub invalid_types: HashSet<PropertyName>,
     pub runs: Vec<Runs>,
     pub print_writing_file: bool,

services/autorust/codegen/src/spec.rs

@@ -81,6 +81,19 @@ impl Spec {
         &self.docs
     }
 
+    pub fn title(&self) -> Option<&str> {
+        let mut titles: Vec<_> = self
+            .docs
+            .values()
+            .map(|doc| &doc.info.title)
+            .filter(|t| t.is_some())
+            .flatten()
+            .collect();
+        titles.sort_unstable();
+
+        titles.get(0).map(|t| t.as_str())
+    }
+
     pub fn consumes(&self) -> Vec<&String> {
         let versions: Vec<_> = self
             .docs()