Skip to content

Fix S360 bugs for swagger FSPG 2020-02-14-preview API #15459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jianyexi merged 4 commits into from
Aug 4, 2021
Merged

Fix S360 bugs for swagger FSPG 2020-02-14-preview API #15459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
163e64f
added properties.minorVersion for 2020-02-14-preview API swagger and …
xunsun-commits Jul 28, 2021
e4a01f8
add geoRedundantBackup and earliestRestoreDate
xunsun-commits Jul 29, 2021
88ed59c
add geoRedundantBackup and earliestRestoreDate 2
xunsun-commits Jul 29, 2021
e0aba08
Updated MaintenanceWindow standbyCount logBackupStorageSku availabili…
xunsun-commits Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions ...e-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled"
},
"availabilityZone": "1"
},
Expand All @@ -42,12 +43,15 @@
"properties": {
"administratorLogin": "cloudsa",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "NotEnabled",
"fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com",
"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"
},
Expand All @@ -56,7 +60,9 @@
},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"availabilityZone": "1",
"standbyAvailabilityZone": "2",
Expand Down Expand Up @@ -85,12 +91,15 @@
"properties": {
"administratorLogin": "cloudsa",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "NotEnabled",
"fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com",
"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"
},
Expand All @@ -99,7 +108,9 @@
},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"availabilityZone": "1",
"standbyAvailabilityZone": "2",
Expand Down
14 changes: 12 additions & 2 deletions ...t.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,22 @@
"properties": {
"administratorLogin": "cloudsa",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "NotEnabled",
"fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Enabled",
"haEnabled": "Disabled",
"standbyCount": 0,
"logBackupStorageSku": "Standard_ZRS",
"delegatedSubnetArguments": {},
"privateDnsZoneArguments": {},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"availabilityZone": "1"
},
Expand All @@ -57,17 +62,22 @@
"properties": {
"administratorLogin": "cloudsa",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "NotEnabled",
"fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Enabled",
"haEnabled": "Disabled",
"standbyCount": 0,
"logBackupStorageSku": "Standard_ZRS",
"delegatedSubnetArguments": {},
"privateDnsZoneArguments": {},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"availabilityZone": "1"
},
Expand Down
7 changes: 6 additions & 1 deletion ...urce-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,21 @@
"properties": {
"administratorLogin": "cloudsa",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "NotEnabled",
"fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Enabled",
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"haEnabled": "Enabled",
"standbyCount": 1,
"logBackupStorageSku": "Standard_ZRS",
"availabilityZone": "1",
"standbyAvailabilityZone": "2",
"maintenanceWindow": {
Expand Down
8 changes: 7 additions & 1 deletion ...ager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@
"properties": {
"administratorLogin": "cloudsa",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "NotEnabled",
"haEnabled": "Disabled",
"standbyCount": 0,
"logBackupStorageSku": "Standard_ZRS",
"fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Disabled",
Expand All @@ -28,7 +32,9 @@
},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"availabilityZone": "1"
},
Expand Down
28 changes: 24 additions & 4 deletions ...rce-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,21 @@
"properties": {
"administratorLogin": "cloudsa",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "NotEnabled",
"fullyQualifiedDomainName": "pgtestsvc1.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Enabled",
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"haEnabled": "Enabled",
"standbyCount": 1,
"logBackupStorageSku": "Standard_ZRS",
"availabilityZone": "1",
"standbyAvailabilityZone": "2",
"maintenanceWindow": {
Expand All @@ -51,16 +56,21 @@
"properties": {
"administratorLogin": "cloudsa",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "Healthy",
"fullyQualifiedDomainName": "pgtestsvc2.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Enabled",
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"haEnabled": "Disabled",
"standbyCount": 0,
"logBackupStorageSku": "Standard_ZRS",
"availabilityZone": "2",
"maintenanceWindow": {
"dayOfWeek": 0,
Expand All @@ -85,16 +95,21 @@
"properties": {
"administratorLogin": "cloudsa",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "FailingOver",
"fullyQualifiedDomainName": "pgtestsvc3.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Enabled",
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"haEnabled": "Disabled",
"standbyCount": 0,
"logBackupStorageSku": "Standard_ZRS",
"availabilityZone": "3",
"maintenanceWindow": {
"dayOfWeek": 0,
Expand All @@ -119,16 +134,21 @@
"properties": {
"administratorLogin": "cloudsa",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "ReplicatingData",
"fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Enabled",
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"haEnabled": "Enabled",
"standbyCount": 1,
"logBackupStorageSku": "Standard_ZRS",
"availabilityZone": "1",
"standbyAvailabilityZone": "2",
"maintenanceWindow": {
Expand Down
21 changes: 18 additions & 3 deletions ...rosoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,21 @@
"properties": {
"administratorLogin": "testuser",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "NotEnabled",
"fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Enabled",
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"haEnabled": "Enabled",
"standbyCount": 1,
"logBackupStorageSku": "Standard_ZRS",
"availabilityZone": "1",
"standbyAvailabilityZone": "2",
"maintenanceWindow": {
Expand All @@ -49,16 +54,21 @@
"properties": {
"administratorLogin": "testuser",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "Healthy",
"fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Enabled",
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"haEnabled": "Disabled",
"standbyCount": 0,
"logBackupStorageSku": "Standard_ZRS",
"availabilityZone": "2",
"maintenanceWindow": {
"dayOfWeek": 0,
Expand All @@ -80,16 +90,21 @@
"properties": {
"administratorLogin": "testuser",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "Healthy",
"fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Enabled",
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
"backupRetentionDays": 7,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"haEnabled": "Disabled",
"standbyCount": 0,
"logBackupStorageSku": "Standard_ZRS",
"availabilityZone": "3",
"maintenanceWindow": {
"dayOfWeek": 0,
Expand Down
7 changes: 6 additions & 1 deletion ...e-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,23 @@
"properties": {
"administratorLogin": "cloudsa",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "NotEnabled",
"fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Enabled",
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 20
"backupRetentionDays": 20,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"delegatedSubnetArguments": {},
"privateDnsZoneArguments": {},
"haEnabled": "Disabled",
"standbyCount": 0,
"logBackupStorageSku": "Standard_ZRS",
"availabilityZone": "1"
},
"location": "westus",
Expand Down
7 changes: 6 additions & 1 deletion ...greSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,23 @@
"properties": {
"administratorLogin": "cloudsa",
"version": "12",
"minorVersion": "6",
"state": "Ready",
"haState": "NotEnabled",
"fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com",
"displayName": "demosingleserver",
"publicNetworkAccess": "Enabled",
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 20
"backupRetentionDays": 20,
"geoRedundantBackup": "Disabled",
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
},
"delegatedSubnetArguments": {},
"privateDnsZoneArguments": {},
"haEnabled": "Disabled",
"standbyCount": 0,
"logBackupStorageSku": "Standard_ZRS",
"availabilityZone": "1",
"maintenanceWindow": {
"dayOfWeek": 0,
Expand Down
Loading