Skip to content

Commit d4fb70b

Browse files
anthony-c-martinanthony-c-martin
authored
Merge pull request #2862 from Azure/ant/onboard_advisor
Onboard Microsoft.Advisor to autogeneration
2 parents 2339f74 + cab64b9 commit d4fb70b

18 files changed

+725
-146
lines changed

‎generator/autogenlist.ts

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ import { lowerCaseEquals } from './utils';
1919

2020
// New providers are onboarded by default. The providers listed here are the only ones **not** onboarded.
2121
const disabledProviders: AutoGenConfig[] = [
22-
{
23-
basePath: 'advisor/resource-manager',
24-
namespace: 'Microsoft.Advisor',
25-
disabledForAutogen: true,
26-
},
2722
{
2823
basePath: 'cloudshell/resource-manager',
2924
namespace: 'Microsoft.Portal',
@@ -46,6 +41,12 @@ const disabledProviders: AutoGenConfig[] = [
4641
disabledForAutogen: true,
4742
suffix: 'DNS',
4843
},
44+
{
45+
basePath: 'privatedns/resource-manager',
46+
namespace: 'Microsoft.Network',
47+
disabledForAutogen: true,
48+
suffix: 'privateDns',
49+
},
4950
{
5051
// Disabled as the swagger spec contains a bug (enum mismatch)
5152
basePath: 'edgeorderpartner/resource-manager',
@@ -67,22 +68,11 @@ const disabledProviders: AutoGenConfig[] = [
6768
namespace: 'Microsoft.OperationsManagement',
6869
disabledForAutogen: true,
6970
},
70-
{
71-
basePath: 'privatedns/resource-manager',
72-
namespace: 'Microsoft.Network',
73-
disabledForAutogen: true,
74-
suffix: 'privateDns',
75-
},
7671
{
7772
basePath: 'service-map/resource-manager',
7873
namespace: 'Microsoft.OperationalInsights',
7974
disabledForAutogen: true,
8075
},
81-
{
82-
basePath: 'trafficmanager/resource-manager',
83-
namespace: 'Microsoft.Network',
84-
suffix: 'TrafficManager',
85-
},
8676
{
8777
basePath: 'videoanalyzer/resource-manager',
8878
namespace: 'Microsoft.Media',
@@ -1096,6 +1086,11 @@ const autoGenList: AutoGenConfig[] = [
10961086
namespace: 'Microsoft.Media',
10971087
postProcessor: mediaPostProcessor
10981088
},
1089+
{
1090+
basePath: 'trafficmanager/resource-manager',
1091+
namespace: 'Microsoft.Network',
1092+
suffix: 'TrafficManager',
1093+
},
10991094
{
11001095
basePath: 'network/resource-manager',
11011096
namespace: 'Microsoft.Network',
@@ -1112,6 +1107,16 @@ const autoGenList: AutoGenConfig[] = [
11121107
namespace: 'Microsoft.AzureStackHCI',
11131108
postProcessor: azureStackHciPostProcessor
11141109
},
1110+
{
1111+
basePath: 'advisor/resource-manager',
1112+
namespace: 'Microsoft.Advisor',
1113+
resourceConfig: [
1114+
{
1115+
type: 'recommendations/suppressions',
1116+
scopes: ScopeType.Tenant | ScopeType.ManagementGroup | ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
1117+
},
1118+
]
1119+
},
11151120
];
11161121

11171122
export function findAutogenEntries(basePath: string): AutoGenConfig[] {

‎schemas/2014-04-01-preview/deploymentTemplate.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6090,19 +6090,19 @@
60906090
"$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.ResourceGraph.json#/resourceDefinitions/queries"
60916091
},
60926092
{
6093-
"$ref": "https://schema.management.azure.com/schemas/2016-07-12-preview/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions"
6093+
"$ref": "https://schema.management.azure.com/schemas/2016-07-12-preview/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
60946094
},
60956095
{
6096-
"$ref": "https://schema.management.azure.com/schemas/2017-03-31/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions"
6096+
"$ref": "https://schema.management.azure.com/schemas/2017-03-31/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
60976097
},
60986098
{
6099-
"$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions"
6099+
"$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
61006100
},
61016101
{
61026102
"$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/resourceDefinitions/configurations"
61036103
},
61046104
{
6105-
"$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions"
6105+
"$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
61066106
},
61076107
{
61086108
"$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/resourceDefinitions/configurations"

‎schemas/2016-07-12-preview/Microsoft.Advisor.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"$schema": "http://json-schema.org/draft-04/schema#",
44
"title": "Microsoft.Advisor",
55
"description": "Microsoft Advisor Resource Types",
6-
"resourceDefinitions": {
6+
"resourceDefinitions": {},
7+
"unknown_resourceDefinitions": {
78
"recommendations_suppressions": {
89
"type": "object",
910
"properties": {
@@ -47,7 +48,7 @@
4748
"type": {
4849
"type": "string",
4950
"enum": [
50-
"Microsoft.Advisor/suppressions"
51+
"Microsoft.Advisor/recommendations/suppressions"
5152
]
5253
}
5354
},
@@ -56,7 +57,7 @@
5657
"name",
5758
"type"
5859
],
59-
"description": "Microsoft.Advisor/suppressions"
60+
"description": "Microsoft.Advisor/recommendations/suppressions"
6061
}
6162
},
6263
"definitions": {}

‎schemas/2017-03-31/Microsoft.Advisor.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"$schema": "http://json-schema.org/draft-04/schema#",
44
"title": "Microsoft.Advisor",
55
"description": "Microsoft Advisor Resource Types",
6-
"resourceDefinitions": {
6+
"resourceDefinitions": {},
7+
"unknown_resourceDefinitions": {
78
"recommendations_suppressions": {
89
"type": "object",
910
"properties": {
@@ -31,7 +32,7 @@
3132
"type": {
3233
"type": "string",
3334
"enum": [
34-
"Microsoft.Advisor/suppressions"
35+
"Microsoft.Advisor/recommendations/suppressions"
3536
]
3637
}
3738
},
@@ -41,7 +42,7 @@
4142
"properties",
4243
"type"
4344
],
44-
"description": "Microsoft.Advisor/suppressions"
45+
"description": "Microsoft.Advisor/recommendations/suppressions"
4546
}
4647
},
4748
"definitions": {

‎schemas/2017-04-19/Microsoft.Advisor.json

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@
4848
"type"
4949
],
5050
"description": "Microsoft.Advisor/configurations"
51-
},
52-
"recommendations_suppressions": {
51+
}
52+
},
53+
"subscription_resourceDefinitions": {
54+
"configurations": {
5355
"type": "object",
5456
"properties": {
5557
"apiVersion": {
@@ -58,25 +60,31 @@
5860
"2017-04-19"
5961
]
6062
},
63+
"id": {
64+
"type": "string",
65+
"description": "The resource Id of the configuration resource."
66+
},
6167
"name": {
6268
"type": "string",
63-
"description": "The name of the suppression."
69+
"enum": [
70+
"configurations"
71+
]
6472
},
6573
"properties": {
6674
"oneOf": [
6775
{
68-
"$ref": "#/definitions/SuppressionProperties"
76+
"$ref": "#/definitions/ConfigDataProperties"
6977
},
7078
{
7179
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
7280
}
7381
],
74-
"description": "The properties of the suppression."
82+
"description": "The list of property name/value pairs."
7583
},
7684
"type": {
7785
"type": "string",
7886
"enum": [
79-
"Microsoft.Advisor/suppressions"
87+
"Microsoft.Advisor/configurations"
8088
]
8189
}
8290
},
@@ -86,11 +94,11 @@
8694
"properties",
8795
"type"
8896
],
89-
"description": "Microsoft.Advisor/suppressions"
97+
"description": "Microsoft.Advisor/configurations"
9098
}
9199
},
92-
"subscription_resourceDefinitions": {
93-
"configurations": {
100+
"unknown_resourceDefinitions": {
101+
"recommendations_suppressions": {
94102
"type": "object",
95103
"properties": {
96104
"apiVersion": {
@@ -99,31 +107,25 @@
99107
"2017-04-19"
100108
]
101109
},
102-
"id": {
103-
"type": "string",
104-
"description": "The resource Id of the configuration resource."
105-
},
106110
"name": {
107111
"type": "string",
108-
"enum": [
109-
"configurations"
110-
]
112+
"description": "The name of the suppression."
111113
},
112114
"properties": {
113115
"oneOf": [
114116
{
115-
"$ref": "#/definitions/ConfigDataProperties"
117+
"$ref": "#/definitions/SuppressionProperties"
116118
},
117119
{
118120
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
119121
}
120122
],
121-
"description": "The list of property name/value pairs."
123+
"description": "The properties of the suppression."
122124
},
123125
"type": {
124126
"type": "string",
125127
"enum": [
126-
"Microsoft.Advisor/configurations"
128+
"Microsoft.Advisor/recommendations/suppressions"
127129
]
128130
}
129131
},
@@ -133,7 +135,7 @@
133135
"properties",
134136
"type"
135137
],
136-
"description": "Microsoft.Advisor/configurations"
138+
"description": "Microsoft.Advisor/recommendations/suppressions"
137139
}
138140
},
139141
"definitions": {

‎schemas/2018-05-01/subscriptionDeploymentTemplate.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,12 +506,36 @@
506506
{
507507
"$ref": "https://schema.management.azure.com/schemas/2018-03-01/Microsoft.Addons.json#/subscription_resourceDefinitions/supportProviders_supportPlanTypes"
508508
},
509+
{
510+
"$ref": "https://schema.management.azure.com/schemas/2016-07-12-preview/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
511+
},
512+
{
513+
"$ref": "https://schema.management.azure.com/schemas/2017-03-31/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
514+
},
509515
{
510516
"$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/subscription_resourceDefinitions/configurations"
511517
},
518+
{
519+
"$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
520+
},
512521
{
513522
"$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/subscription_resourceDefinitions/configurations"
514523
},
524+
{
525+
"$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
526+
},
527+
{
528+
"$ref": "https://schema.management.azure.com/schemas/2022-09-01/Microsoft.Advisor.json#/subscription_resourceDefinitions/configurations"
529+
},
530+
{
531+
"$ref": "https://schema.management.azure.com/schemas/2022-09-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
532+
},
533+
{
534+
"$ref": "https://schema.management.azure.com/schemas/2022-10-01/Microsoft.Advisor.json#/subscription_resourceDefinitions/configurations"
535+
},
536+
{
537+
"$ref": "https://schema.management.azure.com/schemas/2022-10-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
538+
},
515539
{
516540
"$ref": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleAssignments"
517541
},

‎schemas/2019-04-01/deploymentTemplate.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -642,12 +642,6 @@
642642
{ "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.ManagedServices.json#/resourceDefinitions/registrationAssignments" },
643643
{ "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.ManagedServices.json#/resourceDefinitions/registrationDefinitions" },
644644
{ "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.BareMetal.json#/resourceDefinitions/crayServers" },
645-
{ "$ref": "https://schema.management.azure.com/schemas/2016-07-12-preview/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions" },
646-
{ "$ref": "https://schema.management.azure.com/schemas/2017-03-31/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions" },
647-
{ "$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions" },
648-
{ "$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/resourceDefinitions/configurations" },
649-
{ "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/resourceDefinitions/recommendations_suppressions" },
650-
{ "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/resourceDefinitions/configurations" },
651645
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/components" },
652646
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/webtests" },
653647
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/autoscalesettings" },

‎schemas/2019-08-01/managementGroupDeploymentTemplate.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,24 @@
500500
},
501501
{
502502
"oneOf": [
503+
{
504+
"$ref": "https://schema.management.azure.com/schemas/2016-07-12-preview/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
505+
},
506+
{
507+
"$ref": "https://schema.management.azure.com/schemas/2017-03-31/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
508+
},
509+
{
510+
"$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
511+
},
512+
{
513+
"$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
514+
},
515+
{
516+
"$ref": "https://schema.management.azure.com/schemas/2022-09-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
517+
},
518+
{
519+
"$ref": "https://schema.management.azure.com/schemas/2022-10-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
520+
},
503521
{
504522
"$ref": "https://schema.management.azure.com/schemas/2023-04-01-preview/Microsoft.AlertsManagement.json#/managementGroup_resourceDefinitions/tenantActivityLogAlerts"
505523
},

‎schemas/2019-08-01/tenantDeploymentTemplate.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,24 @@
508508
{
509509
"$ref": "https://schema.management.azure.com/schemas/2017-04-01-preview/Microsoft.Aadiam.json#/tenant_resourceDefinitions/diagnosticSettings"
510510
},
511+
{
512+
"$ref": "https://schema.management.azure.com/schemas/2016-07-12-preview/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
513+
},
514+
{
515+
"$ref": "https://schema.management.azure.com/schemas/2017-03-31/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
516+
},
517+
{
518+
"$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
519+
},
520+
{
521+
"$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
522+
},
523+
{
524+
"$ref": "https://schema.management.azure.com/schemas/2022-09-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
525+
},
526+
{
527+
"$ref": "https://schema.management.azure.com/schemas/2022-10-01/Microsoft.Advisor.json#/unknown_resourceDefinitions/recommendations_suppressions"
528+
},
511529
{
512530
"$ref": "https://schema.management.azure.com/schemas/2022-11-16-preview/Microsoft.AppComplianceAutomation.json#/tenant_resourceDefinitions/reports"
513531
},

0 commit comments

Comments
 (0)