Skip to content

Commit 67813e6

Browse files
authored
Merge pull request #1710 from Azure/autogenerate
Merge Autogenerate
2 parents 32bfebb + 47d8b59 commit 67813e6

File tree

18 files changed

+17777
-276
lines changed

18 files changed

+17777
-276
lines changed

generator/resources.json

Lines changed: 262 additions & 107 deletions
Large diffs are not rendered by default.

schemas/2018-04-16/Microsoft.Insights.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
323323
}
324324
],
325-
"description": "The flag that indicates whether the alert should be automatically resolved or not. The default is true."
325+
"description": "The flag that indicates whether the alert should be automatically resolved or not. The default is false."
326326
},
327327
"description": {
328328
"type": "string",

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

Lines changed: 20 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -6237,34 +6237,13 @@
62376237
"type": "object",
62386238
"properties": {
62396239
"authenticationType": {
6240-
"oneOf": [
6241-
{
6242-
"type": "string",
6243-
"enum": [
6244-
"Office365",
6245-
"Ifd",
6246-
"AADServicePrincipal"
6247-
]
6248-
},
6249-
{
6250-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
6251-
}
6252-
],
6240+
"type": "object",
6241+
"properties": {},
62536242
"description": "The authentication type to connect to Common Data Service for Apps server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)."
62546243
},
62556244
"deploymentType": {
6256-
"oneOf": [
6257-
{
6258-
"type": "string",
6259-
"enum": [
6260-
"Online",
6261-
"OnPremisesWithIfd"
6262-
]
6263-
},
6264-
{
6265-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
6266-
}
6267-
],
6245+
"type": "object",
6246+
"properties": {},
62686247
"description": "The deployment type of the Common Data Service for Apps instance. 'Online' for Common Data Service for Apps Online and 'OnPremisesWithIfd' for Common Data Service for Apps on-premises with Ifd. Type: string (or Expression with resultType string)."
62696248
},
62706249
"encryptedCredential": {
@@ -9453,26 +9432,9 @@
94539432
"description": "The column delimiter. Type: string (or Expression with resultType string)."
94549433
},
94559434
"compressionCodec": {
9456-
"oneOf": [
9457-
{
9458-
"type": "string",
9459-
"enum": [
9460-
"none",
9461-
"gzip",
9462-
"snappy",
9463-
"lzo",
9464-
"bzip2",
9465-
"deflate",
9466-
"zipDeflate",
9467-
"lz4",
9468-
"tar",
9469-
"tarGZip"
9470-
]
9471-
},
9472-
{
9473-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
9474-
}
9475-
]
9435+
"type": "object",
9436+
"properties": {},
9437+
"description": "The data compressionCodec. Type: string (or Expression with resultType string)."
94769438
},
94779439
"compressionLevel": {
94789440
"type": "object",
@@ -10236,34 +10198,13 @@
1023610198
"type": "object",
1023710199
"properties": {
1023810200
"authenticationType": {
10239-
"oneOf": [
10240-
{
10241-
"type": "string",
10242-
"enum": [
10243-
"Office365",
10244-
"Ifd",
10245-
"AADServicePrincipal"
10246-
]
10247-
},
10248-
{
10249-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
10250-
}
10251-
],
10201+
"type": "object",
10202+
"properties": {},
1025210203
"description": "The authentication type to connect to Dynamics CRM server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)."
1025310204
},
1025410205
"deploymentType": {
10255-
"oneOf": [
10256-
{
10257-
"type": "string",
10258-
"enum": [
10259-
"Online",
10260-
"OnPremisesWithIfd"
10261-
]
10262-
},
10263-
{
10264-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
10265-
}
10266-
],
10206+
"type": "object",
10207+
"properties": {},
1026710208
"description": "The deployment type of the Dynamics CRM instance. 'Online' for Dynamics CRM Online and 'OnPremisesWithIfd' for Dynamics CRM on-premises with Ifd. Type: string (or Expression with resultType string)."
1026810209
},
1026910210
"encryptedCredential": {
@@ -10477,34 +10418,13 @@
1047710418
"type": "object",
1047810419
"properties": {
1047910420
"authenticationType": {
10480-
"oneOf": [
10481-
{
10482-
"type": "string",
10483-
"enum": [
10484-
"Office365",
10485-
"Ifd",
10486-
"AADServicePrincipal"
10487-
]
10488-
},
10489-
{
10490-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
10491-
}
10492-
],
10421+
"type": "object",
10422+
"properties": {},
1049310423
"description": "The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)."
1049410424
},
1049510425
"deploymentType": {
10496-
"oneOf": [
10497-
{
10498-
"type": "string",
10499-
"enum": [
10500-
"Online",
10501-
"OnPremisesWithIfd"
10502-
]
10503-
},
10504-
{
10505-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
10506-
}
10507-
],
10426+
"type": "object",
10427+
"properties": {},
1050810428
"description": "The deployment type of the Dynamics instance. 'Online' for Dynamics Online and 'OnPremisesWithIfd' for Dynamics on-premises with Ifd. Type: string (or Expression with resultType string)."
1050910429
},
1051010430
"encryptedCredential": {
@@ -16786,18 +16706,8 @@
1678616706
"description": "Unmatched properties from the message are deserialized this collection"
1678716707
},
1678816708
"filePattern": {
16789-
"oneOf": [
16790-
{
16791-
"type": "string",
16792-
"enum": [
16793-
"setOfObjects",
16794-
"arrayOfObjects"
16795-
]
16796-
},
16797-
{
16798-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
16799-
}
16800-
],
16709+
"type": "object",
16710+
"properties": {},
1680116711
"description": "File pattern of JSON. This setting controls the way a collection of JSON objects will be treated. The default value is 'setOfObjects'. It is case-sensitive."
1680216712
}
1680316713
},
@@ -20402,26 +20312,9 @@
2040220312
"type": "object",
2040320313
"properties": {
2040420314
"compressionCodec": {
20405-
"oneOf": [
20406-
{
20407-
"type": "string",
20408-
"enum": [
20409-
"none",
20410-
"gzip",
20411-
"snappy",
20412-
"lzo",
20413-
"bzip2",
20414-
"deflate",
20415-
"zipDeflate",
20416-
"lz4",
20417-
"tar",
20418-
"tarGZip"
20419-
]
20420-
},
20421-
{
20422-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
20423-
}
20424-
]
20315+
"type": "object",
20316+
"properties": {},
20317+
"description": "The data compressionCodec. Type: string (or Expression with resultType string)."
2042520318
},
2042620319
"location": {
2042720320
"oneOf": [

schemas/2018-09-15/Microsoft.DevTestLab.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3319,6 +3319,7 @@
33193319
},
33203320
"storageType": {
33213321
"type": "string",
3322+
"default": "labStorageType",
33223323
"description": "Storage type to use for virtual machine (i.e. Standard, Premium)."
33233324
},
33243325
"userName": {
@@ -3487,6 +3488,7 @@
34873488
},
34883489
"storageType": {
34893490
"type": "string",
3491+
"default": "labStorageType",
34903492
"description": "Storage type to use for virtual machine (i.e. Standard, Premium)."
34913493
},
34923494
"userName": {
@@ -3770,10 +3772,6 @@
37703772
"ScheduleCreationParameter": {
37713773
"type": "object",
37723774
"properties": {
3773-
"location": {
3774-
"type": "string",
3775-
"description": "The location of the new virtual machine or environment"
3776-
},
37773775
"name": {
37783776
"type": "string",
37793777
"description": "The name of the virtual machine or environment"

schemas/2019-05-01-preview/Microsoft.AppPlatform.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,8 @@
339339
"httpsOnly": {
340340
"oneOf": [
341341
{
342-
"type": "boolean"
342+
"type": "boolean",
343+
"default": false
343344
},
344345
{
345346
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"

schemas/2020-02-02-preview/Microsoft.Insights.Application.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,17 @@
103103
],
104104
"description": "Disable IP masking."
105105
},
106+
"DisableLocalAuth": {
107+
"oneOf": [
108+
{
109+
"type": "boolean"
110+
},
111+
{
112+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
113+
}
114+
],
115+
"description": "Disable Non-AAD based Auth."
116+
},
106117
"Flow_Type": {
107118
"oneOf": [
108119
{
@@ -117,6 +128,17 @@
117128
],
118129
"description": "Used by the Application Insights system to determine what kind of flow this component was created by. This is to be set to 'Bluefield' when creating/updating a component via the REST API."
119130
},
131+
"ForceCustomerStorageForProfiler": {
132+
"oneOf": [
133+
{
134+
"type": "boolean"
135+
},
136+
{
137+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
138+
}
139+
],
140+
"description": "Force users to create their own storage account for profiler and debugger."
141+
},
120142
"HockeyAppId": {
121143
"type": "string",
122144
"description": "The unique application ID created when a new application is added to HockeyApp, used for communications with HockeyApp."

schemas/2020-07-01/Microsoft.AppPlatform.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,8 @@
437437
"httpsOnly": {
438438
"oneOf": [
439439
{
440-
"type": "boolean"
440+
"type": "boolean",
441+
"default": false
441442
},
442443
{
443444
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"

schemas/2020-10-01/Microsoft.OperationalInsights.json

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,10 +381,10 @@
381381
},
382382
"description": "The daily volume cap for ingestion."
383383
},
384-
"WorkspaceProperties": {
384+
"WorkspaceFeatures": {
385385
"type": "object",
386386
"properties": {
387-
"features": {
387+
"additionalProperties": {
388388
"oneOf": [
389389
{
390390
"type": "object",
@@ -398,6 +398,60 @@
398398
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
399399
}
400400
],
401+
"description": "Unmatched properties from the message are deserialized this collection"
402+
},
403+
"clusterResourceId": {
404+
"type": "string",
405+
"description": "Dedicated LA cluster resourceId that is linked to the workspaces."
406+
},
407+
"enableDataExport": {
408+
"oneOf": [
409+
{
410+
"type": "boolean"
411+
},
412+
{
413+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
414+
}
415+
],
416+
"description": "Flag that indicate if data should be exported."
417+
},
418+
"enableLogAccessUsingOnlyResourcePermissions": {
419+
"oneOf": [
420+
{
421+
"type": "boolean"
422+
},
423+
{
424+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
425+
}
426+
],
427+
"description": "Flag that indicate which permission to use - resource or workspace or both."
428+
},
429+
"immediatePurgeDataOn30Days": {
430+
"oneOf": [
431+
{
432+
"type": "boolean"
433+
},
434+
{
435+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
436+
}
437+
],
438+
"description": "Flag that describes if we want to remove the data after 30 days."
439+
}
440+
},
441+
"description": "Workspace features."
442+
},
443+
"WorkspaceProperties": {
444+
"type": "object",
445+
"properties": {
446+
"features": {
447+
"oneOf": [
448+
{
449+
"$ref": "#/definitions/WorkspaceFeatures"
450+
},
451+
{
452+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
453+
}
454+
],
401455
"description": "Workspace features."
402456
},
403457
"forceCmkForQuery": {

schemas/2020-11-01-preview/Microsoft.AppPlatform.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,8 @@
438438
"enableEndToEndTLS": {
439439
"oneOf": [
440440
{
441-
"type": "boolean"
441+
"type": "boolean",
442+
"default": false
442443
},
443444
{
444445
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -453,7 +454,8 @@
453454
"httpsOnly": {
454455
"oneOf": [
455456
{
456-
"type": "boolean"
457+
"type": "boolean",
458+
"default": false
457459
},
458460
{
459461
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"

0 commit comments

Comments
 (0)