From 93c9a9af8c9a9f4f85ccffe70e50a3c48cd003b7 Mon Sep 17 00:00:00 2001 From: Tiger Sun Date: Mon, 23 Aug 2021 11:31:49 -0700 Subject: [PATCH 1/4] Changed FSPG RestartParameter.failoverMode from string to enum for API 2021-06-01, 2021-06-01-preview, and 2021-06-15-privatepreview --- .../preview/2021-06-01-preview/postgresql.json | 12 +++++++++++- .../2021-06-15-privatepreview/postgresql.json | 12 +++++++++++- .../stable/2021-06-01/postgresql.json | 12 +++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json index 566ba6bb956a..253af0941bb2 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json @@ -2021,7 +2021,17 @@ }, "failoverMode": { "type": "string", - "description": "Failover mode." + "description": "Failover mode.", + "enum": [ + "PlannedFailover", + "ForcedFailover", + "PlannedSwitchover", + "ForcedSwitchover" + ], + "x-ms-enum": { + "name": "FailoverMode", + "modelAsString": true + } } }, "description": "Represents server restart parameters." diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/postgresql.json index 5c6b70dd81ad..89dd34aa0680 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/postgresql.json @@ -2044,7 +2044,17 @@ }, "failoverMode": { "type": "string", - "description": "Failover mode." + "description": "Failover mode.", + "enum": [ + "PlannedFailover", + "ForcedFailover", + "PlannedSwitchover", + "ForcedSwitchover" + ], + "x-ms-enum": { + "name": "FailoverMode", + "modelAsString": true + } } }, "description": "Represents server restart parameters." diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json index 7771cb9a91ac..03b5b297e044 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json @@ -2021,7 +2021,17 @@ }, "failoverMode": { "type": "string", - "description": "Failover mode." + "description": "Failover mode.", + "enum": [ + "PlannedFailover", + "ForcedFailover", + "PlannedSwitchover", + "ForcedSwitchover" + ], + "x-ms-enum": { + "name": "FailoverMode", + "modelAsString": true + } } }, "description": "Represents server restart parameters." From 51127e6593a2867939391619e032378d1e806168 Mon Sep 17 00:00:00 2001 From: Tiger Sun Date: Mon, 23 Aug 2021 11:50:22 -0700 Subject: [PATCH 2/4] Change enum first letter to lower case --- .../preview/2021-06-01-preview/postgresql.json | 8 ++++---- .../preview/2021-06-15-privatepreview/postgresql.json | 8 ++++---- .../stable/2021-06-01/postgresql.json | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json index 253af0941bb2..e687114bccec 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json @@ -2023,10 +2023,10 @@ "type": "string", "description": "Failover mode.", "enum": [ - "PlannedFailover", - "ForcedFailover", - "PlannedSwitchover", - "ForcedSwitchover" + "plannedFailover", + "forcedFailover", + "plannedSwitchover", + "forcedSwitchover" ], "x-ms-enum": { "name": "FailoverMode", diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/postgresql.json index 89dd34aa0680..0ecde42ad635 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/postgresql.json @@ -2046,10 +2046,10 @@ "type": "string", "description": "Failover mode.", "enum": [ - "PlannedFailover", - "ForcedFailover", - "PlannedSwitchover", - "ForcedSwitchover" + "plannedFailover", + "forcedFailover", + "plannedSwitchover", + "forcedSwitchover" ], "x-ms-enum": { "name": "FailoverMode", diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json index 03b5b297e044..bc3820e43d7a 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json @@ -2023,10 +2023,10 @@ "type": "string", "description": "Failover mode.", "enum": [ - "PlannedFailover", - "ForcedFailover", - "PlannedSwitchover", - "ForcedSwitchover" + "plannedFailover", + "forcedFailover", + "plannedSwitchover", + "forcedSwitchover" ], "x-ms-enum": { "name": "FailoverMode", From 0e5705126cb794d8f38a90d7cfea62c9793b88f4 Mon Sep 17 00:00:00 2001 From: Tiger Sun Date: Mon, 23 Aug 2021 11:58:51 -0700 Subject: [PATCH 3/4] Change to upper case --- .../examples/ServerRestartWithFailover.json | 2 +- .../preview/2021-06-01-preview/postgresql.json | 8 ++++---- .../examples/ServerRestartWithFailover.json | 2 +- .../preview/2021-06-15-privatepreview/postgresql.json | 8 ++++---- .../2021-06-01/examples/ServerRestartWithFailover.json | 2 +- .../stable/2021-06-01/postgresql.json | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/examples/ServerRestartWithFailover.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/examples/ServerRestartWithFailover.json index fdb11d0b1e70..1bd243151993 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/examples/ServerRestartWithFailover.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/examples/ServerRestartWithFailover.json @@ -6,7 +6,7 @@ "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "parameters": { "restartWithFailover": true, - "failoverMode": "forcedFailover" + "failoverMode": "ForcedFailover" } }, "responses": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json index e687114bccec..253af0941bb2 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json @@ -2023,10 +2023,10 @@ "type": "string", "description": "Failover mode.", "enum": [ - "plannedFailover", - "forcedFailover", - "plannedSwitchover", - "forcedSwitchover" + "PlannedFailover", + "ForcedFailover", + "PlannedSwitchover", + "ForcedSwitchover" ], "x-ms-enum": { "name": "FailoverMode", diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/examples/ServerRestartWithFailover.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/examples/ServerRestartWithFailover.json index d928707a0575..c1fe54619905 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/examples/ServerRestartWithFailover.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/examples/ServerRestartWithFailover.json @@ -6,7 +6,7 @@ "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "parameters": { "restartWithFailover": true, - "failoverMode": "forcedFailover" + "failoverMode": "ForcedFailover" } }, "responses": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/postgresql.json index 0ecde42ad635..89dd34aa0680 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-15-privatepreview/postgresql.json @@ -2046,10 +2046,10 @@ "type": "string", "description": "Failover mode.", "enum": [ - "plannedFailover", - "forcedFailover", - "plannedSwitchover", - "forcedSwitchover" + "PlannedFailover", + "ForcedFailover", + "PlannedSwitchover", + "ForcedSwitchover" ], "x-ms-enum": { "name": "FailoverMode", diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerRestartWithFailover.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerRestartWithFailover.json index f8f484379769..181ce503092d 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerRestartWithFailover.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerRestartWithFailover.json @@ -6,7 +6,7 @@ "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "parameters": { "restartWithFailover": true, - "failoverMode": "forcedFailover" + "failoverMode": "ForcedFailover" } }, "responses": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json index bc3820e43d7a..03b5b297e044 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json @@ -2023,10 +2023,10 @@ "type": "string", "description": "Failover mode.", "enum": [ - "plannedFailover", - "forcedFailover", - "plannedSwitchover", - "forcedSwitchover" + "PlannedFailover", + "ForcedFailover", + "PlannedSwitchover", + "ForcedSwitchover" ], "x-ms-enum": { "name": "FailoverMode", From 6cc31009ce9f114ba5e9502f9a336a630122bd1d Mon Sep 17 00:00:00 2001 From: Tiger Sun Date: Tue, 7 Sep 2021 16:42:17 -0700 Subject: [PATCH 4/4] Fix S360 bugs for swagger FSPG 2020-02-14-preview, 2021-06-01-preview and 2021-06-01 APIs --- .../examples/ServerCreate.json | 12 +++++----- .../ServerCreatePointInTimeRestore.json | 12 +++++----- .../examples/ServerGet.json | 6 ++--- .../examples/ServerGetWithVnet.json | 6 ++--- .../examples/ServerList.json | 24 +++++++++---------- .../examples/ServerListByResourceGroup.json | 18 +++++++------- .../examples/ServerUpdate.json | 6 ++--- ...erUpdateWithCustomerMaintenanceWindow.json | 6 ++--- .../2020-02-14-preview/postgresql.json | 12 +++++----- .../2021-06-01-preview/postgresql.json | 6 ++++- .../stable/2021-06-01/postgresql.json | 6 ++++- 11 files changed, 61 insertions(+), 53 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json index d1a8a6ac4f47..80c13593c935 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json @@ -61,8 +61,7 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "availabilityZone": "1", "standbyAvailabilityZone": "2", @@ -71,7 +70,8 @@ "startHour": 0, "startMinute": 0, "customWindow": "Disabled" - } + }, + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { @@ -109,8 +109,7 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "availabilityZone": "1", "standbyAvailabilityZone": "2", @@ -119,7 +118,8 @@ "startHour": 0, "startMinute": 0, "customWindow": "Disabled" - } + }, + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json index d3099cf93649..e4acc76d9b4e 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json @@ -39,10 +39,10 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, - "availabilityZone": "1" + "availabilityZone": "1", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { @@ -76,10 +76,10 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, - "availabilityZone": "1" + "availabilityZone": "1", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGet.json index 49b06b0c9626..6d5cd4c366b8 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGet.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGet.json @@ -24,8 +24,7 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "haEnabled": "Enabled", "standbyCount": 1, @@ -37,7 +36,8 @@ "startHour": 0, "startMinute": 0, "customWindow": "Disabled" - } + }, + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json index c66b083767e8..ff984cc1003a 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json @@ -33,10 +33,10 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, - "availabilityZone": "1" + "availabilityZone": "1", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerList.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerList.json index 39feb87e4930..221dc006130f 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerList.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerList.json @@ -25,8 +25,7 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "haEnabled": "Enabled", "standbyCount": 1, @@ -38,7 +37,8 @@ "startHour": 0, "startMinute": 0, "customWindow": "Disabled" - } + }, + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { @@ -65,8 +65,7 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "haEnabled": "Disabled", "standbyCount": 0, @@ -77,7 +76,8 @@ "startHour": 10, "startMinute": 30, "customWindow": "Enabled" - } + }, + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { @@ -104,8 +104,7 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "haEnabled": "Disabled", "standbyCount": 0, @@ -116,7 +115,8 @@ "startHour": 0, "startMinute": 0, "customWindow": "Disabled" - } + }, + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { @@ -143,8 +143,7 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "haEnabled": "Enabled", "standbyCount": 1, @@ -156,7 +155,8 @@ "startHour": 0, "startMinute": 0, "customWindow": "Disabled" - } + }, + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerListByResourceGroup.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerListByResourceGroup.json index 1e59f192b218..ae920a479ac3 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerListByResourceGroup.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerListByResourceGroup.json @@ -26,8 +26,7 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "haEnabled": "Enabled", "standbyCount": 1, @@ -39,7 +38,8 @@ "startHour": 10, "startMinute": 30, "customWindow": "Enabled" - } + }, + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc1", @@ -63,8 +63,7 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "haEnabled": "Disabled", "standbyCount": 0, @@ -75,7 +74,8 @@ "startHour": 0, "startMinute": 0, "customWindow": "Disabled" - } + }, + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/pgtestsvc2", @@ -99,8 +99,7 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "haEnabled": "Disabled", "standbyCount": 0, @@ -111,7 +110,8 @@ "startHour": 10, "startMinute": 30, "customWindow": "Enabled" - } + }, + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json index ebcb79ed0800..de8d96e7d363 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json @@ -38,15 +38,15 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 20, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "delegatedSubnetArguments": {}, "privateDnsZoneArguments": {}, "haEnabled": "Disabled", "standbyCount": 0, "logBackupStorageSku": "Standard_ZRS", - "availabilityZone": "1" + "availabilityZone": "1", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json index 034dbc34e0f7..4f81f84c834c 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json @@ -35,8 +35,7 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 20, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "delegatedSubnetArguments": {}, "privateDnsZoneArguments": {}, @@ -49,7 +48,8 @@ "startHour": 8, "startMinute": 0, "customWindow": "Enabled" - } + }, + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/postgresql.json index 2f9d84b9b974..632069ebe2be 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/postgresql.json @@ -1343,6 +1343,12 @@ } } }, + "earliestRestoreDate": { + "type": "string", + "format": "date-time", + "description": "The earliest restore point time (ISO8601 format) for server.", + "readOnly": true + }, "createMode": { "type": "string", "description": "The mode to create a new PostgreSQL server.", @@ -1527,12 +1533,6 @@ "create", "read" ] - }, - "earliestRestoreDate": { - "type": "string", - "format": "date-time", - "description": "The earliest restore point time (ISO8601 format) for server.", - "readOnly": true } }, "description": "Storage Profile properties of a server" diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json index 253af0941bb2..3baa3402d17a 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json @@ -1525,7 +1525,11 @@ }, "maintenanceWindow": { "$ref": "#/definitions/MaintenanceWindow", - "description": "Maintenance window properties of a server." + "description": "Maintenance window properties of a server.", + "x-ms-mutability": [ + "update", + "read" + ] }, "createMode": { "type": "string", diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json index 03b5b297e044..bb28f42fb9f2 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json @@ -1525,7 +1525,11 @@ }, "maintenanceWindow": { "$ref": "#/definitions/MaintenanceWindow", - "description": "Maintenance window properties of a server." + "description": "Maintenance window properties of a server.", + "x-ms-mutability": [ + "update", + "read" + ] }, "createMode": { "type": "string",