Skip to content

Commit 350d1c0

Browse files
xunsun-commitsxunsun-commits
authored
Fix S360 bugs for swagger FSPG 2020-02-14-preview, 2021-06-01-preview and 2021-06-01 APIs (#15946)
* Changed FSPG RestartParameter.failoverMode from string to enum for API 2021-06-01, 2021-06-01-preview, and 2021-06-15-privatepreview * Change enum first letter to lower case * Change to upper case * Fix S360 bugs for swagger FSPG 2020-02-14-preview, 2021-06-01-preview and 2021-06-01 APIs
1 parent 21ebd57 commit 350d1c0

File tree

11 files changed

+61
-53
lines changed

11 files changed

+61
-53
lines changed

‎specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@
6161
"storageProfile": {
6262
"storageMB": 524288,
6363
"backupRetentionDays": 7,
64-
"geoRedundantBackup": "Disabled",
65-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
64+
"geoRedundantBackup": "Disabled"
6665
},
6766
"availabilityZone": "1",
6867
"standbyAvailabilityZone": "2",
@@ -71,7 +70,8 @@
7170
"startHour": 0,
7271
"startMinute": 0,
7372
"customWindow": "Disabled"
74-
}
73+
},
74+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
7575
},
7676
"location": "westus",
7777
"tags": {
@@ -109,8 +109,7 @@
109109
"storageProfile": {
110110
"storageMB": 524288,
111111
"backupRetentionDays": 7,
112-
"geoRedundantBackup": "Disabled",
113-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
112+
"geoRedundantBackup": "Disabled"
114113
},
115114
"availabilityZone": "1",
116115
"standbyAvailabilityZone": "2",
@@ -119,7 +118,8 @@
119118
"startHour": 0,
120119
"startMinute": 0,
121120
"customWindow": "Disabled"
122-
}
121+
},
122+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
123123
},
124124
"location": "westus",
125125
"tags": {

‎specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
"storageProfile": {
4040
"storageMB": 524288,
4141
"backupRetentionDays": 7,
42-
"geoRedundantBackup": "Disabled",
43-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
42+
"geoRedundantBackup": "Disabled"
4443
},
45-
"availabilityZone": "1"
44+
"availabilityZone": "1",
45+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
4646
},
4747
"location": "westus",
4848
"tags": {
@@ -76,10 +76,10 @@
7676
"storageProfile": {
7777
"storageMB": 524288,
7878
"backupRetentionDays": 7,
79-
"geoRedundantBackup": "Disabled",
80-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
79+
"geoRedundantBackup": "Disabled"
8180
},
82-
"availabilityZone": "1"
81+
"availabilityZone": "1",
82+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
8383
},
8484
"location": "westus",
8585
"tags": {

‎specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGet.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
"storageProfile": {
2525
"storageMB": 524288,
2626
"backupRetentionDays": 7,
27-
"geoRedundantBackup": "Disabled",
28-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
27+
"geoRedundantBackup": "Disabled"
2928
},
3029
"haEnabled": "Enabled",
3130
"standbyCount": 1,
@@ -37,7 +36,8 @@
3736
"startHour": 0,
3837
"startMinute": 0,
3938
"customWindow": "Disabled"
40-
}
39+
},
40+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
4141
},
4242
"location": "westus",
4343
"tags": {

‎specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
"storageProfile": {
3434
"storageMB": 524288,
3535
"backupRetentionDays": 7,
36-
"geoRedundantBackup": "Disabled",
37-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
36+
"geoRedundantBackup": "Disabled"
3837
},
39-
"availabilityZone": "1"
38+
"availabilityZone": "1",
39+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
4040
},
4141
"location": "westus",
4242
"tags": {

‎specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerList.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"storageProfile": {
2626
"storageMB": 524288,
2727
"backupRetentionDays": 7,
28-
"geoRedundantBackup": "Disabled",
29-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
28+
"geoRedundantBackup": "Disabled"
3029
},
3130
"haEnabled": "Enabled",
3231
"standbyCount": 1,
@@ -38,7 +37,8 @@
3837
"startHour": 0,
3938
"startMinute": 0,
4039
"customWindow": "Disabled"
41-
}
40+
},
41+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
4242
},
4343
"location": "westus",
4444
"tags": {
@@ -65,8 +65,7 @@
6565
"storageProfile": {
6666
"storageMB": 524288,
6767
"backupRetentionDays": 7,
68-
"geoRedundantBackup": "Disabled",
69-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
68+
"geoRedundantBackup": "Disabled"
7069
},
7170
"haEnabled": "Disabled",
7271
"standbyCount": 0,
@@ -77,7 +76,8 @@
7776
"startHour": 10,
7877
"startMinute": 30,
7978
"customWindow": "Enabled"
80-
}
79+
},
80+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
8181
},
8282
"location": "westus",
8383
"tags": {
@@ -104,8 +104,7 @@
104104
"storageProfile": {
105105
"storageMB": 524288,
106106
"backupRetentionDays": 7,
107-
"geoRedundantBackup": "Disabled",
108-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
107+
"geoRedundantBackup": "Disabled"
109108
},
110109
"haEnabled": "Disabled",
111110
"standbyCount": 0,
@@ -116,7 +115,8 @@
116115
"startHour": 0,
117116
"startMinute": 0,
118117
"customWindow": "Disabled"
119-
}
118+
},
119+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
120120
},
121121
"location": "westus",
122122
"tags": {
@@ -143,8 +143,7 @@
143143
"storageProfile": {
144144
"storageMB": 524288,
145145
"backupRetentionDays": 7,
146-
"geoRedundantBackup": "Disabled",
147-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
146+
"geoRedundantBackup": "Disabled"
148147
},
149148
"haEnabled": "Enabled",
150149
"standbyCount": 1,
@@ -156,7 +155,8 @@
156155
"startHour": 0,
157156
"startMinute": 0,
158157
"customWindow": "Disabled"
159-
}
158+
},
159+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
160160
},
161161
"location": "westus",
162162
"tags": {

‎specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerListByResourceGroup.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
"storageProfile": {
2727
"storageMB": 524288,
2828
"backupRetentionDays": 7,
29-
"geoRedundantBackup": "Disabled",
30-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
29+
"geoRedundantBackup": "Disabled"
3130
},
3231
"haEnabled": "Enabled",
3332
"standbyCount": 1,
@@ -39,7 +38,8 @@
3938
"startHour": 10,
4039
"startMinute": 30,
4140
"customWindow": "Enabled"
42-
}
41+
},
42+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
4343
},
4444
"location": "westus",
4545
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc1",
@@ -63,8 +63,7 @@
6363
"storageProfile": {
6464
"storageMB": 524288,
6565
"backupRetentionDays": 7,
66-
"geoRedundantBackup": "Disabled",
67-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
66+
"geoRedundantBackup": "Disabled"
6867
},
6968
"haEnabled": "Disabled",
7069
"standbyCount": 0,
@@ -75,7 +74,8 @@
7574
"startHour": 0,
7675
"startMinute": 0,
7776
"customWindow": "Disabled"
78-
}
77+
},
78+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
7979
},
8080
"location": "westus",
8181
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/pgtestsvc2",
@@ -99,8 +99,7 @@
9999
"storageProfile": {
100100
"storageMB": 524288,
101101
"backupRetentionDays": 7,
102-
"geoRedundantBackup": "Disabled",
103-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
102+
"geoRedundantBackup": "Disabled"
104103
},
105104
"haEnabled": "Disabled",
106105
"standbyCount": 0,
@@ -111,7 +110,8 @@
111110
"startHour": 10,
112111
"startMinute": 30,
113112
"customWindow": "Enabled"
114-
}
113+
},
114+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
115115
},
116116
"location": "westus",
117117
"tags": {

‎specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
"storageProfile": {
3939
"storageMB": 524288,
4040
"backupRetentionDays": 20,
41-
"geoRedundantBackup": "Disabled",
42-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
41+
"geoRedundantBackup": "Disabled"
4342
},
4443
"delegatedSubnetArguments": {},
4544
"privateDnsZoneArguments": {},
4645
"haEnabled": "Disabled",
4746
"standbyCount": 0,
4847
"logBackupStorageSku": "Standard_ZRS",
49-
"availabilityZone": "1"
48+
"availabilityZone": "1",
49+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
5050
},
5151
"location": "westus",
5252
"tags": {

‎specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
"storageProfile": {
3636
"storageMB": 524288,
3737
"backupRetentionDays": 20,
38-
"geoRedundantBackup": "Disabled",
39-
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
38+
"geoRedundantBackup": "Disabled"
4039
},
4140
"delegatedSubnetArguments": {},
4241
"privateDnsZoneArguments": {},
@@ -49,7 +48,8 @@
4948
"startHour": 8,
5049
"startMinute": 0,
5150
"customWindow": "Enabled"
52-
}
51+
},
52+
"earliestRestoreDate": "2021-05-26T23:07:25.8166567+00:00"
5353
},
5454
"location": "westus",
5555
"tags": {

‎specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/postgresql.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,6 +1343,12 @@
13431343
}
13441344
}
13451345
},
1346+
"earliestRestoreDate": {
1347+
"type": "string",
1348+
"format": "date-time",
1349+
"description": "The earliest restore point time (ISO8601 format) for server.",
1350+
"readOnly": true
1351+
},
13461352
"createMode": {
13471353
"type": "string",
13481354
"description": "The mode to create a new PostgreSQL server.",
@@ -1527,12 +1533,6 @@
15271533
"create",
15281534
"read"
15291535
]
1530-
},
1531-
"earliestRestoreDate": {
1532-
"type": "string",
1533-
"format": "date-time",
1534-
"description": "The earliest restore point time (ISO8601 format) for server.",
1535-
"readOnly": true
15361536
}
15371537
},
15381538
"description": "Storage Profile properties of a server"

‎specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1525,7 +1525,11 @@
15251525
},
15261526
"maintenanceWindow": {
15271527
"$ref": "#/definitions/MaintenanceWindow",
1528-
"description": "Maintenance window properties of a server."
1528+
"description": "Maintenance window properties of a server.",
1529+
"x-ms-mutability": [
1530+
"update",
1531+
"read"
1532+
]
15291533
},
15301534
"createMode": {
15311535
"type": "string",

0 commit comments

Comments
 (0)