Skip to content

Commit 85ebda1

Browse files
jorgecotillojorgecotillo
authored
Merge pull request #1155 from Azure/autogenerate
Merge Autogenerate
2 parents 59f5f1a + 7d173f8 commit 85ebda1

File tree

20 files changed

+6672
-458
lines changed

20 files changed

+6672
-458
lines changed

‎generator/resources.json‎

Lines changed: 50 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
"Microsoft.AVS/privateClouds/hcxEnterpriseSites": [
1919
"2020-03-20"
2020
],
21+
"Microsoft.Aad/domainServices/ouContainer": [
22+
"2017-06-01",
23+
"2020-01-01"
24+
],
2125
"Microsoft.Addons/supportProviders/supportPlanTypes": [
2226
"2017-05-15",
2327
"2018-03-01"
@@ -685,10 +689,16 @@
685689
"2019-10-01-preview",
686690
"2020-05-01"
687691
],
692+
"Microsoft.Billing/billingAccounts/billingRoleAssignments": [
693+
"2019-10-01-preview"
694+
],
688695
"Microsoft.Billing/billingAccounts/customers/policies": [
689696
"2019-10-01-preview",
690697
"2020-05-01"
691698
],
699+
"Microsoft.Billing/billingAccounts/departments/billingRoleAssignments": [
700+
"2019-10-01-preview"
701+
],
692702
"Microsoft.Billing/billingAccounts/enrollmentAccounts/billingRoleAssignments": [
693703
"2019-10-01-preview"
694704
],
@@ -1945,10 +1955,12 @@
19451955
"2019-09-16"
19461956
],
19471957
"Microsoft.HybridCompute/machines": [
1948-
"2019-12-12"
1958+
"2019-12-12",
1959+
"2020-07-30-preview"
19491960
],
19501961
"Microsoft.HybridCompute/machines/extensions": [
1951-
"2019-12-12"
1962+
"2019-12-12",
1963+
"2020-07-30-preview"
19521964
],
19531965
"Microsoft.HybridData/dataManagers": [
19541966
"2016-06-01",
@@ -2180,7 +2192,8 @@
21802192
"2020-04-01",
21812193
"2020-05-01-preview",
21822194
"2020-05-15-preview",
2183-
"2020-06-01"
2195+
"2020-06-01",
2196+
"2020-09-01-preview"
21842197
],
21852198
"Microsoft.MachineLearningServices/workspaces/computes": [
21862199
"2018-03-01-preview",
@@ -2194,11 +2207,15 @@
21942207
"2020-04-01",
21952208
"2020-05-01-preview",
21962209
"2020-05-15-preview",
2197-
"2020-06-01"
2210+
"2020-06-01",
2211+
"2020-09-01-preview"
21982212
],
21992213
"Microsoft.MachineLearningServices/workspaces/connections": [
22002214
"2020-06-01"
22012215
],
2216+
"Microsoft.MachineLearningServices/workspaces/linkedServices": [
2217+
"2020-09-01-preview"
2218+
],
22022219
"Microsoft.MachineLearningServices/workspaces/linkedWorkspaces": [
22032220
"2020-05-01-preview",
22042221
"2020-05-15-preview"
@@ -2210,11 +2227,13 @@
22102227
"2020-04-01",
22112228
"2020-05-01-preview",
22122229
"2020-05-15-preview",
2213-
"2020-06-01"
2230+
"2020-06-01",
2231+
"2020-09-01-preview"
22142232
],
22152233
"Microsoft.MachineLearningServices/workspaces/services": [
22162234
"2020-05-01-preview",
2217-
"2020-05-15-preview"
2235+
"2020-05-15-preview",
2236+
"2020-09-01-preview"
22182237
],
22192238
"Microsoft.Maintenance/maintenanceConfigurations": [
22202239
"2018-06-01-preview",
@@ -2361,7 +2380,11 @@
23612380
"2019-08-01",
23622381
"2019-10-01",
23632382
"2019-11-01",
2364-
"2020-02-01"
2383+
"2020-02-01",
2384+
"2020-06-01"
2385+
],
2386+
"Microsoft.NetApp/netAppAccounts/backupPolicies": [
2387+
"2020-06-01"
23652388
],
23662389
"Microsoft.NetApp/netAppAccounts/capacityPools": [
23672390
"2017-08-15",
@@ -2371,7 +2394,8 @@
23712394
"2019-08-01",
23722395
"2019-10-01",
23732396
"2019-11-01",
2374-
"2020-02-01"
2397+
"2020-02-01",
2398+
"2020-06-01"
23752399
],
23762400
"Microsoft.NetApp/netAppAccounts/capacityPools/volumes": [
23772401
"2017-08-15",
@@ -2381,7 +2405,11 @@
23812405
"2019-08-01",
23822406
"2019-10-01",
23832407
"2019-11-01",
2384-
"2020-02-01"
2408+
"2020-02-01",
2409+
"2020-06-01"
2410+
],
2411+
"Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups": [
2412+
"2020-06-01"
23852413
],
23862414
"Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots": [
23872415
"2017-08-15",
@@ -2391,7 +2419,11 @@
23912419
"2019-08-01",
23922420
"2019-10-01",
23932421
"2019-11-01",
2394-
"2020-02-01"
2422+
"2020-02-01",
2423+
"2020-06-01"
2424+
],
2425+
"Microsoft.NetApp/netAppAccounts/snapshotPolicies": [
2426+
"2020-06-01"
23952427
],
23962428
"Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies": [
23972429
"2018-12-01",
@@ -3967,15 +3999,19 @@
39673999
"2015-02-28",
39684000
"2015-08-19",
39694001
"2019-10-01-preview",
3970-
"2020-03-13"
4002+
"2020-03-13",
4003+
"2020-08-01",
4004+
"2020-08-01-preview"
39714005
],
39724006
"Microsoft.Search/searchServices/privateEndpointConnections": [
39734007
"2019-10-01-preview",
3974-
"2020-03-13"
4008+
"2020-03-13",
4009+
"2020-08-01",
4010+
"2020-08-01-preview"
39754011
],
39764012
"Microsoft.Search/searchServices/sharedPrivateLinkResources": [
3977-
"2019-10-01-preview",
3978-
"2020-03-13"
4013+
"2020-08-01",
4014+
"2020-08-01-preview"
39794015
],
39804016
"Microsoft.Security/advancedThreatProtectionSettings": [
39814017
"2017-08-01-preview",

‎schemas/2017-06-01/Microsoft.AAD.json‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@
3636
],
3737
"description": "Properties of the Domain Service."
3838
},
39+
"resources": {
40+
"type": "array",
41+
"items": {
42+
"oneOf": [
43+
{
44+
"$ref": "#/definitions/domainServices_ouContainer_childResource"
45+
}
46+
]
47+
}
48+
},
3949
"tags": {
4050
"oneOf": [
4151
{
@@ -65,6 +75,45 @@
6575
"type"
6676
],
6777
"description": "Microsoft.AAD/domainServices"
78+
},
79+
"domainServices_ouContainer": {
80+
"type": "object",
81+
"properties": {
82+
"accountName": {
83+
"type": "string",
84+
"description": "The account name"
85+
},
86+
"apiVersion": {
87+
"type": "string",
88+
"enum": [
89+
"2017-06-01"
90+
]
91+
},
92+
"name": {
93+
"type": "string",
94+
"description": "The name of the OuContainer."
95+
},
96+
"password": {
97+
"type": "string",
98+
"description": "The account password"
99+
},
100+
"spn": {
101+
"type": "string",
102+
"description": "The account spn"
103+
},
104+
"type": {
105+
"type": "string",
106+
"enum": [
107+
"Microsoft.Aad/domainServices/ouContainer"
108+
]
109+
}
110+
},
111+
"required": [
112+
"apiVersion",
113+
"name",
114+
"type"
115+
],
116+
"description": "Microsoft.Aad/domainServices/ouContainer"
68117
}
69118
},
70119
"definitions": {
@@ -181,6 +230,45 @@
181230
},
182231
"description": "Properties of the Domain Service."
183232
},
233+
"domainServices_ouContainer_childResource": {
234+
"type": "object",
235+
"properties": {
236+
"accountName": {
237+
"type": "string",
238+
"description": "The account name"
239+
},
240+
"apiVersion": {
241+
"type": "string",
242+
"enum": [
243+
"2017-06-01"
244+
]
245+
},
246+
"name": {
247+
"type": "string",
248+
"description": "The name of the OuContainer."
249+
},
250+
"password": {
251+
"type": "string",
252+
"description": "The account password"
253+
},
254+
"spn": {
255+
"type": "string",
256+
"description": "The account spn"
257+
},
258+
"type": {
259+
"type": "string",
260+
"enum": [
261+
"ouContainer"
262+
]
263+
}
264+
},
265+
"required": [
266+
"apiVersion",
267+
"name",
268+
"type"
269+
],
270+
"description": "Microsoft.Aad/domainServices/ouContainer"
271+
},
184272
"LdapsSettings": {
185273
"type": "object",
186274
"properties": {

‎schemas/2018-03-01/Microsoft.Cache.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@
587587
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
588588
}
589589
],
590-
"description": "The size of the Redis cache to deploy. Valid values: for C (Basic/Standard) family (0, 1, 2, 3, 4, 5, 6), for P (Premium) family (1, 2, 3, 4)."
590+
"description": "The size of the Redis cache to deploy. Valid values: for C (Basic/Standard) family (0, 1, 2, 3, 4, 5, 6), for P (Premium) family (1, 2, 3, 4, 5)."
591591
},
592592
"family": {
593593
"oneOf": [

‎schemas/2018-06-01/Microsoft.DataFactory.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12429,6 +12429,11 @@
1242912429
],
1243012430
"description": "Unmatched properties from the message are deserialized this collection"
1243112431
},
12432+
"enableReliableLogging": {
12433+
"type": "object",
12434+
"properties": {},
12435+
"description": "Specifies whether to enable reliable logging. Type: boolean (or Expression with resultType boolean)."
12436+
},
1243212437
"linkedServiceName": {
1243312438
"oneOf": [
1243412439
{
@@ -12440,6 +12445,11 @@
1244012445
],
1244112446
"description": "Linked service reference type."
1244212447
},
12448+
"logLevel": {
12449+
"type": "object",
12450+
"properties": {},
12451+
"description": "Gets or sets the log level, support: Info, Warning. Type: string (or Expression with resultType string)."
12452+
},
1244312453
"path": {
1244412454
"type": "object",
1244512455
"properties": {},

‎schemas/2019-01-01-preview/Microsoft.SecurityInsights.json‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,6 +1304,26 @@
13041304
"properties": {},
13051305
"description": "EntityAnalytics property bag."
13061306
},
1307+
"EventGroupingSettings": {
1308+
"type": "object",
1309+
"properties": {
1310+
"aggregationKind": {
1311+
"oneOf": [
1312+
{
1313+
"type": "string",
1314+
"enum": [
1315+
"SingleAlert",
1316+
"AlertPerResult"
1317+
]
1318+
},
1319+
{
1320+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1321+
}
1322+
]
1323+
}
1324+
},
1325+
"description": "Event grouping settings property bag."
1326+
},
13071327
"EyesOn": {
13081328
"type": "object",
13091329
"properties": {
@@ -2116,6 +2136,17 @@
21162136
}
21172137
],
21182138
"description": "SharePoint data type connection."
2139+
},
2140+
"teams": {
2141+
"oneOf": [
2142+
{
2143+
"$ref": "#/definitions/OfficeDataConnectorDataTypesTeams"
2144+
},
2145+
{
2146+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2147+
}
2148+
],
2149+
"description": "Teams data type connection."
21192150
}
21202151
},
21212152
"description": "The available data types for office data connector."
@@ -2162,6 +2193,27 @@
21622193
},
21632194
"description": "SharePoint data type connection."
21642195
},
2196+
"OfficeDataConnectorDataTypesTeams": {
2197+
"type": "object",
2198+
"properties": {
2199+
"state": {
2200+
"oneOf": [
2201+
{
2202+
"type": "string",
2203+
"enum": [
2204+
"Enabled",
2205+
"Disabled"
2206+
]
2207+
},
2208+
{
2209+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2210+
}
2211+
],
2212+
"description": "Describe whether this data type connection is enabled or not."
2213+
}
2214+
},
2215+
"description": "Teams data type connection."
2216+
},
21652217
"OfficeDataConnectorProperties": {
21662218
"type": "object",
21672219
"properties": {
@@ -2309,6 +2361,17 @@
23092361
],
23102362
"description": "Determines whether this alert rule is enabled or disabled."
23112363
},
2364+
"eventGroupingSettings": {
2365+
"oneOf": [
2366+
{
2367+
"$ref": "#/definitions/EventGroupingSettings"
2368+
},
2369+
{
2370+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2371+
}
2372+
],
2373+
"description": "Event grouping settings property bag."
2374+
},
23122375
"incidentConfiguration": {
23132376
"oneOf": [
23142377
{

0 commit comments

Comments
 (0)