Skip to content

Commit 8f7ecc8

Browse files
anthony-c-martinanthony-c-martin
authored
Merge pull request #1972 from Azure/autogenerate
Autogenerate
2 parents 51a75b2 + 9172a6d commit 8f7ecc8

File tree

18 files changed

+4741
-224
lines changed

18 files changed

+4741
-224
lines changed

‎generator/resources.json‎

Lines changed: 522 additions & 183 deletions
Large diffs are not rendered by default.

‎onboarded-report/result.json‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,18 @@
219219
"basePath": "compute/resource-manager",
220220
"onboardedToAutogen": "no",
221221
"missing": [
222-
"Microsoft.Compute",
223222
"Microsoft.ContainerService"
224223
],
225224
"onboarded": []
226225
},
226+
{
227+
"basePath": "compute/resource-manager",
228+
"onboardedToAutogen": "yes",
229+
"missing": [],
230+
"onboarded": [
231+
"Microsoft.Compute"
232+
]
233+
},
227234
{
228235
"basePath": "confidentialledger/resource-manager",
229236
"onboardedToAutogen": "no",
@@ -238,6 +245,12 @@
238245
"missing": [],
239246
"onboarded": []
240247
},
248+
{
249+
"basePath": "connectedvmware/resource-manager",
250+
"onboardedToAutogen": "yes",
251+
"missing": [],
252+
"onboarded": []
253+
},
241254
{
242255
"basePath": "consumption/resource-manager",
243256
"onboardedToAutogen": "yes",
@@ -546,6 +559,12 @@
546559
"missing": [],
547560
"onboarded": []
548561
},
562+
{
563+
"basePath": "hybridconnectivity/resource-manager",
564+
"onboardedToAutogen": "yes",
565+
"missing": [],
566+
"onboarded": []
567+
},
549568
{
550569
"basePath": "hybriddatamanager/resource-manager",
551570
"onboardedToAutogen": "yes",
@@ -1058,10 +1077,8 @@
10581077
},
10591078
{
10601079
"basePath": "servicefabricmanagedclusters/resource-manager",
1061-
"onboardedToAutogen": "no",
1062-
"missing": [
1063-
"Microsoft.ServiceFabricManagedClusters"
1064-
],
1080+
"onboardedToAutogen": "yes",
1081+
"missing": [],
10651082
"onboarded": []
10661083
},
10671084
{
@@ -1070,6 +1087,12 @@
10701087
"missing": [],
10711088
"onboarded": []
10721089
},
1090+
{
1091+
"basePath": "servicelinker/resource-manager",
1092+
"onboardedToAutogen": "yes",
1093+
"missing": [],
1094+
"onboarded": []
1095+
},
10731096
{
10741097
"basePath": "signalr/resource-manager",
10751098
"onboardedToAutogen": "yes",
@@ -1216,10 +1239,8 @@
12161239
},
12171240
{
12181241
"basePath": "webpubsub/resource-manager",
1219-
"onboardedToAutogen": "no",
1220-
"missing": [
1221-
"Microsoft.SignalRService"
1222-
],
1242+
"onboardedToAutogen": "yes",
1243+
"missing": [],
12231244
"onboarded": []
12241245
},
12251246
{

‎schemas/2016-08-01/Microsoft.Web.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@
11111111
},
11121112
"name": {
11131113
"type": "string",
1114-
"description": "Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot."
1114+
"description": "Name of the deployment slot to create or update. The name 'production' is reserved."
11151115
},
11161116
"properties": {
11171117
"oneOf": [
@@ -5784,7 +5784,7 @@
57845784
},
57855785
"name": {
57865786
"type": "string",
5787-
"description": "Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot."
5787+
"description": "Name of the deployment slot to create or update. The name 'production' is reserved."
57885788
},
57895789
"properties": {
57905790
"oneOf": [

‎schemas/2018-02-01/Microsoft.Web.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1659,7 +1659,7 @@
16591659
},
16601660
"name": {
16611661
"type": "string",
1662-
"description": "Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot."
1662+
"description": "Name of the deployment slot to create or update. The name 'production' is reserved."
16631663
},
16641664
"properties": {
16651665
"oneOf": [
@@ -7435,7 +7435,7 @@
74357435
},
74367436
"name": {
74377437
"type": "string",
7438-
"description": "Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot."
7438+
"description": "Name of the deployment slot to create or update. The name 'production' is reserved."
74397439
},
74407440
"properties": {
74417441
"oneOf": [

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

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11633,6 +11633,20 @@
1163311633
],
1163411634
"description": "Integration runtime reference type."
1163511635
},
11636+
"queries": {
11637+
"oneOf": [
11638+
{
11639+
"type": "array",
11640+
"items": {
11641+
"$ref": "#/definitions/PowerQuerySinkMapping"
11642+
}
11643+
},
11644+
{
11645+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
11646+
}
11647+
],
11648+
"description": "List of mapping for Power Query mashup query to sink dataset(s)."
11649+
},
1163611650
"runConcurrently": {
1163711651
"type": "object",
1163811652
"properties": {},
@@ -11651,7 +11665,7 @@
1165111665
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1165211666
}
1165311667
],
11654-
"description": "List of Power Query activity sinks mapped to a queryName."
11668+
"description": "(Deprecated. Please use Queries). List of Power Query activity sinks mapped to a queryName."
1165511669
},
1165611670
"staging": {
1165711671
"oneOf": [
@@ -21786,6 +21800,30 @@
2178621800
],
2178721801
"description": "Power query sink."
2178821802
},
21803+
"PowerQuerySinkMapping": {
21804+
"type": "object",
21805+
"properties": {
21806+
"dataflowSinks": {
21807+
"oneOf": [
21808+
{
21809+
"type": "array",
21810+
"items": {
21811+
"$ref": "#/definitions/PowerQuerySink"
21812+
}
21813+
},
21814+
{
21815+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
21816+
}
21817+
],
21818+
"description": "List of sinks mapped to Power Query mashup query."
21819+
},
21820+
"queryName": {
21821+
"type": "string",
21822+
"description": "Name of the query in Power Query mashup document."
21823+
}
21824+
},
21825+
"description": "Map Power Query mashup query to sink dataset(s)."
21826+
},
2178921827
"PowerQuerySource": {
2179021828
"type": "object",
2179121829
"properties": {
@@ -21843,6 +21881,10 @@
2184321881
"PowerQueryTypeProperties": {
2184421882
"type": "object",
2184521883
"properties": {
21884+
"documentLocale": {
21885+
"type": "string",
21886+
"description": "Locale of the Power query mashup document."
21887+
},
2184621888
"script": {
2184721889
"type": "string",
2184821890
"description": "Power query mashup script."

‎schemas/2018-11-01/Microsoft.Web.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,7 @@
12671267
},
12681268
"name": {
12691269
"type": "string",
1270-
"description": "Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot."
1270+
"description": "Name of the deployment slot to create or update. The name 'production' is reserved."
12711271
},
12721272
"properties": {
12731273
"oneOf": [
@@ -6366,7 +6366,7 @@
63666366
},
63676367
"name": {
63686368
"type": "string",
6369-
"description": "Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot."
6369+
"description": "Name of the deployment slot to create or update. The name 'production' is reserved."
63706370
},
63716371
"properties": {
63726372
"oneOf": [

‎schemas/2019-08-01/Microsoft.Web.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,7 +1803,7 @@
18031803
},
18041804
"name": {
18051805
"type": "string",
1806-
"description": "Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot."
1806+
"description": "Name of the deployment slot to create or update. The name 'production' is reserved."
18071807
},
18081808
"properties": {
18091809
"oneOf": [
@@ -7983,7 +7983,7 @@
79837983
},
79847984
"name": {
79857985
"type": "string",
7986-
"description": "Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot."
7986+
"description": "Name of the deployment slot to create or update. The name 'production' is reserved."
79877987
},
79887988
"properties": {
79897989
"oneOf": [

‎schemas/2020-03-01-preview/Microsoft.DeviceUpdate.json‎

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
"identity": {
1717
"oneOf": [
1818
{
19-
"$ref": "#/definitions/Identity"
19+
"$ref": "#/definitions/ManagedServiceIdentity"
2020
},
2121
{
2222
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2323
}
2424
],
25-
"description": "Identity for the resource."
25+
"description": "Managed service identity (system assigned and/or user assigned identities)"
2626
},
2727
"location": {
2828
"type": "string",
@@ -336,30 +336,52 @@
336336
],
337337
"description": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections"
338338
},
339-
"Identity": {
339+
"DiagnosticStorageProperties": {
340340
"type": "object",
341341
"properties": {
342-
"type": {
342+
"authenticationType": {
343343
"oneOf": [
344344
{
345345
"type": "string",
346346
"enum": [
347-
"SystemAssigned",
348-
"None"
347+
"KeyBased"
349348
]
350349
},
351350
{
352351
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
353352
}
354353
],
355-
"description": "The identity type."
354+
"description": "Authentication Type"
355+
},
356+
"connectionString": {
357+
"type": "string",
358+
"description": "ConnectionString of the diagnostic storage account"
359+
},
360+
"resourceId": {
361+
"type": "string",
362+
"description": "ResourceId of the diagnostic storage account"
356363
}
357364
},
358-
"description": "Identity for the resource."
365+
"required": [
366+
"authenticationType",
367+
"resourceId"
368+
],
369+
"description": "Customer-initiated diagnostic log collection storage properties"
359370
},
360371
"InstanceProperties": {
361372
"type": "object",
362373
"properties": {
374+
"diagnosticStorageProperties": {
375+
"oneOf": [
376+
{
377+
"$ref": "#/definitions/DiagnosticStorageProperties"
378+
},
379+
{
380+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
381+
}
382+
],
383+
"description": "Customer-initiated diagnostic log collection storage properties"
384+
},
363385
"enableDiagnostics": {
364386
"oneOf": [
365387
{
@@ -411,6 +433,46 @@
411433
],
412434
"description": "Device Update account integration with IoT Hub settings."
413435
},
436+
"ManagedServiceIdentity": {
437+
"type": "object",
438+
"properties": {
439+
"type": {
440+
"oneOf": [
441+
{
442+
"type": "string",
443+
"enum": [
444+
"None",
445+
"SystemAssigned",
446+
"UserAssigned",
447+
"SystemAssigned,UserAssigned"
448+
]
449+
},
450+
{
451+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
452+
}
453+
]
454+
},
455+
"userAssignedIdentities": {
456+
"oneOf": [
457+
{
458+
"type": "object",
459+
"additionalProperties": {
460+
"$ref": "#/definitions/UserAssignedIdentity"
461+
},
462+
"properties": {}
463+
},
464+
{
465+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
466+
}
467+
],
468+
"description": "The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. The dictionary values can be empty objects ({}) in requests."
469+
}
470+
},
471+
"required": [
472+
"type"
473+
],
474+
"description": "Managed service identity (system assigned and/or user assigned identities)"
475+
},
414476
"PrivateEndpoint": {
415477
"type": "object",
416478
"properties": {},
@@ -493,6 +555,11 @@
493555
}
494556
},
495557
"description": "A collection of information about the state of the connection between service consumer and provider."
558+
},
559+
"UserAssignedIdentity": {
560+
"type": "object",
561+
"properties": {},
562+
"description": "User assigned identity properties"
496563
}
497564
}
498565
}

‎schemas/2020-06-01/Microsoft.Web.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,7 +1839,7 @@
18391839
},
18401840
"name": {
18411841
"type": "string",
1842-
"description": "Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot."
1842+
"description": "Name of the deployment slot to create or update. The name 'production' is reserved."
18431843
},
18441844
"properties": {
18451845
"oneOf": [
@@ -9696,7 +9696,7 @@
96969696
},
96979697
"name": {
96989698
"type": "string",
9699-
"description": "Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot."
9699+
"description": "Name of the deployment slot to create or update. The name 'production' is reserved."
97009700
},
97019701
"properties": {
97029702
"oneOf": [

‎schemas/2020-09-01/Microsoft.Web.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2224,7 +2224,7 @@
22242224
},
22252225
"name": {
22262226
"type": "string",
2227-
"description": "Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot."
2227+
"description": "Name of the deployment slot to create or update. The name 'production' is reserved."
22282228
},
22292229
"properties": {
22302230
"oneOf": [
@@ -11082,7 +11082,7 @@
1108211082
},
1108311083
"name": {
1108411084
"type": "string",
11085-
"description": "Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot."
11085+
"description": "Name of the deployment slot to create or update. The name 'production' is reserved."
1108611086
},
1108711087
"properties": {
1108811088
"oneOf": [

0 commit comments

Comments
 (0)