From b4a1b5a8715a6e007bee3e5f15f66f1ad804bc5b Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Thu, 16 Dec 2021 17:39:27 +0530 Subject: [PATCH 01/13] [Synapse] Azure Synapse Correctness --- .../2021-06-01-preview/bigDataPool.json | 14 +++++++++++ .../integrationRuntime.json | 23 +++++++++++++++++++ .../preview/2021-06-01-preview/sqlServer.json | 3 --- .../preview/2021-06-01-preview/workspace.json | 4 ++++ .../stable/2021-06-01/bigDataPool.json | 10 ++++++++ .../stable/2021-06-01/integrationRuntime.json | 23 +++++++++++++++++++ .../stable/2021-06-01/sqlServer.json | 11 ++++++--- .../stable/2021-06-01/workspace.json | 4 ++++ 8 files changed, 86 insertions(+), 6 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..467bff86396a 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 @@ -544,6 +544,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" } } }, @@ -565,6 +575,10 @@ "filename": { "type": "string", "description": "The filename of the library requirements file." + }, + "configurationType": { + "type": "string", + "description": "The configuration type of the library requirements file." } } }, 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..a89345243ac5 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 properties.", + "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 refernce 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/preview/2021-06-01-preview/sqlServer.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlServer.json index e9f0c2c3e376..0ea1d7a14163 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,9 +1487,6 @@ }, "ServerVulnerabilityAssessmentProperties": { "description": "Properties of a server Vulnerability Assessment.", - "required": [ - "storageContainerPath" - ], "type": "object", "properties": { "storageContainerPath": { 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..97ca17b11990 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 @@ -1303,6 +1303,10 @@ "azureADOnlyAuthentication": { "description": "Enable or Disable AzureADOnlyAuthentication on All Workspace subresource", "type": "boolean" + }, + "trustedServiceBypassEnabled": { + "description": "Is trustedServiceBypassEnabled for the workspace", + "type": "boolean" } } }, 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..1493ec75ee66 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 @@ -544,6 +544,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/stable/2021-06-01/integrationRuntime.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/integrationRuntime.json index d21dcbfe899b..cc96aeed6861 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 @@ -1386,6 +1386,11 @@ "description": "Managed integration runtime properties.", "x-ms-client-flatten": true, "$ref": "#/definitions/ManagedIntegrationRuntimeTypeProperties" + }, + "managedVirtualNetwork": { + "description": "Managed integration runtime properties.", + "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 refernce 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/sqlServer.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlServer.json index e0ac32f318fd..9b7ccd79aa0e 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 @@ -1251,6 +1251,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 +1357,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,9 +1495,6 @@ }, "ServerVulnerabilityAssessmentProperties": { "description": "Properties of a server Vulnerability Assessment.", - "required": [ - "storageContainerPath" - ], "type": "object", "properties": { "storageContainerPath": { 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..764f9b499768 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 @@ -1303,6 +1303,10 @@ "azureADOnlyAuthentication": { "description": "Enable or Disable AzureADOnlyAuthentication on All Workspace subresource", "type": "boolean" + }, + "trustedServiceBypassEnabled": { + "description": "Is trustedServiceBypassEnabled for the workspace", + "type": "boolean" } } }, From fd751671cefa0a5d99d074d7ce6aeb6c3e5a696f Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Sun, 19 Dec 2021 22:08:52 +0530 Subject: [PATCH 02/13] roundtripCorrectnessFixes --- .../2021-06-01-preview/bigDataPool.json | 3 +- .../integrationRuntime.json | 2 +- .../preview/2021-06-01-preview/sqlPool.json | 19 ++++++++--- .../preview/2021-06-01-preview/sqlServer.json | 7 +++- .../preview/2021-06-01-preview/workspace.json | 22 +++++++++--- .../stable/2021-06-01/integrationRuntime.json | 2 +- .../stable/2021-06-01/sqlPool.json | 34 ++++++++++++++----- .../stable/2021-06-01/sqlServer.json | 3 +- .../stable/2021-06-01/workspace.json | 19 ++++++++--- 9 files changed, 84 insertions(+), 27 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 467bff86396a..0f236816749c 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", 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 a89345243ac5..2a721b06245f 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 @@ -1416,7 +1416,7 @@ "type": "object", "properties": { "referenceName": { - "description": "The refernce name of the managed virtual network.", + "description": "The reference name of the managed virtual network.", "type": "string" }, "type": { 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..ff74842ee13d 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 @@ -5342,12 +5342,14 @@ }, "status": { "type": "string", - "description": "Resource status" + "description": "Resource status", + "readOnly": true }, "restorePointInTime": { "type": "string", "description": "Snapshot time to restore", - "format": "date-time" + "format": "date-time", + "default": null }, "createMode": { "type": "string", @@ -5361,12 +5363,17 @@ "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.", @@ -5409,7 +5416,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 @@ -6868,6 +6876,7 @@ "disabledAlerts": { "description": "Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action", "type": "array", + "readOnly": true, "items": { "type": "string" } 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 0ea1d7a14163..5f43fa09cd71 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 @@ -1414,6 +1414,7 @@ "disabledAlerts": { "description": "Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action", "type": "array", + "readOnly": true, "items": { "type": "string" } @@ -1491,7 +1492,11 @@ "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 97ca17b11990..b3a9d3cb8da7 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", @@ -1084,7 +1088,11 @@ }, "linkedAccessCheckOnTargetResource": { "description": "Linked Access Check On Target Resource", - "type": "boolean" + "type": "boolean", + "x-ms-mutability": [ + "create", + "update" + ] }, "allowedAadTenantIdsForLinking": { "description": "Allowed Aad Tenant Ids For Linking", @@ -1170,7 +1178,11 @@ "properties": { "initialWorkspaceAdminObjectId": { "description": "AAD object ID of initial workspace admin", - "type": "string" + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] } } }, @@ -1282,6 +1294,7 @@ "Disabled" ], "description": "Enable or Disable public network access to workspace", + "default": "Enabled", "type": "string", "x-ms-enum": { "name": "WorkspacePublicNetworkAccess", @@ -1306,7 +1319,8 @@ }, "trustedServiceBypassEnabled": { "description": "Is trustedServiceBypassEnabled for the workspace", - "type": "boolean" + "type": "boolean", + "default": false } } }, 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 cc96aeed6861..fd6838d07ab4 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 @@ -1420,7 +1420,7 @@ "type": "object", "properties": { "referenceName": { - "description": "The refernce name of the managed virtual network", + "description": "The reference name of the managed virtual network", "type": "string" }, "type": { 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..d5ebc1f3e7d8 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": null }, "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,12 +5367,17 @@ "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.", @@ -5379,12 +5390,14 @@ "x-ms-enum": { "name": "StorageAccountType", "modelAsString": true - } + }, + "readOnly": true }, "sourceDatabaseDeletionDate": { "type": "string", "description": "Specifies the time that the sql pool was deleted", - "format": "date-time" + "format": "date-time", + "readOnly": true } } }, @@ -6100,6 +6113,7 @@ "auditActionsAndGroups": { "description": "Specifies the Actions-Groups and Actions to audit.\r\n\r\nThe recommended set of action groups to use is the following combination - this will audit all the queries and stored procedures executed against the database, as well as successful and failed logins:\r\n\r\nBATCH_COMPLETED_GROUP,\r\nSUCCESSFUL_DATABASE_AUTHENTICATION_GROUP,\r\nFAILED_DATABASE_AUTHENTICATION_GROUP.\r\n\r\nThis above combination is also the set that is configured by default when enabling auditing from the Azure portal.\r\n\r\nThe supported action groups to audit are (note: choose only specific groups that cover your auditing needs. Using unnecessary groups could lead to very large quantities of audit records):\r\n\r\nAPPLICATION_ROLE_CHANGE_PASSWORD_GROUP\r\nBACKUP_RESTORE_GROUP\r\nDATABASE_LOGOUT_GROUP\r\nDATABASE_OBJECT_CHANGE_GROUP\r\nDATABASE_OBJECT_OWNERSHIP_CHANGE_GROUP\r\nDATABASE_OBJECT_PERMISSION_CHANGE_GROUP\r\nDATABASE_OPERATION_GROUP\r\nDATABASE_PERMISSION_CHANGE_GROUP\r\nDATABASE_PRINCIPAL_CHANGE_GROUP\r\nDATABASE_PRINCIPAL_IMPERSONATION_GROUP\r\nDATABASE_ROLE_MEMBER_CHANGE_GROUP\r\nFAILED_DATABASE_AUTHENTICATION_GROUP\r\nSCHEMA_OBJECT_ACCESS_GROUP\r\nSCHEMA_OBJECT_CHANGE_GROUP\r\nSCHEMA_OBJECT_OWNERSHIP_CHANGE_GROUP\r\nSCHEMA_OBJECT_PERMISSION_CHANGE_GROUP\r\nSUCCESSFUL_DATABASE_AUTHENTICATION_GROUP\r\nUSER_CHANGE_PASSWORD_GROUP\r\nBATCH_STARTED_GROUP\r\nBATCH_COMPLETED_GROUP\r\n\r\nThese are groups that cover all sql statements and stored procedures executed against the database, and should not be used in combination with other groups as this will result in duplicate audit logs.\r\n\r\nFor more information, see [Database-Level Audit Action Groups](https://docs.microsoft.com/en-us/sql/relational-databases/security/auditing/sql-server-audit-action-groups-and-actions#database-level-audit-action-groups).\r\n\r\nFor Database auditing policy, specific Actions can also be specified (note that Actions cannot be specified for Server auditing policy). The supported actions to audit are:\r\nSELECT\r\nUPDATE\r\nINSERT\r\nDELETE\r\nEXECUTE\r\nRECEIVE\r\nREFERENCES\r\n\r\nThe general form for defining an action to be audited is:\r\n{action} ON {object} BY {principal}\r\n\r\nNote that in the above format can refer to an object like a table, view, or stored procedure, or an entire database or schema. For the latter cases, the forms DATABASE::{db_name} and SCHEMA::{schema_name} are used, respectively.\r\n\r\nFor example:\r\nSELECT on dbo.myTable by public\r\nSELECT on DATABASE::myDatabase by public\r\nSELECT on SCHEMA::mySchema by public\r\n\r\nFor more information, see [Database-Level Audit Actions](https://docs.microsoft.com/en-us/sql/relational-databases/security/auditing/sql-server-audit-action-groups-and-actions#database-level-audit-actions)", "type": "array", + "readonly": true, "items": { "type": "string" } @@ -6107,7 +6121,8 @@ "storageAccountSubscriptionId": { "format": "uuid", "description": "Specifies the blob storage subscription Id.", - "type": "string" + "type": "string", + "readonly": true }, "isStorageSecondaryKeyInUse": { "description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.", @@ -6115,7 +6130,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", + "readonly": true } } }, 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 9b7ccd79aa0e..e14de6aec0d7 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", + "readOnly": true }, "isStorageSecondaryKeyInUse": { "description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.", 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 764f9b499768..5a90570136df 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,8 @@ }, "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", + "default": null }, "provisioningState": { "description": "Resource provisioning state", @@ -1282,6 +1291,7 @@ "Disabled" ], "description": "Enable or Disable public network access to workspace", + "default": "Enabled", "type": "string", "x-ms-enum": { "name": "WorkspacePublicNetworkAccess", @@ -1306,7 +1316,8 @@ }, "trustedServiceBypassEnabled": { "description": "Is trustedServiceBypassEnabled for the workspace", - "type": "boolean" + "type": "boolean", + "default": false } } }, From e09606f328297cad7f86b724cdcafd0e841f1cc9 Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Mon, 20 Dec 2021 12:54:58 +0530 Subject: [PATCH 03/13] Prettier and Semantic fix --- .../preview/2021-06-01-preview/sqlPool.json | 2 +- .../Microsoft.Synapse/stable/2021-06-01/sqlPool.json | 6 ++---- .../Microsoft.Synapse/stable/2021-06-01/workspace.json | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) 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 ff74842ee13d..7271cf4b22d8 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 @@ -5349,7 +5349,7 @@ "type": "string", "description": "Snapshot time to restore", "format": "date-time", - "default": null + "default": "" }, "createMode": { "type": "string", 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 d5ebc1f3e7d8..8a8f316c86b9 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 @@ -6113,7 +6113,6 @@ "auditActionsAndGroups": { "description": "Specifies the Actions-Groups and Actions to audit.\r\n\r\nThe recommended set of action groups to use is the following combination - this will audit all the queries and stored procedures executed against the database, as well as successful and failed logins:\r\n\r\nBATCH_COMPLETED_GROUP,\r\nSUCCESSFUL_DATABASE_AUTHENTICATION_GROUP,\r\nFAILED_DATABASE_AUTHENTICATION_GROUP.\r\n\r\nThis above combination is also the set that is configured by default when enabling auditing from the Azure portal.\r\n\r\nThe supported action groups to audit are (note: choose only specific groups that cover your auditing needs. Using unnecessary groups could lead to very large quantities of audit records):\r\n\r\nAPPLICATION_ROLE_CHANGE_PASSWORD_GROUP\r\nBACKUP_RESTORE_GROUP\r\nDATABASE_LOGOUT_GROUP\r\nDATABASE_OBJECT_CHANGE_GROUP\r\nDATABASE_OBJECT_OWNERSHIP_CHANGE_GROUP\r\nDATABASE_OBJECT_PERMISSION_CHANGE_GROUP\r\nDATABASE_OPERATION_GROUP\r\nDATABASE_PERMISSION_CHANGE_GROUP\r\nDATABASE_PRINCIPAL_CHANGE_GROUP\r\nDATABASE_PRINCIPAL_IMPERSONATION_GROUP\r\nDATABASE_ROLE_MEMBER_CHANGE_GROUP\r\nFAILED_DATABASE_AUTHENTICATION_GROUP\r\nSCHEMA_OBJECT_ACCESS_GROUP\r\nSCHEMA_OBJECT_CHANGE_GROUP\r\nSCHEMA_OBJECT_OWNERSHIP_CHANGE_GROUP\r\nSCHEMA_OBJECT_PERMISSION_CHANGE_GROUP\r\nSUCCESSFUL_DATABASE_AUTHENTICATION_GROUP\r\nUSER_CHANGE_PASSWORD_GROUP\r\nBATCH_STARTED_GROUP\r\nBATCH_COMPLETED_GROUP\r\n\r\nThese are groups that cover all sql statements and stored procedures executed against the database, and should not be used in combination with other groups as this will result in duplicate audit logs.\r\n\r\nFor more information, see [Database-Level Audit Action Groups](https://docs.microsoft.com/en-us/sql/relational-databases/security/auditing/sql-server-audit-action-groups-and-actions#database-level-audit-action-groups).\r\n\r\nFor Database auditing policy, specific Actions can also be specified (note that Actions cannot be specified for Server auditing policy). The supported actions to audit are:\r\nSELECT\r\nUPDATE\r\nINSERT\r\nDELETE\r\nEXECUTE\r\nRECEIVE\r\nREFERENCES\r\n\r\nThe general form for defining an action to be audited is:\r\n{action} ON {object} BY {principal}\r\n\r\nNote that in the above format can refer to an object like a table, view, or stored procedure, or an entire database or schema. For the latter cases, the forms DATABASE::{db_name} and SCHEMA::{schema_name} are used, respectively.\r\n\r\nFor example:\r\nSELECT on dbo.myTable by public\r\nSELECT on DATABASE::myDatabase by public\r\nSELECT on SCHEMA::mySchema by public\r\n\r\nFor more information, see [Database-Level Audit Actions](https://docs.microsoft.com/en-us/sql/relational-databases/security/auditing/sql-server-audit-action-groups-and-actions#database-level-audit-actions)", "type": "array", - "readonly": true, "items": { "type": "string" } @@ -6122,7 +6121,7 @@ "format": "uuid", "description": "Specifies the blob storage subscription Id.", "type": "string", - "readonly": true + "default": "" }, "isStorageSecondaryKeyInUse": { "description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.", @@ -6130,8 +6129,7 @@ }, "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", - "readonly": true + "type": "boolean" } } }, 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 5a90570136df..2fdd1c1b914d 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 @@ -1217,7 +1217,7 @@ "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", - "default": null + "default": "" }, "provisioningState": { "description": "Resource provisioning state", From 244512499098a9f50c19a9376b4bd0424c481004 Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Mon, 20 Dec 2021 20:41:34 +0530 Subject: [PATCH 04/13] Model, Semantic and Prettier fix --- .../2021-06-01-preview/examples/CreateSqlPool.json | 2 -- .../2021-06-01-preview/examples/UpdateSqlPool.json | 2 -- .../preview/2021-06-01-preview/sqlPool.json | 10 +++++++--- .../preview/2021-06-01-preview/sqlServer.json | 2 +- .../preview/2021-06-01-preview/workspace.json | 6 +----- .../stable/2021-06-01/examples/CreateSqlPool.json | 2 -- .../stable/2021-06-01/examples/UpdateSqlPool.json | 5 +---- .../Microsoft.Synapse/stable/2021-06-01/sqlPool.json | 8 +++----- .../Microsoft.Synapse/stable/2021-06-01/sqlServer.json | 3 +-- 9 files changed, 14 insertions(+), 26 deletions(-) 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..c0050abafc32 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 @@ -39,12 +39,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/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlPool.json index 7271cf4b22d8..326f530eb098 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", @@ -5349,7 +5353,7 @@ "type": "string", "description": "Snapshot time to restore", "format": "date-time", - "default": "" + "readOnly": true }, "createMode": { "type": "string", @@ -6876,7 +6880,7 @@ "disabledAlerts": { "description": "Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action", "type": "array", - "readOnly": true, + "default": [], "items": { "type": "string" } 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 5f43fa09cd71..045a9a5fa4df 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 @@ -1414,7 +1414,7 @@ "disabledAlerts": { "description": "Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action", "type": "array", - "readOnly": true, + "default": [], "items": { "type": "string" } 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 b3a9d3cb8da7..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 @@ -1088,11 +1088,7 @@ }, "linkedAccessCheckOnTargetResource": { "description": "Linked Access Check On Target Resource", - "type": "boolean", - "x-ms-mutability": [ - "create", - "update" - ] + "type": "boolean" }, "allowedAadTenantIdsForLinking": { "description": "Allowed Aad Tenant Ids For Linking", 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..d4ffc920279e 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 @@ -19,8 +19,7 @@ "sourceDatabaseId": "", "recoverableDatabaseId": "", "restorePointInTime": "1970-01-01T00:00:00.000Z", - "createMode": "", - "creationDate": "1970-01-01T00:00:00.000Z" + "createMode": "" } } }, @@ -39,12 +38,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/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlPool.json index 8a8f316c86b9..21165e52d55a 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 @@ -5327,7 +5327,7 @@ "collation": { "type": "string", "description": "Collation mode", - "default": null + "default": "" }, "sourceDatabaseId": { "type": "string", @@ -5383,15 +5383,13 @@ "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 - }, - "readOnly": true + } }, "sourceDatabaseDeletionDate": { "type": "string", 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 e14de6aec0d7..9b7ccd79aa0e 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,8 +1237,7 @@ "storageAccountSubscriptionId": { "format": "uuid", "description": "Specifies the blob storage subscription Id.", - "type": "string", - "readOnly": true + "type": "string" }, "isStorageSecondaryKeyInUse": { "description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.", From 6dd9c7218463f81e00ecc761e31290cd2247562b Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Tue, 21 Dec 2021 00:12:54 +0530 Subject: [PATCH 05/13] More Correctness changes --- .../examples/UpdateSqlPool.json | 4 +--- .../preview/2021-06-01-preview/sqlPool.json | 4 ++-- .../preview/2021-06-01-preview/sqlServer.json | 4 ++-- .../stable/2021-06-01/bigDataPool.json | 3 ++- .../examples/CreateIpFirewallRule.json | 12 ++++++++++++ .../stable/2021-06-01/firewallRule.json | 6 ++++++ .../stable/2021-06-01/sqlPool.json | 17 +++++++++++------ .../stable/2021-06-01/sqlServer.json | 3 ++- 8 files changed, 38 insertions(+), 15 deletions(-) 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 c0050abafc32..170517b8061a 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 @@ -18,9 +18,7 @@ "collation": "", "sourceDatabaseId": "", "recoverableDatabaseId": "", - "restorePointInTime": "1970-01-01T00:00:00.000Z", - "createMode": "", - "creationDate": "1970-01-01T00:00:00.000Z" + "createMode": "" } } }, 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 326f530eb098..ed7b56839d81 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 @@ -6880,10 +6880,10 @@ "disabledAlerts": { "description": "Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action", "type": "array", - "default": [], "items": { "type": "string" - } + }, + "readOnly": true }, "emailAddresses": { "description": "Specifies an array of e-mail addresses to which the alert is sent.", 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 045a9a5fa4df..bf669f209236 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 @@ -1414,10 +1414,10 @@ "disabledAlerts": { "description": "Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action", "type": "array", - "default": [], "items": { "type": "string" - } + }, + "readOnly": true }, "emailAddresses": { "description": "Specifies an array of e-mail addresses to which the alert is sent.", 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 1493ec75ee66..a89de2201e28 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", 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..a7fee721a441 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,18 @@ } } }, + "202": { + "body": { + "id": "/subscriptions/01234567-89ab-4def-0123-456789abcdef/resourceGroups/ExampleResourceGroup/providers/Microsoft.Synapse/workspaces/ExampleWorkspace/firewallRules/ExampleIpFirewallRule", + "type": "Microsoft.Synapse/workspaces/firewallRules", + "name": "ExampleIpFirewallRule", + "properties": { + "startIpAddress": "10.0.0.0", + "endIpAddress": "10.0.0.254", + "provisioningState": "Provisioning" + } + } + }, "default": { "body": { "error": { 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..a4a4b65046e5 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,12 @@ }, "description": "" }, + "202": { + "schema": { + "$ref": "#/definitions/IpFirewallRuleInfo" + }, + "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/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlPool.json index 21165e52d55a..31c992c7ce5b 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 @@ -5353,7 +5353,8 @@ "restorePointInTime": { "type": "string", "description": "Snapshot time to restore", - "format": "date-time" + "format": "date-time", + "readOnly": true }, "createMode": { "type": "string", @@ -5383,13 +5384,15 @@ "description": "The storage account type used to store backups for this sql pool.", "enum": [ "GRS", - "LRS" + "LRS", + "ZRS" ], "type": "string", "x-ms-enum": { "name": "StorageAccountType", "modelAsString": true - } + }, + "default": "LRS" }, "sourceDatabaseDeletionDate": { "type": "string", @@ -6113,13 +6116,14 @@ "type": "array", "items": { "type": "string" - } + }, + "readOnly": true }, "storageAccountSubscriptionId": { "format": "uuid", "description": "Specifies the blob storage subscription Id.", "type": "string", - "default": "" + "readOnly": true }, "isStorageSecondaryKeyInUse": { "description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.", @@ -6127,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", + "readOnly": true } } }, 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 9b7ccd79aa0e..e14de6aec0d7 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", + "readOnly": true }, "isStorageSecondaryKeyInUse": { "description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.", From 6cea2358042f8685228539e81d5ea930fc84e44b Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Tue, 21 Dec 2021 16:04:23 +0530 Subject: [PATCH 06/13] More Correctness changes --- .../preview/2021-06-01-preview/bigDataPool.json | 4 ---- .../2021-06-01-preview/integrationRuntime.json | 17 ++++++++++++++--- .../preview/2021-06-01-preview/sqlPool.json | 2 +- .../preview/2021-06-01-preview/sqlServer.json | 2 +- .../stable/2021-06-01/bigDataPool.json | 4 ++++ .../2021-06-01/examples/UpdateSqlPool.json | 1 - .../stable/2021-06-01/integrationRuntime.json | 4 ++-- .../stable/2021-06-01/sqlPool.json | 6 +++--- .../stable/2021-06-01/sqlServer.json | 2 +- .../stable/2021-06-01/workspace.json | 2 +- 10 files changed, 27 insertions(+), 17 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 0f236816749c..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 @@ -576,10 +576,6 @@ "filename": { "type": "string", "description": "The filename of the library requirements file." - }, - "configurationType": { - "type": "string", - "description": "The configuration type of the library requirements file." } } }, 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 2a721b06245f..d4dfd776c90e 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 @@ -1388,7 +1388,7 @@ "$ref": "#/definitions/ManagedIntegrationRuntimeTypeProperties" }, "managedVirtualNetwork": { - "description": "Managed integration runtime properties.", + "description": "Managed integration runtime managed virtual network.", "x-ms-client-flatten": true, "$ref": "#/definitions/ManagedIntegrationRuntimeManagedVirtualNetworkReference" } @@ -2259,9 +2259,20 @@ "type": "string", "format": "date-time", "readOnly": true + }, + "serviceRegion": { + "description": "The service region for this integration runtime.", + "type": "string" + }, + "newerVersions": { + "description": "The newer versions on download center", + "type": "array", + "items": { + "description": "The newer versions", + "type": "string" + } } - } - }, + }, "IntegrationRuntimeAutoUpdate": { "description": "The state of integration runtime auto update.", "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 ed7b56839d81..ab77b58c502e 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 @@ -6883,7 +6883,7 @@ "items": { "type": "string" }, - "readOnly": true + "default": [] }, "emailAddresses": { "description": "Specifies an array of e-mail addresses to which the alert is sent.", 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 bf669f209236..e09a89be39fa 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 @@ -1417,7 +1417,7 @@ "items": { "type": "string" }, - "readOnly": true + "default": [] }, "emailAddresses": { "description": "Specifies an array of e-mail addresses to which the alert is sent.", 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 a89de2201e28..9be793ec3191 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 @@ -615,6 +615,10 @@ "filename": { "type": "string", "description": "The filename of the library requirements file." + }, + "configurationType": { + "type": "string", + "description": "The configuration type of the library requirements file." } } } 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 d4ffc920279e..a788b1ce306b 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 @@ -18,7 +18,6 @@ "collation": "", "sourceDatabaseId": "", "recoverableDatabaseId": "", - "restorePointInTime": "1970-01-01T00:00:00.000Z", "createMode": "" } } 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 fd6838d07ab4..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 @@ -1388,7 +1388,7 @@ "$ref": "#/definitions/ManagedIntegrationRuntimeTypeProperties" }, "managedVirtualNetwork": { - "description": "Managed integration runtime properties.", + "description": "Managed integration runtime managed virtual network.", "x-ms-client-flatten": true, "$ref": "#/definitions/ManagedIntegrationRuntimeManagedVirtualNetworkReference" } 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 31c992c7ce5b..b3bb4d572ce8 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 @@ -6117,13 +6117,13 @@ "items": { "type": "string" }, - "readOnly": true + "default": [] }, "storageAccountSubscriptionId": { "format": "uuid", "description": "Specifies the blob storage subscription Id.", "type": "string", - "readOnly": true + "default": "" }, "isStorageSecondaryKeyInUse": { "description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.", @@ -6132,7 +6132,7 @@ "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", - "readOnly": true + "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 e14de6aec0d7..48a8b7b5f306 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 @@ -1238,7 +1238,7 @@ "format": "uuid", "description": "Specifies the blob storage subscription Id.", "type": "string", - "readOnly": true + "default": "" }, "isStorageSecondaryKeyInUse": { "description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.", 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 2fdd1c1b914d..745d72fa2c61 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 @@ -1217,7 +1217,7 @@ "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", - "default": "" + "default": "" }, "provisioningState": { "description": "Resource provisioning state", From 5a94d860834f31021f7a45f110760d92fbeb612b Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Tue, 21 Dec 2021 16:43:23 +0530 Subject: [PATCH 07/13] Lint changes --- .../preview/2021-06-01-preview/integrationRuntime.json | 7 ++++--- .../Microsoft.Synapse/stable/2021-06-01/sqlPool.json | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 d4dfd776c90e..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 @@ -2261,18 +2261,19 @@ "readOnly": true }, "serviceRegion": { - "description": "The service region for this integration runtime.", + "description": "The service region of the integration runtime", "type": "string" }, "newerVersions": { - "description": "The newer versions on download center", + "description": "The newer versions on download center.", "type": "array", "items": { "description": "The newer versions", "type": "string" } } - }, + } + }, "IntegrationRuntimeAutoUpdate": { "description": "The state of integration runtime auto update.", "type": "string", 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 b3bb4d572ce8..01c25a6e28c1 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 @@ -6116,8 +6116,7 @@ "type": "array", "items": { "type": "string" - }, - "default": [] + } }, "storageAccountSubscriptionId": { "format": "uuid", From cf4c3f618be5f910b4730e296d57a4ff22631b19 Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Tue, 21 Dec 2021 16:57:00 +0530 Subject: [PATCH 08/13] Lint Diff Fix --- .../Microsoft.Synapse/preview/2021-06-01-preview/sqlPool.json | 3 +-- .../preview/2021-06-01-preview/sqlServer.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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 ab77b58c502e..51cfa4d910ca 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 @@ -6882,8 +6882,7 @@ "type": "array", "items": { "type": "string" - }, - "default": [] + } }, "emailAddresses": { "description": "Specifies an array of e-mail addresses to which the alert is sent.", 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 e09a89be39fa..230d69c79afd 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 @@ -1416,8 +1416,7 @@ "type": "array", "items": { "type": "string" - }, - "default": [] + } }, "emailAddresses": { "description": "Specifies an array of e-mail addresses to which the alert is sent.", From 6fdef7c9a1b6d62d79a54faa73ed3c428206b0c7 Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Wed, 22 Dec 2021 18:25:29 +0530 Subject: [PATCH 09/13] Suggestions Incoporation --- .../preview/2021-06-01-preview/sqlPool.json | 6 +++--- .../preview/2021-06-01-preview/sqlServer.json | 3 ++- .../Microsoft.Synapse/stable/2021-06-01/sqlPool.json | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) 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 51cfa4d910ca..a871670da676 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 @@ -5383,8 +5383,7 @@ "description": "The storage account type used to store backups for this sql pool.", "enum": [ "GRS", - "LRS", - "ZRS" + "LRS" ], "type": "string", "x-ms-enum": { @@ -6882,7 +6881,8 @@ "type": "array", "items": { "type": "string" - } + }, + "default": [""] }, "emailAddresses": { "description": "Specifies an array of e-mail addresses to which the alert is sent.", 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 230d69c79afd..64fd663f540d 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 @@ -1416,7 +1416,8 @@ "type": "array", "items": { "type": "string" - } + }, + "default": [ "" ] }, "emailAddresses": { "description": "Specifies an array of e-mail addresses to which the alert is sent.", 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 01c25a6e28c1..d735f1d3cbfb 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 @@ -5384,15 +5384,14 @@ "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": "LRS" + "default": "GRS" }, "sourceDatabaseDeletionDate": { "type": "string", @@ -6116,7 +6115,8 @@ "type": "array", "items": { "type": "string" - } + }, + "default": [""] }, "storageAccountSubscriptionId": { "format": "uuid", From 2fc1d36ff440591552f5eeb27e943714fdc7e971 Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Thu, 23 Dec 2021 11:00:02 +0530 Subject: [PATCH 10/13] Review Comment Incoporation --- .../2021-06-01-preview/examples/UpdateSqlPool.json | 5 +---- .../preview/2021-06-01-preview/sqlPool.json | 3 +-- .../preview/2021-06-01-preview/sqlServer.json | 6 ++++-- .../2021-06-01/examples/CreateIpFirewallRule.json | 13 +------------ .../stable/2021-06-01/examples/UpdateSqlPool.json | 5 +---- .../stable/2021-06-01/firewallRule.json | 2 +- .../stable/2021-06-01/sqlPool.json | 3 +-- .../stable/2021-06-01/sqlServer.json | 3 +++ 8 files changed, 13 insertions(+), 27 deletions(-) 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 170517b8061a..d72e4df9f4b6 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 @@ -15,10 +15,7 @@ }, "properties": { "maxSizeBytes": 0, - "collation": "", - "sourceDatabaseId": "", - "recoverableDatabaseId": "", - "createMode": "" + "collation": "" } } }, 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 a871670da676..cbbfb2a4c3c5 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 @@ -6881,8 +6881,7 @@ "type": "array", "items": { "type": "string" - }, - "default": [""] + } }, "emailAddresses": { "description": "Specifies an array of e-mail addresses to which the alert is sent.", 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 64fd663f540d..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 @@ -1416,8 +1416,7 @@ "type": "array", "items": { "type": "string" - }, - "default": [ "" ] + } }, "emailAddresses": { "description": "Specifies an array of e-mail addresses to which the alert is sent.", @@ -1489,6 +1488,9 @@ "ServerVulnerabilityAssessmentProperties": { "description": "Properties of a server Vulnerability Assessment.", "type": "object", + "required": [ + "storageContainerPath" + ], "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/examples/CreateIpFirewallRule.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateIpFirewallRule.json index a7fee721a441..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,18 +37,7 @@ } } }, - "202": { - "body": { - "id": "/subscriptions/01234567-89ab-4def-0123-456789abcdef/resourceGroups/ExampleResourceGroup/providers/Microsoft.Synapse/workspaces/ExampleWorkspace/firewallRules/ExampleIpFirewallRule", - "type": "Microsoft.Synapse/workspaces/firewallRules", - "name": "ExampleIpFirewallRule", - "properties": { - "startIpAddress": "10.0.0.0", - "endIpAddress": "10.0.0.254", - "provisioningState": "Provisioning" - } - } - }, + "202": {}, "default": { "body": { "error": { 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 a788b1ce306b..457d948cfc8e 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 @@ -15,10 +15,7 @@ }, "properties": { "maxSizeBytes": 0, - "collation": "", - "sourceDatabaseId": "", - "recoverableDatabaseId": "", - "createMode": "" + "collation": "" } } }, 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 a4a4b65046e5..ee36214ac4ff 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 @@ -121,7 +121,7 @@ }, "202": { "schema": { - "$ref": "#/definitions/IpFirewallRuleInfo" + "type": "object" }, "description": "" }, 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 d735f1d3cbfb..d89c3e7f4c37 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 @@ -6115,8 +6115,7 @@ "type": "array", "items": { "type": "string" - }, - "default": [""] + } }, "storageAccountSubscriptionId": { "format": "uuid", 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 48a8b7b5f306..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 @@ -1497,6 +1497,9 @@ "ServerVulnerabilityAssessmentProperties": { "description": "Properties of a server Vulnerability Assessment.", "type": "object", + "required": [ + "storageContainerPath" + ], "properties": { "storageContainerPath": { "description": "A blob storage container path to hold the scan results (e.g. https://myStorage.blob.core.windows.net/VaScans/).", From 00eda9b5ca57d38ddca2e0635a837a0c64036339 Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Thu, 23 Dec 2021 14:33:48 +0530 Subject: [PATCH 11/13] Review Comments Incoporation 1 --- .../examples/UpdateSqlPool.json | 3 +- .../preview/2021-06-01-preview/sqlPool.json | 3 +- .../stable/2021-06-01/bigDataPool.json | 33 +++++++++++++++++-- .../2021-06-01/examples/UpdateSqlPool.json | 3 +- .../stable/2021-06-01/firewallRule.json | 4 +-- .../stable/2021-06-01/sqlPool.json | 6 ++-- .../stable/2021-06-01/workspace.json | 3 +- 7 files changed, 40 insertions(+), 15 deletions(-) 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 d72e4df9f4b6..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 @@ -15,7 +15,8 @@ }, "properties": { "maxSizeBytes": 0, - "collation": "" + "collation": "", + "restorePointInTime": "1970-01-01T00:00:00.000Z" } } }, 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 cbbfb2a4c3c5..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 @@ -5352,8 +5352,7 @@ "restorePointInTime": { "type": "string", "description": "Snapshot time to restore", - "format": "date-time", - "readOnly": true + "format": "date-time" }, "createMode": { "type": "string", 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 9be793ec3191..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 @@ -451,7 +451,7 @@ } }, "sparkConfigProperties": { - "$ref": "#/definitions/LibraryRequirements", + "$ref": "#/definitions/SparkConfigProperties", "description": "Spark configuration file to specify additional properties" }, "sparkVersion": { @@ -615,10 +615,39 @@ "filename": { "type": "string", "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 configuration type of the library requirements file." + "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/UpdateSqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/UpdateSqlPool.json index 457d948cfc8e..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 @@ -15,7 +15,8 @@ }, "properties": { "maxSizeBytes": 0, - "collation": "" + "collation": "", + "restorePointInTime": "1970-01-01T00:00:00.000Z" } } }, 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 ee36214ac4ff..a1ac0c9411c6 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 @@ -120,9 +120,7 @@ "description": "" }, "202": { - "schema": { - "type": "object" - }, + "type": "object", "description": "" }, "default": { 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 d89c3e7f4c37..d7ecf2ba0098 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 @@ -5353,8 +5353,7 @@ "restorePointInTime": { "type": "string", "description": "Snapshot time to restore", - "format": "date-time", - "readOnly": true + "format": "date-time" }, "createMode": { "type": "string", @@ -5396,8 +5395,7 @@ "sourceDatabaseDeletionDate": { "type": "string", "description": "Specifies the time that the sql pool was deleted", - "format": "date-time", - "readOnly": true + "format": "date-time" } } }, 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 745d72fa2c61..e26add6ab441 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 @@ -1216,8 +1216,7 @@ }, "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", - "default": "" + "type": "string" }, "provisioningState": { "description": "Resource provisioning state", From e83a12be266aa2f907bb7339ce1d2e3772c79d3a Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Thu, 23 Dec 2021 16:16:23 +0530 Subject: [PATCH 12/13] Semantic fix --- .../Microsoft.Synapse/stable/2021-06-01/firewallRule.json | 1 - 1 file changed, 1 deletion(-) 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 a1ac0c9411c6..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 @@ -120,7 +120,6 @@ "description": "" }, "202": { - "type": "object", "description": "" }, "default": { From bafcc3c0dde5cd2dcf6c733967aebf1ce2003173 Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Thu, 23 Dec 2021 18:07:49 +0530 Subject: [PATCH 13/13] Review Comment Incoporation --- .../Microsoft.Synapse/stable/2021-06-01/sqlPool.json | 6 +++++- .../stable/2021-06-01/workspace.json | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) 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 d7ecf2ba0098..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 @@ -5395,7 +5395,11 @@ "sourceDatabaseDeletionDate": { "type": "string", "description": "Specifies the time that the sql pool was deleted", - "format": "date-time" + "format": "date-time", + "x-ms-mutability": [ + "create", + "read" + ] } } }, 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 e26add6ab441..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 @@ -1216,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", @@ -1295,7 +1299,11 @@ "x-ms-enum": { "name": "WorkspacePublicNetworkAccess", "modelAsString": true - } + }, + "x-ms-mutability": [ + "create", + "read" + ] }, "cspWorkspaceAdminProperties": { "description": "Initial workspace AAD admin properties for a CSP subscription",