From a63f7895785f628288ff8ae882de83808f61c08d Mon Sep 17 00:00:00 2001 From: Nikhil Date: Mon, 27 Dec 2021 11:58:15 +0530 Subject: [PATCH] [Synapse] Azure Synapse Correctness (#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 --- .../2021-06-01-preview/bigDataPool.json | 13 ++++- .../examples/CreateSqlPool.json | 2 - .../examples/UpdateSqlPool.json | 8 +--- .../integrationRuntime.json | 35 ++++++++++++++ .../preview/2021-06-01-preview/sqlPool.json | 24 +++++++--- .../preview/2021-06-01-preview/sqlServer.json | 8 +++- .../preview/2021-06-01-preview/workspace.json | 18 ++++++- .../stable/2021-06-01/bigDataPool.json | 48 ++++++++++++++++++- .../examples/CreateIpFirewallRule.json | 1 + .../2021-06-01/examples/CreateSqlPool.json | 2 - .../2021-06-01/examples/UpdateSqlPool.json | 8 +--- .../stable/2021-06-01/firewallRule.json | 3 ++ .../stable/2021-06-01/integrationRuntime.json | 25 +++++++++- .../stable/2021-06-01/sqlPool.json | 39 ++++++++++----- .../stable/2021-06-01/sqlServer.json | 13 ++++- .../stable/2021-06-01/workspace.json | 30 ++++++++++-- 16 files changed, 227 insertions(+), 50 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json index ba863967b4da..1f3643750243 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json @@ -406,7 +406,8 @@ "creationDate": { "type": "string", "format": "date-time", - "description": "The time when the Big Data pool was created." + "description": "The time when the Big Data pool was created.", + "readOnly": true }, "autoPause": { "$ref": "#/definitions/AutoPauseProperties", @@ -544,6 +545,16 @@ "enabled": { "type": "boolean", "description": "Indicates whether Dynamic Executor Allocation is enabled or not." + }, + "minExecutors": { + "type": "integer", + "format": "int32", + "description": "The minimum number of executors alloted" + }, + "maxExecutors": { + "type": "integer", + "format": "int32", + "description": "The maximum number of executors alloted" } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateSqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateSqlPool.json index f242d170a3d0..aed78c12e2fb 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateSqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateSqlPool.json @@ -37,12 +37,10 @@ "properties": { "maxSizeBytes": 0, "collation": "", - "sourceDatabaseId": "", "recoverableDatabaseId": "", "provisioningState": "Provisioning", "status": "Paused", "restorePointInTime": "1970-01-01T00:00:00.000Z", - "createMode": "", "creationDate": "1970-01-01T00:00:00.000Z", "storageAccountType": "LRS" } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/UpdateSqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/UpdateSqlPool.json index ff4edb596253..da86523de2e8 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/UpdateSqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/UpdateSqlPool.json @@ -16,11 +16,7 @@ "properties": { "maxSizeBytes": 0, "collation": "", - "sourceDatabaseId": "", - "recoverableDatabaseId": "", - "restorePointInTime": "1970-01-01T00:00:00.000Z", - "createMode": "", - "creationDate": "1970-01-01T00:00:00.000Z" + "restorePointInTime": "1970-01-01T00:00:00.000Z" } } }, @@ -39,12 +35,10 @@ "properties": { "maxSizeBytes": 0, "collation": "", - "sourceDatabaseId": "", "recoverableDatabaseId": "", "provisioningState": "Provisioning", "status": "Paused", "restorePointInTime": "1970-01-01T00:00:00.000Z", - "createMode": "", "creationDate": "1970-01-01T00:00:00.000Z", "storageAccountType": "GRS" } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/integrationRuntime.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/integrationRuntime.json index 6249c5c97297..09122f98a41b 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/integrationRuntime.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/integrationRuntime.json @@ -1386,6 +1386,11 @@ "description": "Managed integration runtime properties.", "x-ms-client-flatten": true, "$ref": "#/definitions/ManagedIntegrationRuntimeTypeProperties" + }, + "managedVirtualNetwork": { + "description": "Managed integration runtime managed virtual network.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ManagedIntegrationRuntimeManagedVirtualNetworkReference" } }, "required": [ @@ -1406,6 +1411,24 @@ } } }, + "ManagedIntegrationRuntimeManagedVirtualNetworkReference": { + "description": "Managed integration runtime managed virtual network reference.", + "type": "object", + "properties": { + "referenceName": { + "description": "The reference name of the managed virtual network.", + "type": "string" + }, + "type": { + "description": "The type of the managed virtual network.", + "type": "string" + }, + "id": { + "description": "The id of the managed virtual network.", + "type": "string" + } + } + }, "IntegrationRuntimeComputeProperties": { "description": "The compute resource properties for managed integration runtime.", "type": "object", @@ -2236,6 +2259,18 @@ "type": "string", "format": "date-time", "readOnly": true + }, + "serviceRegion": { + "description": "The service region of the integration runtime", + "type": "string" + }, + "newerVersions": { + "description": "The newer versions on download center.", + "type": "array", + "items": { + "description": "The newer versions", + "type": "string" + } } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlPool.json index c46052166144..89517a0864ce 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlPool.json @@ -5330,7 +5330,11 @@ }, "sourceDatabaseId": { "type": "string", - "description": "Source database to create from" + "description": "Source database to create from", + "x-ms-mutability": [ + "create", + "update" + ] }, "recoverableDatabaseId": { "type": "string", @@ -5342,7 +5346,8 @@ }, "status": { "type": "string", - "description": "Resource status" + "description": "Resource status", + "readOnly": true }, "restorePointInTime": { "type": "string", @@ -5361,19 +5366,23 @@ "x-ms-enum": { "name": "createMode", "modelAsString": true - } + }, + "x-ms-mutability": [ + "create", + "update" + ] }, "creationDate": { "type": "string", "description": "Date the SQL pool was created", - "format": "date-time" + "format": "date-time", + "readOnly": true }, "storageAccountType": { "description": "The storage account type used to store backups for this sql pool.", "enum": [ "GRS", - "LRS", - "ZRS" + "LRS" ], "type": "string", "x-ms-enum": { @@ -5409,7 +5418,8 @@ "syncIntervalInMinutes": { "type": "integer", "format": "int32", - "description": "The Sync Interval in minutes." + "description": "The Sync Interval in minutes.", + "readOnly": true } }, "x-ms-client-flatten": true diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlServer.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlServer.json index e9f0c2c3e376..b39c7e183140 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlServer.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlServer.json @@ -1487,14 +1487,18 @@ }, "ServerVulnerabilityAssessmentProperties": { "description": "Properties of a server Vulnerability Assessment.", + "type": "object", "required": [ "storageContainerPath" ], - "type": "object", "properties": { "storageContainerPath": { "description": "A blob storage container path to hold the scan results (e.g. https://myStorage.blob.core.windows.net/VaScans/).", - "type": "string" + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] }, "storageContainerSasKey": { "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.", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json index 04f794fdc3da..c9f615abb39b 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json @@ -926,7 +926,11 @@ "properties": { "accountUrl": { "description": "Account URL", - "type": "string" + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] }, "filesystem": { "description": "Filesystem name", @@ -1170,7 +1174,11 @@ "properties": { "initialWorkspaceAdminObjectId": { "description": "AAD object ID of initial workspace admin", - "type": "string" + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] } } }, @@ -1282,6 +1290,7 @@ "Disabled" ], "description": "Enable or Disable public network access to workspace", + "default": "Enabled", "type": "string", "x-ms-enum": { "name": "WorkspacePublicNetworkAccess", @@ -1303,6 +1312,11 @@ "azureADOnlyAuthentication": { "description": "Enable or Disable AzureADOnlyAuthentication on All Workspace subresource", "type": "boolean" + }, + "trustedServiceBypassEnabled": { + "description": "Is trustedServiceBypassEnabled for the workspace", + "type": "boolean", + "default": false } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/bigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/bigDataPool.json index aec796451b4b..a7cc2b1256e2 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/bigDataPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/bigDataPool.json @@ -406,7 +406,8 @@ "creationDate": { "type": "string", "format": "date-time", - "description": "The time when the Big Data pool was created." + "description": "The time when the Big Data pool was created.", + "readOnly": true }, "autoPause": { "$ref": "#/definitions/AutoPauseProperties", @@ -450,7 +451,7 @@ } }, "sparkConfigProperties": { - "$ref": "#/definitions/LibraryRequirements", + "$ref": "#/definitions/SparkConfigProperties", "description": "Spark configuration file to specify additional properties" }, "sparkVersion": { @@ -544,6 +545,16 @@ "enabled": { "type": "boolean", "description": "Indicates whether Dynamic Executor Allocation is enabled or not." + }, + "minExecutors": { + "type": "integer", + "format": "int32", + "description": "The minimum number of executors alloted" + }, + "maxExecutors": { + "type": "integer", + "format": "int32", + "description": "The maximum number of executors alloted" } } }, @@ -606,6 +617,39 @@ "description": "The filename of the library requirements file." } } + }, + "SparkConfigProperties": { + "type": "object", + "description": "SparkConfig Properties for a Big Data pool powered by Apache Spark", + "title": "Spark pool Config Properties", + "properties": { + "time": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "The last update time of the spark config properties file." + }, + "content": { + "type": "string", + "description": "The spark config properties." + }, + "filename": { + "type": "string", + "description": "The filename of the spark config properties file." + }, + "configurationType": { + "enum": [ + "File", + "Artifact" + ], + "type": "string", + "description": "The type of the spark config properties file.", + "x-ms-enum": { + "name": "ConfigurationType", + "modelAsString": true + } + } + } } } } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateIpFirewallRule.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateIpFirewallRule.json index e98d29b769c9..efa2f1af9a4b 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateIpFirewallRule.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateIpFirewallRule.json @@ -37,6 +37,7 @@ } } }, + "202": {}, "default": { "body": { "error": { diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateSqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateSqlPool.json index 7737789f9327..6da37ff96860 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateSqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateSqlPool.json @@ -37,12 +37,10 @@ "properties": { "maxSizeBytes": 0, "collation": "", - "sourceDatabaseId": "", "recoverableDatabaseId": "", "provisioningState": "Provisioning", "status": "Paused", "restorePointInTime": "1970-01-01T00:00:00.000Z", - "createMode": "", "creationDate": "1970-01-01T00:00:00.000Z", "storageAccountType": "LRS" } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/UpdateSqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/UpdateSqlPool.json index 263a8bed3fe1..aad81661d906 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/UpdateSqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/UpdateSqlPool.json @@ -16,11 +16,7 @@ "properties": { "maxSizeBytes": 0, "collation": "", - "sourceDatabaseId": "", - "recoverableDatabaseId": "", - "restorePointInTime": "1970-01-01T00:00:00.000Z", - "createMode": "", - "creationDate": "1970-01-01T00:00:00.000Z" + "restorePointInTime": "1970-01-01T00:00:00.000Z" } } }, @@ -39,12 +35,10 @@ "properties": { "maxSizeBytes": 0, "collation": "", - "sourceDatabaseId": "", "recoverableDatabaseId": "", "provisioningState": "Provisioning", "status": "Paused", "restorePointInTime": "1970-01-01T00:00:00.000Z", - "createMode": "", "creationDate": "1970-01-01T00:00:00.000Z", "storageAccountType": "GRS" } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/firewallRule.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/firewallRule.json index a12d9ecf49d0..4fcf5b47da88 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/firewallRule.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/firewallRule.json @@ -119,6 +119,9 @@ }, "description": "" }, + "202": { + "description": "" + }, "default": { "schema": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json index d21dcbfe899b..1cbb8a0db2de 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json @@ -1377,7 +1377,7 @@ } ], "properties": { - "state": { + "provisioningState": { "description": "Integration runtime state, only valid for managed dedicated integration runtime.", "$ref": "#/definitions/IntegrationRuntimeState", "readOnly": true @@ -1386,6 +1386,11 @@ "description": "Managed integration runtime properties.", "x-ms-client-flatten": true, "$ref": "#/definitions/ManagedIntegrationRuntimeTypeProperties" + }, + "managedVirtualNetwork": { + "description": "Managed integration runtime managed virtual network.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ManagedIntegrationRuntimeManagedVirtualNetworkReference" } }, "required": [ @@ -1410,6 +1415,24 @@ } } }, + "ManagedIntegrationRuntimeManagedVirtualNetworkReference": { + "description": "Managed integration runtime managed virtual network reference.", + "type": "object", + "properties": { + "referenceName": { + "description": "The reference name of the managed virtual network", + "type": "string" + }, + "type": { + "description": "The type of the managed virtual network.", + "type": "string" + }, + "id": { + "description": "The id of the managed virtual network.", + "type": "string" + } + } + }, "IntegrationRuntimeComputeProperties": { "description": "The compute resource properties for managed integration runtime.", "type": "object", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlPool.json index 5d8902579f82..4fd61e337701 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlPool.json @@ -5326,11 +5326,16 @@ }, "collation": { "type": "string", - "description": "Collation mode" + "description": "Collation mode", + "default": "" }, "sourceDatabaseId": { "type": "string", - "description": "Source database to create from" + "description": "Source database to create from", + "x-ms-mutability": [ + "create", + "update" + ] }, "recoverableDatabaseId": { "type": "string", @@ -5342,7 +5347,8 @@ }, "status": { "type": "string", - "description": "Resource status" + "description": "Resource status", + "readOnly": true }, "restorePointInTime": { "type": "string", @@ -5361,30 +5367,39 @@ "x-ms-enum": { "name": "createMode", "modelAsString": true - } + }, + "x-ms-mutability": [ + "create", + "update" + ] }, "creationDate": { "type": "string", "description": "Date the SQL pool was created", - "format": "date-time" + "format": "date-time", + "readOnly": true }, "storageAccountType": { "description": "The storage account type used to store backups for this sql pool.", "enum": [ "GRS", - "LRS", - "ZRS" + "LRS" ], "type": "string", "x-ms-enum": { "name": "StorageAccountType", "modelAsString": true - } + }, + "default": "GRS" }, "sourceDatabaseDeletionDate": { "type": "string", "description": "Specifies the time that the sql pool was deleted", - "format": "date-time" + "format": "date-time", + "x-ms-mutability": [ + "create", + "read" + ] } } }, @@ -6107,7 +6122,8 @@ "storageAccountSubscriptionId": { "format": "uuid", "description": "Specifies the blob storage subscription Id.", - "type": "string" + "type": "string", + "default": "" }, "isStorageSecondaryKeyInUse": { "description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.", @@ -6115,7 +6131,8 @@ }, "isAzureMonitorTargetEnabled": { "description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n", - "type": "boolean" + "type": "boolean", + "default": false } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlServer.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlServer.json index e0ac32f318fd..fbd9d377cbb4 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlServer.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlServer.json @@ -1237,7 +1237,8 @@ "storageAccountSubscriptionId": { "format": "uuid", "description": "Specifies the blob storage subscription Id.", - "type": "string" + "type": "string", + "default": "" }, "isStorageSecondaryKeyInUse": { "description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.", @@ -1251,6 +1252,10 @@ "format": "int32", "description": "Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.\r\nThe default minimum value is 1000 (1 second). The maximum is 2,147,483,647.", "type": "integer" + }, + "isDevopsAuditEnabled": { + "description": "Specifies the state of devops audit. If state is Enabled, devops logs will be sent to Azure Monitor.\r\nIn order to send the events to Azure Monitor, specify 'State' as 'Enabled', 'IsAzureMonitorTargetEnabled' as true and 'IsDevopsAuditEnabled' as true\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'DevOpsOperationsAudit' diagnostic logs category on the master database should also be created.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/master/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n", + "type": "boolean" } } }, @@ -1353,6 +1358,10 @@ "format": "int32", "description": "Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.\r\nThe default minimum value is 1000 (1 second). The maximum is 2,147,483,647.", "type": "integer" + }, + "isDevopsAuditEnabled": { + "description": "Specifies the state of devops audit. If state is Enabled, devops logs will be sent to Azure Monitor.\r\nIn order to send the events to Azure Monitor, specify 'State' as 'Enabled', 'IsAzureMonitorTargetEnabled' as true and 'IsDevopsAuditEnabled' as true\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'DevOpsOperationsAudit' diagnostic logs category on the master database should also be created.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/master/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n", + "type": "boolean" } } }, @@ -1487,10 +1496,10 @@ }, "ServerVulnerabilityAssessmentProperties": { "description": "Properties of a server Vulnerability Assessment.", + "type": "object", "required": [ "storageContainerPath" ], - "type": "object", "properties": { "storageContainerPath": { "description": "A blob storage container path to hold the scan results (e.g. https://myStorage.blob.core.windows.net/VaScans/).", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/workspace.json index 436cce1649d2..68eb57988ea4 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/workspace.json @@ -926,7 +926,11 @@ "properties": { "accountUrl": { "description": "Account URL", - "type": "string" + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] }, "filesystem": { "description": "Filesystem name", @@ -938,7 +942,11 @@ }, "createManagedPrivateEndpoint": { "description": "Create managed private endpoint to this storage account or not", - "type": "boolean" + "type": "boolean", + "x-ms-mutability": [ + "create", + "update" + ] } } }, @@ -1208,7 +1216,11 @@ }, "managedResourceGroupName": { "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 '.'", - "type": "string" + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] }, "provisioningState": { "description": "Resource provisioning state", @@ -1282,11 +1294,16 @@ "Disabled" ], "description": "Enable or Disable public network access to workspace", + "default": "Enabled", "type": "string", "x-ms-enum": { "name": "WorkspacePublicNetworkAccess", "modelAsString": true - } + }, + "x-ms-mutability": [ + "create", + "read" + ] }, "cspWorkspaceAdminProperties": { "description": "Initial workspace AAD admin properties for a CSP subscription", @@ -1303,6 +1320,11 @@ "azureADOnlyAuthentication": { "description": "Enable or Disable AzureADOnlyAuthentication on All Workspace subresource", "type": "boolean" + }, + "trustedServiceBypassEnabled": { + "description": "Is trustedServiceBypassEnabled for the workspace", + "type": "boolean", + "default": false } } },