Merge pull request #1613 from Azure/autogenerate

Merge autogenerate -> master

Author: jorgecotillo

generator/autogenlist.ts

@@ -1,6 +1,8 @@
 import { ScopeType, AutogenlistConfig } from './models';
+import { postProcessor as insightsApplicationPostProcessor } from './processors/Microsoft.Insights.Application';
 import { postProcessor as resourcesPostProcessor } from './processors/Microsoft.Resources';
 import { postProcessor as machineLearningPostProcessor } from './processors/Microsoft.MachineLearning';
+import { postProcessor as machineLearningServicesPostProcessor } from './processors/Microsoft.MachineLearningServices';
 import { postProcessor as storageProcessor } from './processors/Microsoft.Storage';
 import { lowerCaseEquals } from './utils';
 
@@ -332,6 +334,11 @@ const autogenlist: AutogenlistConfig[] = [
         namespace: 'Microsoft.MachineLearning',
         postProcessor: machineLearningPostProcessor,
     },
+    {
+        basePath: 'machinelearningservices/resource-manager',
+        namespace: 'Microsoft.MachineLearningServices',
+        postProcessor: machineLearningServicesPostProcessor,
+    },
     {
         basePath: 'machinelearningcompute/resource-manager',
         namespace: 'Microsoft.MachineLearningCompute',
@@ -378,10 +385,6 @@ const autogenlist: AutogenlistConfig[] = [
         basePath: 'marketplace/resource-manager',
         namespace: 'Microsoft.Marketplace',
     },
-    {
-        basePath: 'machinelearningservices/resource-manager',
-        namespace: 'Microsoft.MachineLearningServices',
-    },
     {
         basePath: 'mysql/resource-manager',
         namespace: 'Microsoft.DBforMySQL',
@@ -706,6 +709,7 @@ const autogenlist: AutogenlistConfig[] = [
         basePath: 'applicationinsights/resource-manager',
         namespace: 'Microsoft.Insights',
         suffix: 'Application',
+        postProcessor: insightsApplicationPostProcessor,
     },
     {
         basePath: 'quantum/resource-manager',

generator/package-lock.json

@@ -0,0 +1,8 @@
+import { SchemaPostProcessor } from '../models';
+
+export const postProcessor: SchemaPostProcessor = (namespace: string, apiVersion: string, schema: any) => {
+  // this shouldn't be a resource definition, and it causes Export failures as it contains duplicate properties "Type" and "type"
+  if (schema.resourceDefinitions['components_Annotations']) {
+    delete schema.resourceDefinitions['components_Annotations'];
+  }
+}

generator/processors/Microsoft.Insights.Application.ts

@@ -0,0 +1,9 @@
+import { SchemaPostProcessor } from '../models';
+
+export const postProcessor: SchemaPostProcessor = (namespace: string, apiVersion: string, schema: any) => {
+  const cyclicRef = schema.definitions?.LabelClass?.properties?.subclasses?.oneOf[0]?.additionalProperties;
+  if (cyclicRef && cyclicRef['$ref']) {
+    delete cyclicRef['$ref'];
+    cyclicRef['type'] = 'object';
+  }
+}