From 163e64f8fa11feea8e8e06b6cfaf5c7cdc06d815 Mon Sep 17 00:00:00 2001 From: Tiger Sun Date: Wed, 28 Jul 2021 16:57:56 -0700 Subject: [PATCH 1/4] added properties.minorVersion for 2020-02-14-preview API swagger and examples --- .../preview/2020-02-14-preview/examples/ServerCreate.json | 2 ++ .../examples/ServerCreatePointInTimeRestore.json | 2 ++ .../preview/2020-02-14-preview/examples/ServerGet.json | 1 + .../2020-02-14-preview/examples/ServerGetWithVnet.json | 1 + .../preview/2020-02-14-preview/examples/ServerList.json | 4 ++++ .../examples/ServerListByResourceGroup.json | 3 +++ .../preview/2020-02-14-preview/examples/ServerUpdate.json | 1 + .../examples/ServerUpdateWithCustomerMaintenanceWindow.json | 1 + .../preview/2020-02-14-preview/postgresql.json | 5 +++++ 9 files changed, 20 insertions(+) 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 ce333211ec73..0d5a14bdcfaa 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 @@ -42,6 +42,7 @@ "properties": { "administratorLogin": "cloudsa", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "NotEnabled", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", @@ -85,6 +86,7 @@ "properties": { "administratorLogin": "cloudsa", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "NotEnabled", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", 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 4c902f67f91c..22610f5372f5 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 @@ -25,6 +25,7 @@ "properties": { "administratorLogin": "cloudsa", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "NotEnabled", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", @@ -57,6 +58,7 @@ "properties": { "administratorLogin": "cloudsa", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "NotEnabled", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", 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 b28535f615a1..258db06f118b 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 @@ -15,6 +15,7 @@ "properties": { "administratorLogin": "cloudsa", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "NotEnabled", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", 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 13126f937fcc..2882060b36bc 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 @@ -15,6 +15,7 @@ "properties": { "administratorLogin": "cloudsa", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "NotEnabled", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", 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 d8917699f069..5311c6b73e49 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 @@ -16,6 +16,7 @@ "properties": { "administratorLogin": "cloudsa", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "NotEnabled", "fullyQualifiedDomainName": "pgtestsvc1.postgres.database.azure.com", @@ -51,6 +52,7 @@ "properties": { "administratorLogin": "cloudsa", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "Healthy", "fullyQualifiedDomainName": "pgtestsvc2.postgres.database.azure.com", @@ -85,6 +87,7 @@ "properties": { "administratorLogin": "cloudsa", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "FailingOver", "fullyQualifiedDomainName": "pgtestsvc3.postgres.database.azure.com", @@ -119,6 +122,7 @@ "properties": { "administratorLogin": "cloudsa", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "ReplicatingData", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", 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 276e20cb04d8..321ec0241db1 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 @@ -17,6 +17,7 @@ "properties": { "administratorLogin": "testuser", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "NotEnabled", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", @@ -49,6 +50,7 @@ "properties": { "administratorLogin": "testuser", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "Healthy", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", @@ -80,6 +82,7 @@ "properties": { "administratorLogin": "testuser", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "Healthy", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", 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 60c9bb9ae82a..f9e584d1536e 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 @@ -29,6 +29,7 @@ "properties": { "administratorLogin": "cloudsa", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "NotEnabled", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", 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 26e2330fffcd..89f1798a68ef 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 @@ -26,6 +26,7 @@ "properties": { "administratorLogin": "cloudsa", "version": "12", + "minorVersion": "6", "state": "Ready", "haState": "NotEnabled", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", 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 6cb9ac4eb47d..1ccf884d8dc5 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 @@ -1189,6 +1189,11 @@ "$ref": "#/definitions/ServerVersion", "description": "PostgreSQL Server version." }, + "minorVersion": { + "type": "string", + "description": "The minor version of the server.", + "readOnly": true + }, "state": { "type": "string", "description": "A state of a server that is visible to user.", From e4a01f8340d1cba73526960eefcedee55a43d1fe Mon Sep 17 00:00:00 2001 From: Tiger Sun Date: Thu, 29 Jul 2021 11:39:24 -0700 Subject: [PATCH 2/4] add geoRedundantBackup and earliestRestoreDate --- .../preview/2020-02-14-preview/examples/ServerUpdate.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 f9e584d1536e..0de3aa8aedee 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 @@ -37,7 +37,9 @@ "publicNetworkAccess": "Enabled", "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 20 + "backupRetentionDays": 20, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "delegatedSubnetArguments": {}, "privateDnsZoneArguments": {}, From 88ed59c034a4c60881dc63ac519dcf6607cbb4c0 Mon Sep 17 00:00:00 2001 From: Tiger Sun Date: Thu, 29 Jul 2021 13:58:24 -0700 Subject: [PATCH 3/4] add geoRedundantBackup and earliestRestoreDate 2 --- .../examples/ServerCreate.json | 12 +++++++--- .../ServerCreatePointInTimeRestore.json | 8 +++++-- .../examples/ServerGet.json | 4 +++- .../examples/ServerGetWithVnet.json | 4 +++- .../examples/ServerList.json | 16 ++++++++++---- .../examples/ServerListByResourceGroup.json | 12 +++++++--- ...erUpdateWithCustomerMaintenanceWindow.json | 4 +++- .../2020-02-14-preview/postgresql.json | 22 +++++++++++++++++++ 8 files changed, 67 insertions(+), 15 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 0d5a14bdcfaa..37edff0a0f4b 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 @@ -23,7 +23,9 @@ }, "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "availabilityZone": "1" }, @@ -57,7 +59,9 @@ }, "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "availabilityZone": "1", "standbyAvailabilityZone": "2", @@ -101,7 +105,9 @@ }, "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "availabilityZone": "1", "standbyAvailabilityZone": "2", 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 22610f5372f5..19cf8646d050 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 @@ -36,7 +36,9 @@ "privateDnsZoneArguments": {}, "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "availabilityZone": "1" }, @@ -69,7 +71,9 @@ "privateDnsZoneArguments": {}, "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "availabilityZone": "1" }, 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 258db06f118b..a26ae19ab61d 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 @@ -23,7 +23,9 @@ "publicNetworkAccess": "Enabled", "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Enabled", "availabilityZone": "1", 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 2882060b36bc..f29bf8788912 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 @@ -29,7 +29,9 @@ }, "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "availabilityZone": "1" }, 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 5311c6b73e49..bc201a8eae76 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 @@ -24,7 +24,9 @@ "publicNetworkAccess": "Enabled", "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Enabled", "availabilityZone": "1", @@ -60,7 +62,9 @@ "publicNetworkAccess": "Enabled", "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Disabled", "availabilityZone": "2", @@ -95,7 +99,9 @@ "publicNetworkAccess": "Enabled", "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Disabled", "availabilityZone": "3", @@ -130,7 +136,9 @@ "publicNetworkAccess": "Enabled", "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Enabled", "availabilityZone": "1", 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 321ec0241db1..b82b4783ff26 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 @@ -25,7 +25,9 @@ "publicNetworkAccess": "Enabled", "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Enabled", "availabilityZone": "1", @@ -58,7 +60,9 @@ "publicNetworkAccess": "Enabled", "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Disabled", "availabilityZone": "2", @@ -90,7 +94,9 @@ "publicNetworkAccess": "Enabled", "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 7 + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Disabled", "availabilityZone": "3", 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 89f1798a68ef..e7acead42059 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 @@ -34,7 +34,9 @@ "publicNetworkAccess": "Enabled", "storageProfile": { "storageMB": 524288, - "backupRetentionDays": 20 + "backupRetentionDays": 20, + "geoRedundantBackup": "Disabled", + "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "delegatedSubnetArguments": {}, "privateDnsZoneArguments": {}, 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 1ccf884d8dc5..9c22eab07545 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 @@ -1473,6 +1473,28 @@ "type": "integer", "format": "int32", "description": "Max storage allowed for a server." + }, + "geoRedundantBackup": { + "type": "string", + "description": "A value indicating whether Geo-Redundant backup is enabled on the server.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "GeoRedundantBackupEnum", + "modelAsString": true + }, + "x-ms-mutability": [ + "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" From e0aba081651c25103e7bbb7e19dbefa67097eade Mon Sep 17 00:00:00 2001 From: Tiger Sun Date: Fri, 30 Jul 2021 12:59:57 -0700 Subject: [PATCH 4/4] Updated MaintenanceWindow standbyCount logBackupStorageSku availabilityZone --- .../examples/ServerCreate.json | 7 ++- .../ServerCreatePointInTimeRestore.json | 4 ++ .../examples/ServerGet.json | 2 + .../examples/ServerGetWithVnet.json | 3 ++ .../examples/ServerList.json | 8 ++++ .../examples/ServerListByResourceGroup.json | 6 +++ .../examples/ServerUpdate.json | 2 + ...erUpdateWithCustomerMaintenanceWindow.json | 2 + .../2020-02-14-preview/postgresql.json | 44 +++++++++++++++++-- 9 files changed, 73 insertions(+), 5 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 37edff0a0f4b..d1a8a6ac4f47 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 @@ -24,8 +24,7 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7, - "geoRedundantBackup": "Disabled", - "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" + "geoRedundantBackup": "Disabled" }, "availabilityZone": "1" }, @@ -51,6 +50,8 @@ "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", "haEnabled": "Enabled", + "standbyCount": 1, + "logBackupStorageSku": "Standard_ZRS", "delegatedSubnetArguments": { "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, @@ -97,6 +98,8 @@ "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", "haEnabled": "Enabled", + "standbyCount": 1, + "logBackupStorageSku": "Standard_ZRS", "delegatedSubnetArguments": { "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, 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 19cf8646d050..d3099cf93649 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 @@ -32,6 +32,8 @@ "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", "haEnabled": "Disabled", + "standbyCount": 0, + "logBackupStorageSku": "Standard_ZRS", "delegatedSubnetArguments": {}, "privateDnsZoneArguments": {}, "storageProfile": { @@ -67,6 +69,8 @@ "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", "haEnabled": "Disabled", + "standbyCount": 0, + "logBackupStorageSku": "Standard_ZRS", "delegatedSubnetArguments": {}, "privateDnsZoneArguments": {}, "storageProfile": { 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 a26ae19ab61d..49b06b0c9626 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 @@ -28,6 +28,8 @@ "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Enabled", + "standbyCount": 1, + "logBackupStorageSku": "Standard_ZRS", "availabilityZone": "1", "standbyAvailabilityZone": "2", "maintenanceWindow": { 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 f29bf8788912..c66b083767e8 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 @@ -18,6 +18,9 @@ "minorVersion": "6", "state": "Ready", "haState": "NotEnabled", + "haEnabled": "Disabled", + "standbyCount": 0, + "logBackupStorageSku": "Standard_ZRS", "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", "displayName": "demosingleserver", "publicNetworkAccess": "Disabled", 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 bc201a8eae76..39feb87e4930 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 @@ -29,6 +29,8 @@ "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Enabled", + "standbyCount": 1, + "logBackupStorageSku": "Standard_ZRS", "availabilityZone": "1", "standbyAvailabilityZone": "2", "maintenanceWindow": { @@ -67,6 +69,8 @@ "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Disabled", + "standbyCount": 0, + "logBackupStorageSku": "Standard_ZRS", "availabilityZone": "2", "maintenanceWindow": { "dayOfWeek": 0, @@ -104,6 +108,8 @@ "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Disabled", + "standbyCount": 0, + "logBackupStorageSku": "Standard_ZRS", "availabilityZone": "3", "maintenanceWindow": { "dayOfWeek": 0, @@ -141,6 +147,8 @@ "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Enabled", + "standbyCount": 1, + "logBackupStorageSku": "Standard_ZRS", "availabilityZone": "1", "standbyAvailabilityZone": "2", "maintenanceWindow": { 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 b82b4783ff26..1e59f192b218 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 @@ -30,6 +30,8 @@ "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Enabled", + "standbyCount": 1, + "logBackupStorageSku": "Standard_ZRS", "availabilityZone": "1", "standbyAvailabilityZone": "2", "maintenanceWindow": { @@ -65,6 +67,8 @@ "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Disabled", + "standbyCount": 0, + "logBackupStorageSku": "Standard_ZRS", "availabilityZone": "2", "maintenanceWindow": { "dayOfWeek": 0, @@ -99,6 +103,8 @@ "earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00" }, "haEnabled": "Disabled", + "standbyCount": 0, + "logBackupStorageSku": "Standard_ZRS", "availabilityZone": "3", "maintenanceWindow": { "dayOfWeek": 0, 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 0de3aa8aedee..ebcb79ed0800 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 @@ -44,6 +44,8 @@ "delegatedSubnetArguments": {}, "privateDnsZoneArguments": {}, "haEnabled": "Disabled", + "standbyCount": 0, + "logBackupStorageSku": "Standard_ZRS", "availabilityZone": "1" }, "location": "westus", 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 e7acead42059..034dbc34e0f7 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 @@ -41,6 +41,8 @@ "delegatedSubnetArguments": {}, "privateDnsZoneArguments": {}, "haEnabled": "Disabled", + "standbyCount": 0, + "logBackupStorageSku": "Standard_ZRS", "availabilityZone": "1", "maintenanceWindow": { "dayOfWeek": 0, 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 9c22eab07545..2f9d84b9b974 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 @@ -1257,7 +1257,11 @@ }, "maintenanceWindow": { "$ref": "#/definitions/MaintenanceWindow", - "description": "Maintenance window of a server." + "description": "Maintenance window of a server.", + "x-ms-mutability": [ + "update", + "read" + ] }, "haEnabled": { "type": "string", @@ -1271,6 +1275,23 @@ "modelAsString": false } }, + "standbyCount": { + "type": "integer", + "format": "int32", + "description": "The number of standbys.", + "x-ms-mutability": [ + "update", + "read" + ] + }, + "logBackupStorageSku": { + "type": "string", + "description": "The log backup storage sku of the server.", + "x-ms-mutability": [ + "create", + "read" + ] + }, "sourceServerName": { "type": "string", "description": "The source PostgreSQL server name to restore from." @@ -1290,7 +1311,11 @@ }, "availabilityZone": { "type": "string", - "description": "availability Zone information of the server." + "description": "availability Zone information of the server.", + "x-ms-mutability": [ + "create", + "read" + ] }, "standbyAvailabilityZone": { "type": "string", @@ -1414,9 +1439,22 @@ "modelAsString": false } }, + "standbyCount": { + "type": "integer", + "format": "int32", + "description": "The number of standbys.", + "x-ms-mutability": [ + "update", + "read" + ] + }, "maintenanceWindow": { "$ref": "#/definitions/MaintenanceWindow", - "description": "Maintenance window of a server." + "description": "Maintenance window of a server.", + "x-ms-mutability": [ + "update", + "read" + ] } } },