Skip to content

Commit 8b42aae

Browse files
anthony-c-martinanthony-c-martin
authored
Merge pull request #1294 from Azure/autogenerate
Merge Autogenerate
2 parents 4eb0fb0 + 6582fb1 commit 8b42aae

File tree

9 files changed

+3164
-37
lines changed

9 files changed

+3164
-37
lines changed

‎generator/resources.json‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,8 @@
12751275
"Microsoft.DataBox/jobs": [
12761276
"2018-01-01",
12771277
"2019-09-01",
1278-
"2020-04-01"
1278+
"2020-04-01",
1279+
"2020-11-01"
12791280
],
12801281
"Microsoft.DataBoxEdge/dataBoxEdgeDevices": [
12811282
"2019-03-01",
@@ -1474,22 +1475,34 @@
14741475
"Microsoft.DesktopVirtualization/applicationGroups": [
14751476
"2019-01-23-preview",
14761477
"2019-09-24-preview",
1477-
"2019-12-10-preview"
1478+
"2019-12-10-preview",
1479+
"2020-09-21-preview",
1480+
"2020-10-19-preview"
14781481
],
14791482
"Microsoft.DesktopVirtualization/applicationGroups/applications": [
14801483
"2019-01-23-preview",
14811484
"2019-09-24-preview",
1482-
"2019-12-10-preview"
1485+
"2019-12-10-preview",
1486+
"2020-09-21-preview",
1487+
"2020-10-19-preview"
14831488
],
14841489
"Microsoft.DesktopVirtualization/hostPools": [
14851490
"2019-01-23-preview",
14861491
"2019-09-24-preview",
1487-
"2019-12-10-preview"
1492+
"2019-12-10-preview",
1493+
"2020-09-21-preview",
1494+
"2020-10-19-preview"
1495+
],
1496+
"Microsoft.DesktopVirtualization/hostPools/msixPackages": [
1497+
"2020-09-21-preview",
1498+
"2020-10-19-preview"
14881499
],
14891500
"Microsoft.DesktopVirtualization/workspaces": [
14901501
"2019-01-23-preview",
14911502
"2019-09-24-preview",
1492-
"2019-12-10-preview"
1503+
"2019-12-10-preview",
1504+
"2020-09-21-preview",
1505+
"2020-10-19-preview"
14931506
],
14941507
"Microsoft.DevOps/pipelines": [
14951508
"2019-07-01-preview"
@@ -2088,7 +2101,11 @@
20882101
"Microsoft.HealthcareApis/services": [
20892102
"2018-08-20-preview",
20902103
"2019-09-16",
2091-
"2020-03-15"
2104+
"2020-03-15",
2105+
"2020-03-30"
2106+
],
2107+
"Microsoft.HealthcareApis/services/privateEndpointConnections": [
2108+
"2020-03-30"
20922109
],
20932110
"Microsoft.HybridCompute/machines": [
20942111
"2019-03-18-preview",

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,10 @@
462462
"2019-01-01-preview"
463463
]
464464
},
465+
"etag": {
466+
"type": "string",
467+
"description": "Etag of the azure resource"
468+
},
465469
"name": {
466470
"type": "string",
467471
"description": "Incident comment ID"
@@ -1805,6 +1809,10 @@
18051809
"2019-01-01-preview"
18061810
]
18071811
},
1812+
"etag": {
1813+
"type": "string",
1814+
"description": "Etag of the azure resource"
1815+
},
18081816
"name": {
18091817
"type": "string",
18101818
"description": "Incident comment ID"

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

Lines changed: 140 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,16 @@
10801080
},
10811081
"description": "Auto-scaling properties of a Big Data pool powered by Apache Spark"
10821082
},
1083+
"BabylonConfiguration": {
1084+
"type": "object",
1085+
"properties": {
1086+
"babylonResourceId": {
1087+
"type": "string",
1088+
"description": "Babylon Resource ID"
1089+
}
1090+
},
1091+
"description": "Babylon Configuration"
1092+
},
10831093
"BigDataPoolResourceProperties": {
10841094
"type": "object",
10851095
"properties": {
@@ -1110,6 +1120,20 @@
11101120
"format": "date-time",
11111121
"description": "The time when the Big Data pool was created."
11121122
},
1123+
"customLibraries": {
1124+
"oneOf": [
1125+
{
1126+
"type": "array",
1127+
"items": {
1128+
"$ref": "#/definitions/LibraryInfo"
1129+
}
1130+
},
1131+
{
1132+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1133+
}
1134+
],
1135+
"description": "List of custom libraries/packages associated with the spark pool."
1136+
},
11131137
"defaultSparkLogFolder": {
11141138
"type": "string",
11151139
"description": "The default folder where Spark logs will be written."
@@ -1186,6 +1210,17 @@
11861210
"type": "string",
11871211
"description": "The state of the Big Data pool."
11881212
},
1213+
"sessionLevelPackagesEnabled": {
1214+
"oneOf": [
1215+
{
1216+
"type": "boolean"
1217+
},
1218+
{
1219+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1220+
}
1221+
],
1222+
"description": "Whether session level library/package management is enabled or not."
1223+
},
11891224
"sparkConfigProperties": {
11901225
"oneOf": [
11911226
{
@@ -1294,6 +1329,23 @@
12941329
],
12951330
"description": "The custom setup of installing 3rd party components."
12961331
},
1332+
"CustomerManagedKeyDetails": {
1333+
"type": "object",
1334+
"properties": {
1335+
"key": {
1336+
"oneOf": [
1337+
{
1338+
"$ref": "#/definitions/WorkspaceKeyDetails"
1339+
},
1340+
{
1341+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1342+
}
1343+
],
1344+
"description": "Details of the customer managed key associated with the workspace"
1345+
}
1346+
},
1347+
"description": "Details of the customer managed key associated with the workspace"
1348+
},
12971349
"CustomSetupBase": {
12981350
"type": "object",
12991351
"oneOf": [
@@ -1434,6 +1486,23 @@
14341486
],
14351487
"description": "The properties of a Sql pool data masking rule."
14361488
},
1489+
"EncryptionDetails": {
1490+
"type": "object",
1491+
"properties": {
1492+
"cmk": {
1493+
"oneOf": [
1494+
{
1495+
"$ref": "#/definitions/CustomerManagedKeyDetails"
1496+
},
1497+
{
1498+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1499+
}
1500+
],
1501+
"description": "Details of the customer managed key associated with the workspace"
1502+
}
1503+
},
1504+
"description": "Details of the encryption associated with the workspace"
1505+
},
14371506
"EntityReference": {
14381507
"type": "object",
14391508
"properties": {
@@ -2051,6 +2120,33 @@
20512120
},
20522121
"description": "IP firewall rule properties"
20532122
},
2123+
"LibraryInfo": {
2124+
"type": "object",
2125+
"properties": {
2126+
"containerName": {
2127+
"type": "string",
2128+
"description": "Storage blob container name."
2129+
},
2130+
"name": {
2131+
"type": "string",
2132+
"description": "Name of the library."
2133+
},
2134+
"path": {
2135+
"type": "string",
2136+
"description": "Storage blob path of library."
2137+
},
2138+
"type": {
2139+
"type": "string",
2140+
"description": "Type of the library."
2141+
},
2142+
"uploadedTimestamp": {
2143+
"type": "string",
2144+
"format": "date-time",
2145+
"description": "The last update time of the library."
2146+
}
2147+
},
2148+
"description": "Library/package information of a Big Data pool powered by Apache Spark"
2149+
},
20542150
"LibraryRequirements": {
20552151
"type": "object",
20562152
"properties": {
@@ -2325,7 +2421,7 @@
23252421
"PrivateEndpoint": {
23262422
"type": "object",
23272423
"properties": {},
2328-
"description": "Private endpoint details"
2424+
"description": "Private Endpoint"
23292425
},
23302426
"PrivateEndpointConnection": {
23312427
"type": "object",
@@ -2339,10 +2435,9 @@
23392435
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
23402436
}
23412437
],
2342-
"description": "Properties of a private endpoint connection."
2438+
"description": "Private Endpoint Connection Properties"
23432439
}
2344-
},
2345-
"description": "A private endpoint connection"
2440+
}
23462441
},
23472442
"PrivateEndpointConnectionProperties": {
23482443
"type": "object",
@@ -2356,7 +2451,7 @@
23562451
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
23572452
}
23582453
],
2359-
"description": "Private endpoint details"
2454+
"description": "Private Endpoint"
23602455
},
23612456
"privateLinkServiceConnectionState": {
23622457
"oneOf": [
@@ -2367,10 +2462,10 @@
23672462
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
23682463
}
23692464
],
2370-
"description": "Connection state details of the private endpoint"
2465+
"description": "Private Link Service Connection State"
23712466
}
23722467
},
2373-
"description": "Properties of a private endpoint connection."
2468+
"description": "Private Endpoint Connection Properties"
23742469
},
23752470
"PrivateLinkHubProperties": {
23762471
"type": "object",
@@ -2379,30 +2474,8 @@
23792474
},
23802475
"PrivateLinkServiceConnectionState": {
23812476
"type": "object",
2382-
"properties": {
2383-
"description": {
2384-
"type": "string",
2385-
"description": "The private link service connection description."
2386-
},
2387-
"status": {
2388-
"oneOf": [
2389-
{
2390-
"type": "string",
2391-
"enum": [
2392-
"Approved",
2393-
"Pending",
2394-
"Rejected",
2395-
"Disconnected"
2396-
]
2397-
},
2398-
{
2399-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2400-
}
2401-
],
2402-
"description": "The private link service connection status."
2403-
}
2404-
},
2405-
"description": "Connection state details of the private endpoint"
2477+
"properties": {},
2478+
"description": "Private Link Service Connection State"
24062479
},
24072480
"SecretBase": {
24082481
"type": "object",
@@ -2898,9 +2971,34 @@
28982971
},
28992972
"description": "Properties of a Vulnerability Assessment recurring scans."
29002973
},
2974+
"WorkspaceKeyDetails": {
2975+
"type": "object",
2976+
"properties": {
2977+
"keyVaultUrl": {
2978+
"type": "string",
2979+
"description": "Workspace Key sub-resource key vault url"
2980+
},
2981+
"name": {
2982+
"type": "string",
2983+
"description": "Workspace Key sub-resource name"
2984+
}
2985+
},
2986+
"description": "Details of the customer managed key associated with the workspace"
2987+
},
29012988
"WorkspaceProperties": {
29022989
"type": "object",
29032990
"properties": {
2991+
"babylonConfiguration": {
2992+
"oneOf": [
2993+
{
2994+
"$ref": "#/definitions/BabylonConfiguration"
2995+
},
2996+
{
2997+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2998+
}
2999+
],
3000+
"description": "Babylon Configuration"
3001+
},
29043002
"connectivityEndpoints": {
29053003
"oneOf": [
29063004
{
@@ -2927,6 +3025,17 @@
29273025
],
29283026
"description": "Details of the data lake storage account associated with the workspace"
29293027
},
3028+
"encryption": {
3029+
"oneOf": [
3030+
{
3031+
"$ref": "#/definitions/EncryptionDetails"
3032+
},
3033+
{
3034+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
3035+
}
3036+
],
3037+
"description": "Details of the encryption associated with the workspace"
3038+
},
29303039
"managedResourceGroupName": {
29313040
"type": "string",
29323041
"description": "Workspace managed resource group. The resource group name uniquely identifies the resource group within the user subscriptionId. The resource group name must be no longer than 90 characters long, and must be alphanumeric characters (Char.IsLetterOrDigit()) and '-', '_', '(', ')' and'.'. Note that the name cannot end with '.'"

0 commit comments

Comments
 (0)