Skip to content

Commit a8a7961

Browse files
sparatalaanandanthony
sparatala
authored and
anandanthony
committed
Fix RoundTrip error (Azure#21116)
* Fix RoundTrip error * Fix model validation error * Fix missing definition ManagedIntegrationRuntime * Fix Invalid_Type error * Revert "Fix Invalid_Type error" This reverts commit 3216774.
1 parent 1669475 commit a8a7961

File tree

8 files changed

+91
-18
lines changed

8 files changed

+91
-18
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2667,7 +2667,11 @@
26672667
},
26682668
"workspaceUID": {
26692669
"type": "string",
2670-
"description": "The workspace unique identifier."
2670+
"description": "The workspace unique identifier.",
2671+
"x-ms-mutability": [
2672+
"create",
2673+
"read"
2674+
]
26712675
}
26722676
},
26732677
"description": "Class representing the Kusto pool properties."

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,12 @@
15381538
},
15391539
"isStorageSecondaryKeyInUse": {
15401540
"description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.",
1541-
"type": "boolean"
1541+
"type": "boolean",
1542+
"x-ms-mutability": [
1543+
"create",
1544+
"read",
1545+
"update"
1546+
]
15421547
},
15431548
"isAzureMonitorTargetEnabled": {
15441549
"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",

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,12 @@
12611261
},
12621262
"linkedAccessCheckOnTargetResource": {
12631263
"description": "Linked Access Check On Target Resource",
1264-
"type": "boolean"
1264+
"type": "boolean",
1265+
"x-ms-mutability": [
1266+
"create",
1267+
"read",
1268+
"update"
1269+
]
12651270
},
12661271
"allowedAadTenantIdsForLinking": {
12671272
"description": "Allowed Aad Tenant Ids For Linking",

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,12 @@
446446
"nodeCount": {
447447
"type": "integer",
448448
"format": "int32",
449-
"description": "The number of nodes in the Big Data pool."
449+
"description": "The number of nodes in the Big Data pool.",
450+
"x-ms-mutability": [
451+
"create",
452+
"read",
453+
"update"
454+
]
450455
},
451456
"libraryRequirements": {
452457
"$ref": "#/definitions/LibraryRequirements",

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1432,7 +1432,11 @@
14321432
},
14331433
"id": {
14341434
"description": "The id of the managed virtual network.",
1435-
"type": "string"
1435+
"type": "string",
1436+
"x-ms-mutability": [
1437+
"create",
1438+
"read"
1439+
]
14361440
}
14371441
}
14381442
},

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

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,7 +1556,7 @@
15561556
},
15571557
"default": {
15581558
"schema": {
1559-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse"
1559+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
15601560
},
15611561
"description": ""
15621562
}
@@ -5328,7 +5328,12 @@
53285328
"properties": {
53295329
"tier": {
53305330
"type": "string",
5331-
"description": "The service tier"
5331+
"description": "The service tier",
5332+
"x-ms-mutability": [
5333+
"create",
5334+
"read",
5335+
"update"
5336+
]
53325337
},
53335338
"name": {
53345339
"type": "string",
@@ -6165,19 +6170,31 @@
61656170
"retentionDays": {
61666171
"format": "int32",
61676172
"description": "Specifies the number of days to keep in the audit logs in the storage account.",
6168-
"type": "integer"
6173+
"type": "integer",
6174+
"x-ms-mutability": [
6175+
"create",
6176+
"read"
6177+
]
61696178
},
61706179
"auditActionsAndGroups": {
61716180
"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 <object> 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)",
61726181
"type": "array",
61736182
"items": {
6174-
"type": "string"
6183+
"type": "string",
6184+
"x-ms-mutability": [
6185+
"create",
6186+
"read"
6187+
]
61756188
}
61766189
},
61776190
"storageAccountSubscriptionId": {
61786191
"format": "uuid",
61796192
"description": "Specifies the blob storage subscription Id.",
6180-
"type": "string"
6193+
"type": "string",
6194+
"x-ms-mutability": [
6195+
"create",
6196+
"read"
6197+
]
61816198
},
61826199
"isStorageSecondaryKeyInUse": {
61836200
"description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.",

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,7 +1522,11 @@
15221522
"retentionDays": {
15231523
"format": "int32",
15241524
"description": "Specifies the number of days to keep in the audit logs in the storage account.",
1525-
"type": "integer"
1525+
"type": "integer",
1526+
"x-ms-mutability": [
1527+
"create",
1528+
"read"
1529+
]
15261530
},
15271531
"auditActionsAndGroups": {
15281532
"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 <object> 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)",
@@ -1534,7 +1538,11 @@
15341538
"storageAccountSubscriptionId": {
15351539
"format": "uuid",
15361540
"description": "Specifies the blob storage subscription Id.",
1537-
"type": "string"
1541+
"type": "string",
1542+
"x-ms-mutability": [
1543+
"create",
1544+
"read"
1545+
]
15381546
},
15391547
"isStorageSecondaryKeyInUse": {
15401548
"description": "Specifies whether storageAccountAccessKey value is the storage's secondary key.",
@@ -1642,7 +1650,11 @@
16421650
},
16431651
"storageEndpoint": {
16441652
"description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs.",
1645-
"type": "string"
1653+
"type": "string",
1654+
"x-ms-mutability": [
1655+
"create",
1656+
"read"
1657+
]
16461658
},
16471659
"storageAccountAccessKey": {
16481660
"description": "Specifies the identifier key of the Threat Detection audit storage account.",
@@ -1709,7 +1721,11 @@
17091721
"properties": {
17101722
"storageContainerPath": {
17111723
"description": "A blob storage container path to hold the scan results (e.g. https://myStorage.blob.core.windows.net/VaScans/).",
1712-
"type": "string"
1724+
"type": "string",
1725+
"x-ms-mutability": [
1726+
"create",
1727+
"read"
1728+
]
17131729
},
17141730
"storageContainerSasKey": {
17151731
"description": "A shared access signature (SAS Key) that has read and write access to the blob container specified in 'storageContainerPath' parameter. If 'storageAccountAccessKey' isn't specified, StorageContainerSasKey is required.",

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

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -898,11 +898,19 @@
898898
},
899899
"administratorType": {
900900
"description": "Workspace active directory administrator type",
901-
"type": "string"
901+
"type": "string",
902+
"x-ms-mutability": [
903+
"create",
904+
"read"
905+
]
902906
},
903907
"sid": {
904908
"description": "Object ID of the workspace active directory administrator",
905-
"type": "string"
909+
"type": "string",
910+
"x-ms-mutability": [
911+
"create",
912+
"read"
913+
]
906914
}
907915
}
908916
},
@@ -1095,7 +1103,12 @@
10951103
},
10961104
"linkedAccessCheckOnTargetResource": {
10971105
"description": "Linked Access Check On Target Resource",
1098-
"type": "boolean"
1106+
"type": "boolean",
1107+
"x-ms-mutability": [
1108+
"create",
1109+
"read",
1110+
"update"
1111+
]
10991112
},
11001113
"allowedAadTenantIdsForLinking": {
11011114
"description": "Allowed Aad Tenant Ids For Linking",
@@ -1182,7 +1195,11 @@
11821195
"properties": {
11831196
"initialWorkspaceAdminObjectId": {
11841197
"description": "AAD object ID of initial workspace admin",
1185-
"type": "string"
1198+
"type": "string",
1199+
"x-ms-mutability": [
1200+
"create",
1201+
"read"
1202+
]
11861203
}
11871204
}
11881205
},

0 commit comments

Comments
 (0)