From 92635abe4e6361b8495eafa3ba266d9125e51d78 Mon Sep 17 00:00:00 2001 From: Achyuth Maddala Sitaram <66455292+achyuth-ms@users.noreply.github.com> Date: Tue, 8 Apr 2025 19:33:47 -0700 Subject: [PATCH] merging #30969, #31008, #31181 for new API release --- .../2021-11-01-preview/ManagedInstances.json | 6 +- .../2022-02-01-preview/ManagedInstances.json | 6 +- .../2022-05-01-preview/ManagedInstances.json | 6 +- .../2022-08-01-preview/ManagedInstances.json | 6 +- .../2022-11-01-preview/ManagedInstances.json | 6 +- .../2023-02-01-preview/ManagedInstances.json | 6 +- .../2023-05-01-preview/ManagedInstances.json | 6 +- .../2023-08-01-preview/ManagedInstances.json | 6 +- .../2024-05-01-preview/ManagedInstances.json | 6 +- .../DatabaseOperations.json | 3 +- .../LocationCapabilities.json | 5 ++ .../2024-08-01-preview/ManagedInstances.json | 6 +- .../examples/ListDatabaseOperations.json | 67 ++++++++++++++++--- .../LocationCapabilityListByLocation.json | 4 +- 14 files changed, 77 insertions(+), 62 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2021-11-01-preview/ManagedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2021-11-01-preview/ManagedInstances.json index 87b21314f14c..1a98a9719a61 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2021-11-01-preview/ManagedInstances.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2021-11-01-preview/ManagedInstances.json @@ -998,11 +998,7 @@ "x-ms-enum": { "name": "BackupStorageRedundancy", "modelAsString": true - }, - "x-ms-mutability": [ - "read", - "create" - ] + } }, "zoneRedundant": { "description": "Whether or not the multi-az is enabled.", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/ManagedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/ManagedInstances.json index f12f47eee13b..d0a92ef7815b 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/ManagedInstances.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/ManagedInstances.json @@ -998,11 +998,7 @@ "x-ms-enum": { "name": "BackupStorageRedundancy", "modelAsString": true - }, - "x-ms-mutability": [ - "read", - "create" - ] + } }, "zoneRedundant": { "description": "Whether or not the multi-az is enabled.", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-05-01-preview/ManagedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-05-01-preview/ManagedInstances.json index 5edd69cc42ec..df2e9b9b15f4 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-05-01-preview/ManagedInstances.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-05-01-preview/ManagedInstances.json @@ -999,11 +999,7 @@ "x-ms-enum": { "name": "BackupStorageRedundancy", "modelAsString": true - }, - "x-ms-mutability": [ - "read", - "create" - ] + } }, "zoneRedundant": { "description": "Whether or not the multi-az is enabled.", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-08-01-preview/ManagedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-08-01-preview/ManagedInstances.json index 7c4f4e3ea1d9..0cebf2912c17 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-08-01-preview/ManagedInstances.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-08-01-preview/ManagedInstances.json @@ -1089,11 +1089,7 @@ "x-ms-enum": { "name": "BackupStorageRedundancy", "modelAsString": true - }, - "x-ms-mutability": [ - "read", - "create" - ] + } }, "zoneRedundant": { "description": "Whether or not the multi-az is enabled.", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-11-01-preview/ManagedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-11-01-preview/ManagedInstances.json index 79bb2a54583d..493950d3d0b0 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-11-01-preview/ManagedInstances.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-11-01-preview/ManagedInstances.json @@ -1096,11 +1096,7 @@ "x-ms-enum": { "name": "BackupStorageRedundancy", "modelAsString": true - }, - "x-ms-mutability": [ - "read", - "create" - ] + } }, "zoneRedundant": { "description": "Whether or not the multi-az is enabled.", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/ManagedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/ManagedInstances.json index bf279a24059c..df1673ddc64b 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/ManagedInstances.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/ManagedInstances.json @@ -1189,11 +1189,7 @@ "x-ms-enum": { "name": "BackupStorageRedundancy", "modelAsString": true - }, - "x-ms-mutability": [ - "read", - "create" - ] + } }, "zoneRedundant": { "description": "Whether or not the multi-az is enabled.", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-05-01-preview/ManagedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-05-01-preview/ManagedInstances.json index ae40350485ce..eba46192d23b 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-05-01-preview/ManagedInstances.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-05-01-preview/ManagedInstances.json @@ -1197,11 +1197,7 @@ "x-ms-enum": { "name": "BackupStorageRedundancy", "modelAsString": true - }, - "x-ms-mutability": [ - "read", - "create" - ] + } }, "zoneRedundant": { "description": "Whether or not the multi-az is enabled.", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-08-01-preview/ManagedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-08-01-preview/ManagedInstances.json index 5092147381ca..f137c7410029 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-08-01-preview/ManagedInstances.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-08-01-preview/ManagedInstances.json @@ -1223,11 +1223,7 @@ "x-ms-enum": { "name": "BackupStorageRedundancy", "modelAsString": true - }, - "x-ms-mutability": [ - "read", - "create" - ] + } }, "zoneRedundant": { "description": "Whether or not the multi-az is enabled.", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2024-05-01-preview/ManagedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2024-05-01-preview/ManagedInstances.json index 4563f4da3428..2feff0b55207 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2024-05-01-preview/ManagedInstances.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2024-05-01-preview/ManagedInstances.json @@ -1223,11 +1223,7 @@ "x-ms-enum": { "name": "BackupStorageRedundancy", "modelAsString": true - }, - "x-ms-mutability": [ - "read", - "create" - ] + } }, "zoneRedundant": { "description": "Whether or not the multi-az is enabled.", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/DatabaseOperations.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/DatabaseOperations.json index 862b59619277..b263e4142e65 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/DatabaseOperations.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/DatabaseOperations.json @@ -277,7 +277,9 @@ "phase": { "description": "The operation phase.", "enum": [ + "LogTransitionInProgress", "Copying", + "BuildingHyperscaleComponents", "Catchup", "WaitingForCutover", "CutoverInProgress" @@ -330,4 +332,3 @@ } } } - diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/LocationCapabilities.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/LocationCapabilities.json index 2724fb5ddf59..07d3de2dbcc2 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/LocationCapabilities.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/LocationCapabilities.json @@ -787,6 +787,11 @@ "readOnly": true, "x-ms-identifiers": [] }, + "isZoneResilientProvisioningAllowed": { + "description": "Whether or not the subscription is allowed to provision zone resilient resources.", + "type": "boolean", + "readOnly": true + }, "status": { "description": "The status of the capability.", "enum": [ diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/ManagedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/ManagedInstances.json index 843309dbb364..38f9b25c2f49 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/ManagedInstances.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/ManagedInstances.json @@ -1263,11 +1263,7 @@ "x-ms-enum": { "name": "BackupStorageRedundancy", "modelAsString": true - }, - "x-ms-mutability": [ - "read", - "create" - ] + } }, "zoneRedundant": { "description": "Whether or not the zone-redundancy is enabled.", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/examples/ListDatabaseOperations.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/examples/ListDatabaseOperations.json index 100d04463f75..571332f23393 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/examples/ListDatabaseOperations.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/examples/ListDatabaseOperations.json @@ -35,20 +35,70 @@ "databaseName": "testdb", "operation": "UpdateLogicalDatabase", "operationFriendlyName": "ALTER DATABASE", - "percentComplete": 19, + "percentComplete": 50, "serverName": "testsvr", - "startTime": "2023-02-13T06:25:23.67Z", + "startTime": "2024-09-27T05:42:30.097Z", "state": "InProgress", - "estimatedCompletionTime": "2023-02-17T14:30:30.71Z", - "description": "'UpdateLogicalDatabase' on database 'testdb', Source ServiceLevelObjective 'SQLDB_GP_Gen5_2', target ServiceLevelObjective 'SQLDB_HS_Gen5_2', target database MaxSize '32'GB", + "estimatedCompletionTime": "2024-09-27T12:44:33.953Z", + "description": "'UpdateLogicalDatabase' on database 'testdb', Source ServiceLevelObjective 'SQLDB_BC_Gen5_6', target ServiceLevelObjective 'SQLDB_HS_Gen5_6', target database MaxSize '32'GB", "isCancellable": true, "operationPhaseDetails": { - "phase": "WaitingForCutover", + "phase": "LogTransitionInProgress", + "phaseInformation": { + "currentStep": "1", + "totalSteps": "6", + "logTransitioningInProgress": "True" + } + } + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/operations/55555555-5555-5555-5555-555555555555", + "name": "55555555-5555-5555-5555-555555555555", + "type": "Microsoft.Sql/servers/databases/operations", + "properties": { + "databaseName": "testdb", + "operation": "UpdateLogicalDatabase", + "operationFriendlyName": "ALTER DATABASE", + "percentComplete": 50, + "serverName": "testsvr", + "startTime": "2024-09-27T05:13:37.84Z", + "state": "InProgress", + "estimatedCompletionTime": "2024-09-27T12:28:10.83Z", + "description": "'UpdateLogicalDatabase' on database 'testdb', Source ServiceLevelObjective 'SQLDB_GP_Gen5_6', target ServiceLevelObjective 'SQLDB_HS_Gen5_6', target database MaxSize '32'GB", + "isCancellable": true, + "operationPhaseDetails": { + "phase": "BuildingHyperscaleComponents", "phaseInformation": { "currentStep": "3", - "totalSteps": "4", - "performCutoverBy": "2023-02-17T11:57:06.71Z", - "dataDelayInMb": "31" + "totalSteps": "6", + "creatingPrimaryHyperscaleComponents": "True" + } + } + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/operations/55555555-5555-5555-5555-555555555555", + "name": "55555555-5555-5555-5555-555555555555", + "type": "Microsoft.Sql/servers/databases/operations", + "properties": { + "databaseName": "testdb", + "operation": "UpdateLogicalDatabase", + "operationFriendlyName": "ALTER DATABASE", + "percentComplete": 50, + "serverName": "testsvr", + "startTime": "2024-09-27T07:31:56.087Z", + "state": "InProgress", + "estimatedCompletionTime": "2024-09-27T14:59:54.38Z", + "description": "'UpdateLogicalDatabase' on database 'testdb', Source ServiceLevelObjective 'SQLDB_GP_Gen5_6', target ServiceLevelObjective 'SQLDB_HS_Gen5_6', target database MaxSize '32'GB", + "isCancellable": true, + "operationPhaseDetails": { + "phase": "WaitingForCutover", + "phaseInformation": { + "currentStep": "5", + "totalSteps": "6", + "dataDelayInMb": "0", + "performCutoverBy": "2024-09-30T07:43:55.08Z" } } } @@ -77,4 +127,3 @@ } } } - diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/examples/LocationCapabilityListByLocation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/examples/LocationCapabilityListByLocation.json index 3a2a9e98df68..674bd7e0a75d 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/examples/LocationCapabilityListByLocation.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2024-08-01-preview/examples/LocationCapabilityListByLocation.json @@ -3249,9 +3249,9 @@ ] } ], - "status": "Available" + "status": "Available", + "isZoneResilientProvisioningAllowed": false } } } } -