Skip to content

Commit c53d766

Browse files
niks02Nikhil Kumar
authored and
Leiwang3SQL
committed
[Synapse] Azure Synapse Correctness (Azure#17116)
* [Synapse] Azure Synapse Correctness * roundtripCorrectnessFixes * Prettier and Semantic fix * Model, Semantic and Prettier fix * More Correctness changes * More Correctness changes * Lint changes * Lint Diff Fix * Suggestions Incoporation * Review Comment Incoporation * Review Comments Incoporation 1 * Semantic fix * Review Comment Incoporation Co-authored-by: Nikhil Kumar <nikhilkumar@microsoft.com>
1 parent eebf237 commit c53d766

File tree

16 files changed

+227
-50
lines changed

16 files changed

+227
-50
lines changed

‎specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,8 @@
406406
"creationDate": {
407407
"type": "string",
408408
"format": "date-time",
409-
"description": "The time when the Big Data pool was created."
409+
"description": "The time when the Big Data pool was created.",
410+
"readOnly": true
410411
},
411412
"autoPause": {
412413
"$ref": "#/definitions/AutoPauseProperties",
@@ -544,6 +545,16 @@
544545
"enabled": {
545546
"type": "boolean",
546547
"description": "Indicates whether Dynamic Executor Allocation is enabled or not."
548+
},
549+
"minExecutors": {
550+
"type": "integer",
551+
"format": "int32",
552+
"description": "The minimum number of executors alloted"
553+
},
554+
"maxExecutors": {
555+
"type": "integer",
556+
"format": "int32",
557+
"description": "The maximum number of executors alloted"
547558
}
548559
}
549560
},

‎specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateSqlPool.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@
3737
"properties": {
3838
"maxSizeBytes": 0,
3939
"collation": "",
40-
"sourceDatabaseId": "",
4140
"recoverableDatabaseId": "",
4241
"provisioningState": "Provisioning",
4342
"status": "Paused",
4443
"restorePointInTime": "1970-01-01T00:00:00.000Z",
45-
"createMode": "",
4644
"creationDate": "1970-01-01T00:00:00.000Z",
4745
"storageAccountType": "LRS"
4846
}

‎specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/UpdateSqlPool.json‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
"properties": {
1717
"maxSizeBytes": 0,
1818
"collation": "",
19-
"sourceDatabaseId": "",
20-
"recoverableDatabaseId": "",
21-
"restorePointInTime": "1970-01-01T00:00:00.000Z",
22-
"createMode": "",
23-
"creationDate": "1970-01-01T00:00:00.000Z"
19+
"restorePointInTime": "1970-01-01T00:00:00.000Z"
2420
}
2521
}
2622
},
@@ -39,12 +35,10 @@
3935
"properties": {
4036
"maxSizeBytes": 0,
4137
"collation": "",
42-
"sourceDatabaseId": "",
4338
"recoverableDatabaseId": "",
4439
"provisioningState": "Provisioning",
4540
"status": "Paused",
4641
"restorePointInTime": "1970-01-01T00:00:00.000Z",
47-
"createMode": "",
4842
"creationDate": "1970-01-01T00:00:00.000Z",
4943
"storageAccountType": "GRS"
5044
}

‎specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/integrationRuntime.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,6 +1386,11 @@
13861386
"description": "Managed integration runtime properties.",
13871387
"x-ms-client-flatten": true,
13881388
"$ref": "#/definitions/ManagedIntegrationRuntimeTypeProperties"
1389+
},
1390+
"managedVirtualNetwork": {
1391+
"description": "Managed integration runtime managed virtual network.",
1392+
"x-ms-client-flatten": true,
1393+
"$ref": "#/definitions/ManagedIntegrationRuntimeManagedVirtualNetworkReference"
13891394
}
13901395
},
13911396
"required": [
@@ -1406,6 +1411,24 @@
14061411
}
14071412
}
14081413
},
1414+
"ManagedIntegrationRuntimeManagedVirtualNetworkReference": {
1415+
"description": "Managed integration runtime managed virtual network reference.",
1416+
"type": "object",
1417+
"properties": {
1418+
"referenceName": {
1419+
"description": "The reference name of the managed virtual network.",
1420+
"type": "string"
1421+
},
1422+
"type": {
1423+
"description": "The type of the managed virtual network.",
1424+
"type": "string"
1425+
},
1426+
"id": {
1427+
"description": "The id of the managed virtual network.",
1428+
"type": "string"
1429+
}
1430+
}
1431+
},
14091432
"IntegrationRuntimeComputeProperties": {
14101433
"description": "The compute resource properties for managed integration runtime.",
14111434
"type": "object",
@@ -2236,6 +2259,18 @@
22362259
"type": "string",
22372260
"format": "date-time",
22382261
"readOnly": true
2262+
},
2263+
"serviceRegion": {
2264+
"description": "The service region of the integration runtime",
2265+
"type": "string"
2266+
},
2267+
"newerVersions": {
2268+
"description": "The newer versions on download center.",
2269+
"type": "array",
2270+
"items": {
2271+
"description": "The newer versions",
2272+
"type": "string"
2273+
}
22392274
}
22402275
}
22412276
},

‎specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlPool.json‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5330,7 +5330,11 @@
53305330
},
53315331
"sourceDatabaseId": {
53325332
"type": "string",
5333-
"description": "Source database to create from"
5333+
"description": "Source database to create from",
5334+
"x-ms-mutability": [
5335+
"create",
5336+
"update"
5337+
]
53345338
},
53355339
"recoverableDatabaseId": {
53365340
"type": "string",
@@ -5342,7 +5346,8 @@
53425346
},
53435347
"status": {
53445348
"type": "string",
5345-
"description": "Resource status"
5349+
"description": "Resource status",
5350+
"readOnly": true
53465351
},
53475352
"restorePointInTime": {
53485353
"type": "string",
@@ -5361,19 +5366,23 @@
53615366
"x-ms-enum": {
53625367
"name": "createMode",
53635368
"modelAsString": true
5364-
}
5369+
},
5370+
"x-ms-mutability": [
5371+
"create",
5372+
"update"
5373+
]
53655374
},
53665375
"creationDate": {
53675376
"type": "string",
53685377
"description": "Date the SQL pool was created",
5369-
"format": "date-time"
5378+
"format": "date-time",
5379+
"readOnly": true
53705380
},
53715381
"storageAccountType": {
53725382
"description": "The storage account type used to store backups for this sql pool.",
53735383
"enum": [
53745384
"GRS",
5375-
"LRS",
5376-
"ZRS"
5385+
"LRS"
53775386
],
53785387
"type": "string",
53795388
"x-ms-enum": {
@@ -5409,7 +5418,8 @@
54095418
"syncIntervalInMinutes": {
54105419
"type": "integer",
54115420
"format": "int32",
5412-
"description": "The Sync Interval in minutes."
5421+
"description": "The Sync Interval in minutes.",
5422+
"readOnly": true
54135423
}
54145424
},
54155425
"x-ms-client-flatten": true

‎specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlServer.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,14 +1487,18 @@
14871487
},
14881488
"ServerVulnerabilityAssessmentProperties": {
14891489
"description": "Properties of a server Vulnerability Assessment.",
1490+
"type": "object",
14901491
"required": [
14911492
"storageContainerPath"
14921493
],
1493-
"type": "object",
14941494
"properties": {
14951495
"storageContainerPath": {
14961496
"description": "A blob storage container path to hold the scan results (e.g. https://myStorage.blob.core.windows.net/VaScans/).",
1497-
"type": "string"
1497+
"type": "string",
1498+
"x-ms-mutability": [
1499+
"create",
1500+
"read"
1501+
]
14981502
},
14991503
"storageContainerSasKey": {
15001504
"description": "A shared access signature (SAS Key) that has read and write access to the blob container specified in 'storageContainerPath' parameter. If 'storageAccountAccessKey' isn't specified, StorageContainerSasKey is required.",

‎specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,11 @@
926926
"properties": {
927927
"accountUrl": {
928928
"description": "Account URL",
929-
"type": "string"
929+
"type": "string",
930+
"x-ms-mutability": [
931+
"create",
932+
"read"
933+
]
930934
},
931935
"filesystem": {
932936
"description": "Filesystem name",
@@ -1170,7 +1174,11 @@
11701174
"properties": {
11711175
"initialWorkspaceAdminObjectId": {
11721176
"description": "AAD object ID of initial workspace admin",
1173-
"type": "string"
1177+
"type": "string",
1178+
"x-ms-mutability": [
1179+
"create",
1180+
"read"
1181+
]
11741182
}
11751183
}
11761184
},
@@ -1282,6 +1290,7 @@
12821290
"Disabled"
12831291
],
12841292
"description": "Enable or Disable public network access to workspace",
1293+
"default": "Enabled",
12851294
"type": "string",
12861295
"x-ms-enum": {
12871296
"name": "WorkspacePublicNetworkAccess",
@@ -1303,6 +1312,11 @@
13031312
"azureADOnlyAuthentication": {
13041313
"description": "Enable or Disable AzureADOnlyAuthentication on All Workspace subresource",
13051314
"type": "boolean"
1315+
},
1316+
"trustedServiceBypassEnabled": {
1317+
"description": "Is trustedServiceBypassEnabled for the workspace",
1318+
"type": "boolean",
1319+
"default": false
13061320
}
13071321
}
13081322
},

‎specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/bigDataPool.json‎

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,8 @@
406406
"creationDate": {
407407
"type": "string",
408408
"format": "date-time",
409-
"description": "The time when the Big Data pool was created."
409+
"description": "The time when the Big Data pool was created.",
410+
"readOnly": true
410411
},
411412
"autoPause": {
412413
"$ref": "#/definitions/AutoPauseProperties",
@@ -450,7 +451,7 @@
450451
}
451452
},
452453
"sparkConfigProperties": {
453-
"$ref": "#/definitions/LibraryRequirements",
454+
"$ref": "#/definitions/SparkConfigProperties",
454455
"description": "Spark configuration file to specify additional properties"
455456
},
456457
"sparkVersion": {
@@ -544,6 +545,16 @@
544545
"enabled": {
545546
"type": "boolean",
546547
"description": "Indicates whether Dynamic Executor Allocation is enabled or not."
548+
},
549+
"minExecutors": {
550+
"type": "integer",
551+
"format": "int32",
552+
"description": "The minimum number of executors alloted"
553+
},
554+
"maxExecutors": {
555+
"type": "integer",
556+
"format": "int32",
557+
"description": "The maximum number of executors alloted"
547558
}
548559
}
549560
},
@@ -606,6 +617,39 @@
606617
"description": "The filename of the library requirements file."
607618
}
608619
}
620+
},
621+
"SparkConfigProperties": {
622+
"type": "object",
623+
"description": "SparkConfig Properties for a Big Data pool powered by Apache Spark",
624+
"title": "Spark pool Config Properties",
625+
"properties": {
626+
"time": {
627+
"type": "string",
628+
"format": "date-time",
629+
"readOnly": true,
630+
"description": "The last update time of the spark config properties file."
631+
},
632+
"content": {
633+
"type": "string",
634+
"description": "The spark config properties."
635+
},
636+
"filename": {
637+
"type": "string",
638+
"description": "The filename of the spark config properties file."
639+
},
640+
"configurationType": {
641+
"enum": [
642+
"File",
643+
"Artifact"
644+
],
645+
"type": "string",
646+
"description": "The type of the spark config properties file.",
647+
"x-ms-enum": {
648+
"name": "ConfigurationType",
649+
"modelAsString": true
650+
}
651+
}
652+
}
609653
}
610654
}
611655
}

‎specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateIpFirewallRule.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
}
3838
}
3939
},
40+
"202": {},
4041
"default": {
4142
"body": {
4243
"error": {

‎specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateSqlPool.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@
3737
"properties": {
3838
"maxSizeBytes": 0,
3939
"collation": "",
40-
"sourceDatabaseId": "",
4140
"recoverableDatabaseId": "",
4241
"provisioningState": "Provisioning",
4342
"status": "Paused",
4443
"restorePointInTime": "1970-01-01T00:00:00.000Z",
45-
"createMode": "",
4644
"creationDate": "1970-01-01T00:00:00.000Z",
4745
"storageAccountType": "LRS"
4846
}

0 commit comments

Comments
 (0)