Skip to content

Commit 1e3988d

Browse files
Fix S360 items for FSPG swagger (#16727)
* 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 * Fix S360 item by adding default value to backupRetentionDays and maintenanceWindow * Fix s360 bugs * Undo supportedIops change, will change in RP side * Fix NameAvailability and ConfigurationProperties s360 bugs * Fix s360 bug for CloudError * Undo CloudError fix * Fix string default value * Remove server.tags because TrackedResource already has tags
1 parent 5d66051 commit 1e3988d

File tree

2 files changed

+136
-24
lines changed

2 files changed

+136
-24
lines changed

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

Lines changed: 68 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,14 +1403,17 @@
14031403
},
14041404
"storage": {
14051405
"$ref": "#/definitions/Storage",
1406+
"default": null,
14061407
"description": "Storage properties of a server."
14071408
},
14081409
"backup": {
14091410
"$ref": "#/definitions/Backup",
1411+
"default": null,
14101412
"description": "Backup properties of a server."
14111413
},
14121414
"network": {
14131415
"$ref": "#/definitions/Network",
1416+
"default": null,
14141417
"description": "Network properties of a server.",
14151418
"x-ms-mutability": [
14161419
"create",
@@ -1419,6 +1422,7 @@
14191422
},
14201423
"highAvailability": {
14211424
"$ref": "#/definitions/HighAvailability",
1425+
"default": null,
14221426
"description": "High availability properties of a server."
14231427
},
14241428
"maintenanceWindow": {
@@ -1447,6 +1451,7 @@
14471451
},
14481452
"availabilityZone": {
14491453
"type": "string",
1454+
"default": "",
14501455
"description": "availability zone information of the server.",
14511456
"x-ms-mutability": [
14521457
"create",
@@ -1470,13 +1475,6 @@
14701475
"create",
14711476
"update"
14721477
]
1473-
},
1474-
"tags": {
1475-
"type": "object",
1476-
"additionalProperties": {
1477-
"type": "string"
1478-
},
1479-
"description": "Application-specific metadata in the form of key-value pairs."
14801478
}
14811479
},
14821480
"description": "The properties of a server."
@@ -1509,19 +1507,26 @@
15091507
"properties": {
15101508
"administratorLoginPassword": {
15111509
"type": "string",
1510+
"x-ms-secret": true,
15121511
"format": "password",
1513-
"description": "The password of the administrator login."
1512+
"description": "The password of the administrator login.",
1513+
"x-ms-mutability": [
1514+
"update"
1515+
]
15141516
},
15151517
"storage": {
15161518
"$ref": "#/definitions/Storage",
1519+
"default": null,
15171520
"description": "Storage properties of a server."
15181521
},
15191522
"backup": {
15201523
"$ref": "#/definitions/Backup",
1524+
"default": null,
15211525
"description": "Backup properties of a server."
15221526
},
15231527
"highAvailability": {
15241528
"$ref": "#/definitions/HighAvailability",
1529+
"default": null,
15251530
"description": "High availability properties of a server."
15261531
},
15271532
"maintenanceWindow": {
@@ -1638,6 +1643,7 @@
16381643
},
16391644
"geoRedundantBackup": {
16401645
"type": "string",
1646+
"default": "Disabled",
16411647
"description": "A value indicating whether Geo-Redundant backup is enabled on the server.",
16421648
"enum": [
16431649
"Enabled",
@@ -1678,6 +1684,7 @@
16781684
},
16791685
"delegatedSubnetResourceId": {
16801686
"type": "string",
1687+
"default": "",
16811688
"description": "delegated subnet arm resource id.",
16821689
"x-ms-mutability": [
16831690
"create",
@@ -1686,6 +1693,7 @@
16861693
},
16871694
"privateDnsZoneArmResourceId": {
16881695
"type": "string",
1696+
"default": "",
16891697
"description": "private dns zone arm resource id.",
16901698
"x-ms-mutability": [
16911699
"create",
@@ -1699,6 +1707,7 @@
16991707
"properties": {
17001708
"mode": {
17011709
"type": "string",
1710+
"default": "Disabled",
17021711
"description": "The HA mode for the server.",
17031712
"enum": [
17041713
"Disabled",
@@ -1728,6 +1737,7 @@
17281737
},
17291738
"standbyAvailabilityZone": {
17301739
"type": "string",
1740+
"default": "",
17311741
"description": "availability zone information of the standby."
17321742
}
17331743
},
@@ -1739,21 +1749,25 @@
17391749
"properties": {
17401750
"customWindow": {
17411751
"type": "string",
1752+
"default": "Disabled",
17421753
"description": "indicates whether custom window is enabled or disabled"
17431754
},
17441755
"startHour": {
17451756
"type": "integer",
17461757
"format": "int32",
1758+
"default": 0,
17471759
"description": "start hour for maintenance window"
17481760
},
17491761
"startMinute": {
17501762
"type": "integer",
17511763
"format": "int32",
1764+
"default": 0,
17521765
"description": "start minute for maintenance window"
17531766
},
17541767
"dayOfWeek": {
17551768
"type": "integer",
17561769
"format": "int32",
1770+
"default": 0,
17571771
"description": "day of week for maintenance window"
17581772
}
17591773
}
@@ -1856,6 +1870,31 @@
18561870
"source": {
18571871
"type": "string",
18581872
"description": "Source of the configuration."
1873+
},
1874+
"isDynamicConfig": {
1875+
"type": "boolean",
1876+
"readOnly": true,
1877+
"description": "Configuration dynamic or static."
1878+
},
1879+
"isReadOnly": {
1880+
"type": "boolean",
1881+
"readOnly": true,
1882+
"description": "Configuration read-only or not."
1883+
},
1884+
"isConfigPendingRestart": {
1885+
"type": "boolean",
1886+
"readOnly": true,
1887+
"description": "Configuration is pending restart or not."
1888+
},
1889+
"unit": {
1890+
"type": "string",
1891+
"readOnly": true,
1892+
"description": "Configuration unit."
1893+
},
1894+
"documentationLink": {
1895+
"type": "string",
1896+
"readOnly": true,
1897+
"description": "Configuration documentation link."
18591898
}
18601899
},
18611900
"description": "The properties of a configuration."
@@ -2002,19 +2041,36 @@
20022041
"properties": {
20032042
"message": {
20042043
"type": "string",
2005-
"description": "Error Message."
2044+
"description": "Error Message.",
2045+
"readOnly": true
20062046
},
20072047
"nameAvailable": {
20082048
"type": "boolean",
2009-
"description": "Indicates whether the resource name is available."
2049+
"description": "Indicates whether the resource name is available.",
2050+
"readOnly": true
20102051
},
20112052
"name": {
20122053
"type": "string",
2013-
"description": "name of the PostgreSQL server."
2054+
"description": "name of the PostgreSQL server.",
2055+
"readOnly": true
20142056
},
20152057
"type": {
20162058
"type": "string",
2017-
"description": "type of the server"
2059+
"description": "type of the server",
2060+
"readOnly": true
2061+
},
2062+
"reason": {
2063+
"type": "string",
2064+
"description": "The name availability reason.",
2065+
"enum": [
2066+
"Invalid",
2067+
"AlreadyExists"
2068+
],
2069+
"x-ms-enum": {
2070+
"name": "Reason",
2071+
"modelAsString": true
2072+
},
2073+
"readOnly": true
20182074
}
20192075
},
20202076
"description": "Represents a resource name availability."

0 commit comments

Comments
 (0)