Skip to content

Commit bb8067d

Browse files
jorgecotillojorgecotillo
committed
Merge branch 'autogenerate' of https://github.com/Azure/azure-resource-manager-schemas into autogenerate
2 parents 8781faa + 8b2656e commit bb8067d

File tree

7 files changed

+312
-153
lines changed

7 files changed

+312
-153
lines changed

‎generator/resources.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3927,7 +3927,8 @@
39273927
"Microsoft.OperationalInsights/workspaces": [
39283928
"2015-11-01-preview",
39293929
"2020-03-01-preview",
3930-
"2020-08-01"
3930+
"2020-08-01",
3931+
"2020-10-01"
39313932
],
39323933
"Microsoft.OperationalInsights/workspaces/dataExports": [
39333934
"2019-08-01-preview",

‎schemas/2017-04-01-preview/Microsoft.StreamAnalytics.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,6 +2541,21 @@
25412541
],
25422542
"description": "Controls certain runtime behaviors of the streaming job."
25432543
},
2544+
"contentStoragePolicy": {
2545+
"oneOf": [
2546+
{
2547+
"type": "string",
2548+
"enum": [
2549+
"SystemAccount",
2550+
"JobStorageAccount"
2551+
]
2552+
},
2553+
{
2554+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2555+
}
2556+
],
2557+
"description": "Valid values are JobStorageAccount and SystemAccount. If set to JobStorageAccount, this requires the user to also specify jobStorageAccount property."
2558+
},
25442559
"dataLocale": {
25452560
"type": "string",
25462561
"description": "The data locale of the stream analytics job. Value should be the name of a supported .NET Culture from the set https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx. Defaults to 'en-US' if none specified."

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

Lines changed: 30 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -4955,20 +4955,9 @@
49554955
"type": "object",
49564956
"properties": {
49574957
"partitionOption": {
4958-
"oneOf": [
4959-
{
4960-
"type": "string",
4961-
"enum": [
4962-
"None",
4963-
"PhysicalPartitionsOfTable",
4964-
"DynamicRange"
4965-
]
4966-
},
4967-
{
4968-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
4969-
}
4970-
],
4971-
"description": "The partition mechanism that will be used for Sql read in parallel."
4958+
"type": "object",
4959+
"properties": {},
4960+
"description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
49724961
},
49734962
"partitionSettings": {
49744963
"oneOf": [
@@ -18417,20 +18406,9 @@
1841718406
"type": "object",
1841818407
"properties": {
1841918408
"partitionOption": {
18420-
"oneOf": [
18421-
{
18422-
"type": "string",
18423-
"enum": [
18424-
"None",
18425-
"DataSlice",
18426-
"DynamicRange"
18427-
]
18428-
},
18429-
{
18430-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
18431-
}
18432-
],
18433-
"description": "The partition mechanism that will be used for Netezza read in parallel."
18409+
"type": "object",
18410+
"properties": {},
18411+
"description": "The partition mechanism that will be used for Netezza read in parallel. Possible values include: \"None\", \"DataSlice\", \"DynamicRange\"."
1843418412
},
1843518413
"partitionSettings": {
1843618414
"oneOf": [
@@ -19298,20 +19276,9 @@
1929819276
"description": "Oracle reader query. Type: string (or Expression with resultType string)."
1929919277
},
1930019278
"partitionOption": {
19301-
"oneOf": [
19302-
{
19303-
"type": "string",
19304-
"enum": [
19305-
"None",
19306-
"PhysicalPartitionsOfTable",
19307-
"DynamicRange"
19308-
]
19309-
},
19310-
{
19311-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
19312-
}
19313-
],
19314-
"description": "The partition mechanism that will be used for Oracle read in parallel."
19279+
"type": "object",
19280+
"properties": {},
19281+
"description": "The partition mechanism that will be used for Oracle read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
1931519282
},
1931619283
"partitionSettings": {
1931719284
"oneOf": [
@@ -22572,20 +22539,9 @@
2257222539
"description": "The packet size of data read from SAP HANA. Type: integer(or Expression with resultType integer)."
2257322540
},
2257422541
"partitionOption": {
22575-
"oneOf": [
22576-
{
22577-
"type": "string",
22578-
"enum": [
22579-
"None",
22580-
"PhysicalPartitionsOfTable",
22581-
"SapHanaDynamicRange"
22582-
]
22583-
},
22584-
{
22585-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
22586-
}
22587-
],
22588-
"description": "The partition mechanism that will be used for SAP HANA read in parallel."
22542+
"type": "object",
22543+
"properties": {},
22544+
"description": "The partition mechanism that will be used for SAP HANA read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"SapHanaDynamicRange\". "
2258922545
},
2259022546
"partitionSettings": {
2259122547
"oneOf": [
@@ -23037,23 +22993,9 @@
2303722993
"description": "Specifies the custom RFC function module that will be used to read data from SAP Table. Type: string (or Expression with resultType string)."
2303822994
},
2303922995
"partitionOption": {
23040-
"oneOf": [
23041-
{
23042-
"type": "string",
23043-
"enum": [
23044-
"None",
23045-
"PartitionOnInt",
23046-
"PartitionOnCalendarYear",
23047-
"PartitionOnCalendarMonth",
23048-
"PartitionOnCalendarDate",
23049-
"PartitionOnTime"
23050-
]
23051-
},
23052-
{
23053-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
23054-
}
23055-
],
23056-
"description": "The partition mechanism that will be used for SAP table read in parallel."
22996+
"type": "object",
22997+
"properties": {},
22998+
"description": "The partition mechanism that will be used for SAP table read in parallel. Possible values include: \"None\", \"PartitionOnInt\", \"PartitionOnCalendarYear\", \"PartitionOnCalendarMonth\", \"PartitionOnCalendarDate\", \"PartitionOnTime\"."
2305722999
},
2305823000
"partitionSettings": {
2305923001
"oneOf": [
@@ -24610,20 +24552,9 @@
2461024552
"type": "object",
2461124553
"properties": {
2461224554
"partitionOption": {
24613-
"oneOf": [
24614-
{
24615-
"type": "string",
24616-
"enum": [
24617-
"None",
24618-
"PhysicalPartitionsOfTable",
24619-
"DynamicRange"
24620-
]
24621-
},
24622-
{
24623-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
24624-
}
24625-
],
24626-
"description": "The partition mechanism that will be used for Sql read in parallel."
24555+
"type": "object",
24556+
"properties": {},
24557+
"description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
2462724558
},
2462824559
"partitionSettings": {
2462924560
"oneOf": [
@@ -24722,20 +24653,9 @@
2472224653
"type": "object",
2472324654
"properties": {
2472424655
"partitionOption": {
24725-
"oneOf": [
24726-
{
24727-
"type": "string",
24728-
"enum": [
24729-
"None",
24730-
"PhysicalPartitionsOfTable",
24731-
"DynamicRange"
24732-
]
24733-
},
24734-
{
24735-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
24736-
}
24737-
],
24738-
"description": "The partition mechanism that will be used for Sql read in parallel."
24656+
"type": "object",
24657+
"properties": {},
24658+
"description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
2473924659
},
2474024660
"partitionSettings": {
2474124661
"oneOf": [
@@ -24932,20 +24852,9 @@
2493224852
"type": "object",
2493324853
"properties": {
2493424854
"partitionOption": {
24935-
"oneOf": [
24936-
{
24937-
"type": "string",
24938-
"enum": [
24939-
"None",
24940-
"PhysicalPartitionsOfTable",
24941-
"DynamicRange"
24942-
]
24943-
},
24944-
{
24945-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
24946-
}
24947-
],
24948-
"description": "The partition mechanism that will be used for Sql read in parallel."
24855+
"type": "object",
24856+
"properties": {},
24857+
"description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
2494924858
},
2495024859
"partitionSettings": {
2495124860
"oneOf": [
@@ -25167,20 +25076,9 @@
2516725076
"description": "Specifies the transaction locking behavior for the SQL source. Allowed values: ReadCommitted/ReadUncommitted/RepeatableRead/Serializable/Snapshot. The default value is ReadCommitted. Type: string (or Expression with resultType string)."
2516825077
},
2516925078
"partitionOption": {
25170-
"oneOf": [
25171-
{
25172-
"type": "string",
25173-
"enum": [
25174-
"None",
25175-
"PhysicalPartitionsOfTable",
25176-
"DynamicRange"
25177-
]
25178-
},
25179-
{
25180-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
25181-
}
25182-
],
25183-
"description": "The partition mechanism that will be used for Sql read in parallel."
25079+
"type": "object",
25080+
"properties": {},
25081+
"description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
2518425082
},
2518525083
"partitionSettings": {
2518625084
"oneOf": [
@@ -26450,20 +26348,9 @@
2645026348
"type": "object",
2645126349
"properties": {
2645226350
"partitionOption": {
26453-
"oneOf": [
26454-
{
26455-
"type": "string",
26456-
"enum": [
26457-
"None",
26458-
"Hash",
26459-
"DynamicRange"
26460-
]
26461-
},
26462-
{
26463-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
26464-
}
26465-
],
26466-
"description": "The partition mechanism that will be used for teradata read in parallel."
26351+
"type": "object",
26352+
"properties": {},
26353+
"description": "The partition mechanism that will be used for teradata read in parallel. Possible values include: \"None\", \"Hash\", \"DynamicRange\"."
2646726354
},
2646826355
"partitionSettings": {
2646926356
"oneOf": [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@
610610
},
611611
"name": {
612612
"type": "string",
613-
"description": "Threat Intelligence Identifier"
613+
"description": "Threat intelligence indicator name field."
614614
},
615615
"properties": {
616616
"oneOf": [

‎schemas/2019-06-01-preview/Microsoft.Synapse.json‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1466,6 +1466,17 @@
14661466
"type": "string",
14671467
"description": "The default folder where Spark logs will be written."
14681468
},
1469+
"haveLibraryRequirementsChanged": {
1470+
"oneOf": [
1471+
{
1472+
"type": "boolean"
1473+
},
1474+
{
1475+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1476+
}
1477+
],
1478+
"description": "Whether library requirements changed."
1479+
},
14691480
"isComputeIsolationEnabled": {
14701481
"oneOf": [
14711482
{
@@ -1538,6 +1549,17 @@
15381549
"type": "string",
15391550
"description": "The state of the Big Data pool."
15401551
},
1552+
"sessionLevelPackagesEnabled": {
1553+
"oneOf": [
1554+
{
1555+
"type": "boolean"
1556+
},
1557+
{
1558+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1559+
}
1560+
],
1561+
"description": "Whether session level packages enabled."
1562+
},
15411563
"sparkConfigProperties": {
15421564
"oneOf": [
15431565
{
@@ -3457,7 +3479,6 @@
34573479
},
34583480
"restorePointInTime": {
34593481
"type": "string",
3460-
"format": "date-time",
34613482
"description": "Snapshot time to restore"
34623483
},
34633484
"sourceDatabaseId": {

0 commit comments

Comments
 (0)