Merge pull request #2862 from Azure/ant/onboard_advisor

Onboard Microsoft.Advisor to autogeneration
Azure · Apr 10, 2023 · d4fb70b · d4fb70b
2 parents 2339f74 + cab64b9
commit d4fb70b
Show file tree

Hide file tree

Showing 18 changed files with 725 additions and 146 deletions.
diff --git a/generator/autogenlist.ts b/generator/autogenlist.ts
@@ -19,11 +19,6 @@ import { lowerCaseEquals } from './utils';
 
 // New providers are onboarded by default. The providers listed here are the only ones **not** onboarded.
 const disabledProviders: AutoGenConfig[] = [
-    {
-        basePath: 'advisor/resource-manager',
-        namespace: 'Microsoft.Advisor',
-        disabledForAutogen: true,
-    },
     {
         basePath: 'cloudshell/resource-manager',
         namespace: 'Microsoft.Portal',
@@ -46,6 +41,12 @@ const disabledProviders: AutoGenConfig[] = [
         disabledForAutogen: true,
         suffix: 'DNS',
     },
+    {
+        basePath: 'privatedns/resource-manager',
+        namespace: 'Microsoft.Network',
+        disabledForAutogen: true,
+        suffix: 'privateDns',
+    },
     {
         // Disabled as the swagger spec contains a bug (enum mismatch)
         basePath: 'edgeorderpartner/resource-manager',
@@ -67,22 +68,11 @@ const disabledProviders: AutoGenConfig[] = [
         namespace: 'Microsoft.OperationsManagement',
         disabledForAutogen: true,
     },
-    {
-        basePath: 'privatedns/resource-manager',
-        namespace: 'Microsoft.Network',
-        disabledForAutogen: true,
-        suffix: 'privateDns',
-    },
     {
         basePath: 'service-map/resource-manager',
         namespace: 'Microsoft.OperationalInsights',
         disabledForAutogen: true,
     },
-    {
-        basePath: 'trafficmanager/resource-manager',
-        namespace: 'Microsoft.Network',
-        suffix: 'TrafficManager',
-    },
     {
         basePath: 'videoanalyzer/resource-manager',
         namespace: 'Microsoft.Media',
@@ -1096,6 +1086,11 @@ const autoGenList: AutoGenConfig[] = [
         namespace: 'Microsoft.Media',
         postProcessor: mediaPostProcessor
     },
+    {
+        basePath: 'trafficmanager/resource-manager',
+        namespace: 'Microsoft.Network',
+        suffix: 'TrafficManager',
+    },
     {
         basePath: 'network/resource-manager',
         namespace: 'Microsoft.Network',
@@ -1112,6 +1107,16 @@ const autoGenList: AutoGenConfig[] = [
         namespace: 'Microsoft.AzureStackHCI',
         postProcessor: azureStackHciPostProcessor
     },
+    {
+        basePath: 'advisor/resource-manager',
+        namespace: 'Microsoft.Advisor',
+        resourceConfig: [
+            {
+                type: 'recommendations/suppressions',
+                scopes: ScopeType.Tenant | ScopeType.ManagementGroup | ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
+            },
+        ]
+    },
 ];
 
 export function findAutogenEntries(basePath: string): AutoGenConfig[] {

diff --git a/schemas/2014-04-01-preview/deploymentTemplate.json b/schemas/2014-04-01-preview/deploymentTemplate.json
@@ -6090,19 +6090,19 @@
                   "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.ResourceGraph.json#/resourceDefinitions/queries"
                 },
                 {
-                  "$ref": "https://schema.management.azure.com/schemas/2016-07-12-preview/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions"
+                  "$ref": "https://schema.management.azure.com/schemas/2016-07-12-preview/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
                 },
                 {
-                  "$ref": "https://schema.management.azure.com/schemas/2017-03-31/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions"
+                  "$ref": "https://schema.management.azure.com/schemas/2017-03-31/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
                 },
                 {
-                  "$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions"
+                  "$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
                 },
                 {
                   "$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/resourceDefinitions/configurations"
                 },
                 {
-                  "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions"
+                  "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
                 },
                 {
                   "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/resourceDefinitions/configurations"

diff --git a/schemas/2016-07-12-preview/Microsoft.Advisor.json b/schemas/2016-07-12-preview/Microsoft.Advisor.json
@@ -3,7 +3,8 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Microsoft.Advisor",
   "description": "Microsoft Advisor Resource Types",
-  "resourceDefinitions": {
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
     "recommendations_suppressions": {
       "type": "object",
       "properties": {
@@ -47,7 +48,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/suppressions"
+            "Microsoft.Advisor/recommendations/suppressions"
           ]
         }
       },
@@ -56,7 +57,7 @@
         "name",
         "type"
       ],
-      "description": "Microsoft.Advisor/suppressions"
+      "description": "Microsoft.Advisor/recommendations/suppressions"
     }
   },
   "definitions": {}

diff --git a/schemas/2017-03-31/Microsoft.Advisor.json b/schemas/2017-03-31/Microsoft.Advisor.json
@@ -3,7 +3,8 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Microsoft.Advisor",
   "description": "Microsoft Advisor Resource Types",
-  "resourceDefinitions": {
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
     "recommendations_suppressions": {
       "type": "object",
       "properties": {
@@ -31,7 +32,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/suppressions"
+            "Microsoft.Advisor/recommendations/suppressions"
           ]
         }
       },
@@ -41,7 +42,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.Advisor/suppressions"
+      "description": "Microsoft.Advisor/recommendations/suppressions"
     }
   },
   "definitions": {

diff --git a/schemas/2017-04-19/Microsoft.Advisor.json b/schemas/2017-04-19/Microsoft.Advisor.json
@@ -48,8 +48,10 @@
         "type"
       ],
       "description": "Microsoft.Advisor/configurations"
-    },
-    "recommendations_suppressions": {
+    }
+  },
+  "subscription_resourceDefinitions": {
+    "configurations": {
       "type": "object",
       "properties": {
         "apiVersion": {
@@ -58,25 +60,31 @@
             "2017-04-19"
           ]
         },
+        "id": {
+          "type": "string",
+          "description": "The resource Id of the configuration resource."
+        },
         "name": {
           "type": "string",
-          "description": "The name of the suppression."
+          "enum": [
+            "configurations"
+          ]
         },
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/SuppressionProperties"
+              "$ref": "#/definitions/ConfigDataProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The properties of the suppression."
+          "description": "The list of property name/value pairs."
         },
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/suppressions"
+            "Microsoft.Advisor/configurations"
           ]
         }
       },
@@ -86,11 +94,11 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.Advisor/suppressions"
+      "description": "Microsoft.Advisor/configurations"
     }
   },
-  "subscription_resourceDefinitions": {
-    "configurations": {
+  "unknown_resourceDefinitions": {
+    "recommendations_suppressions": {
       "type": "object",
       "properties": {
         "apiVersion": {
@@ -99,31 +107,25 @@
             "2017-04-19"
           ]
         },
-        "id": {
-          "type": "string",
-          "description": "The resource Id of the configuration resource."
-        },
         "name": {
           "type": "string",
-          "enum": [
-            "configurations"
-          ]
+          "description": "The name of the suppression."
         },
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ConfigDataProperties"
+              "$ref": "#/definitions/SuppressionProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The list of property name/value pairs."
+          "description": "The properties of the suppression."
         },
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/configurations"
+            "Microsoft.Advisor/recommendations/suppressions"
           ]
         }
       },
@@ -133,7 +135,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.Advisor/configurations"
+      "description": "Microsoft.Advisor/recommendations/suppressions"
     }
   },
   "definitions": {

diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
@@ -506,12 +506,36 @@
             {
               "$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Addons.json#/subscription_resourceDefinitions/supportProviders_supportPlanTypes"
             },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2016-07-12-preview/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2017-03-31/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+            },
             {
               "$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/subscription_resourceDefinitions/configurations"
             },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+            },
             {
               "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/subscription_resourceDefinitions/configurations"
             },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2022-09-01/Microsoft.Advisor.json#/subscription_resourceDefinitions/configurations"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2022-09-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2022-10-01/Microsoft.Advisor.json#/subscription_resourceDefinitions/configurations"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2022-10-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+            },
             {
               "$ref": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleAssignments"
             },

diff --git a/schemas/2019-04-01/deploymentTemplate.json b/schemas/2019-04-01/deploymentTemplate.json
@@ -642,12 +642,6 @@
                 { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.ManagedServices.json#/resourceDefinitions/registrationAssignments" },
                 { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.ManagedServices.json#/resourceDefinitions/registrationDefinitions" },
                 { "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.BareMetal.json#/resourceDefinitions/crayServers" },
-                { "$ref": "https://schema.management.azure.com/schemas/2016-07-12-preview/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions" },
-                { "$ref": "https://schema.management.azure.com/schemas/2017-03-31/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions" },
-                { "$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions" },
-                { "$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/resourceDefinitions/configurations" },
-                { "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions" },
-                { "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/resourceDefinitions/configurations" },
                 { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/components" },
                 { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/webtests" },
                 { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/autoscalesettings" },

diff --git a/schemas/2019-08-01/managementGroupDeploymentTemplate.json b/schemas/2019-08-01/managementGroupDeploymentTemplate.json
@@ -500,6 +500,24 @@
         },
         {
           "oneOf": [
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2016-07-12-preview/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2017-03-31/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2022-09-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2022-10-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+            },
             {
               "$ref": "https://schema.management.azure.com/schemas/2023-04-01-preview/Microsoft.AlertsManagement.json#/managementGroup_resourceDefinitions/tenantActivityLogAlerts"
             },

diff --git a/schemas/2019-08-01/tenantDeploymentTemplate.json b/schemas/2019-08-01/tenantDeploymentTemplate.json
@@ -508,6 +508,24 @@
                 {
                   "$ref": "https://schema.management.azure.com/schemas/2017-04-01-preview/Microsoft.Aadiam.json#/tenant_resourceDefinitions/diagnosticSettings"
                 },
+                {
+                  "$ref": "https://schema.management.azure.com/schemas/2016-07-12-preview/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+                },
+                {
+                  "$ref": "https://schema.management.azure.com/schemas/2017-03-31/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+                },
+                {
+                  "$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+                },
+                {
+                  "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+                },
+                {
+                  "$ref": "https://schema.management.azure.com/schemas/2022-09-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+                },
+                {
+                  "$ref": "https://schema.management.azure.com/schemas/2022-10-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
+                },
                 {
                   "$ref": "https://schema.management.azure.com/schemas/2022-11-16-preview/Microsoft.AppComplianceAutomation.json#/tenant_resourceDefinitions/reports"
                 },