Skip to content
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

Fix S360 items for FSPG swagger #16727

Merged
merged 15 commits into from
Nov 13, 2021
+136 −24
Merged

Fix S360 items for FSPG swagger #16727

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
93c9a9a
Changed FSPG RestartParameter.failoverMode from string to enum for AP…
xunsun-commits Aug 23, 2021
51127e6
Change enum first letter to lower case
xunsun-commits Aug 23, 2021
0e57051
Change to upper case
xunsun-commits Aug 23, 2021
1edbd71
Merge branch 'Azure:main' into main
xunsun-commits Sep 7, 2021
6cc3100
Fix S360 bugs for swagger FSPG 2020-02-14-preview, 2021-06-01-preview…
xunsun-commits Sep 7, 2021
4c2ea90
Merge branch 'Azure:main' into main
xunsun-commits Oct 21, 2021
504ada6
Fix S360 item by adding default value to backupRetentionDays and main…
xunsun-commits Oct 21, 2021
c11ec59
Merge branch 'Azure:main' into main
xunsun-commits Nov 9, 2021
496db9f
Fix s360 bugs
xunsun-commits Nov 10, 2021
6831b88
Undo supportedIops change, will change in RP side
xunsun-commits Nov 10, 2021
056b3ff
Fix NameAvailability and ConfigurationProperties s360 bugs
xunsun-commits Nov 10, 2021
f34c171
Fix s360 bug for CloudError
xunsun-commits Nov 10, 2021
22f9982
Undo CloudError fix
xunsun-commits Nov 10, 2021
c490554
Fix string default value
xunsun-commits Nov 10, 2021
07a0feb
Remove server.tags because TrackedResource already has tags
xunsun-commits Nov 12, 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
87 changes: 75 additions & 12 deletions ...sql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,14 +1403,17 @@
},
"storage": {
"$ref": "#/definitions/Storage",
"default": null,
"description": "Storage properties of a server."
},
"backup": {
"$ref": "#/definitions/Backup",
"default": null,
"description": "Backup properties of a server."
},
"network": {
"$ref": "#/definitions/Network",
"default": null,
"description": "Network properties of a server.",
"x-ms-mutability": [
"create",
Expand All @@ -1419,6 +1422,7 @@
},
"highAvailability": {
"$ref": "#/definitions/HighAvailability",
"default": null,
"description": "High availability properties of a server."
},
"maintenanceWindow": {
Expand Down Expand Up @@ -1447,6 +1451,7 @@
},
"availabilityZone": {
"type": "string",
"default": "",
"description": "availability zone information of the server.",
"x-ms-mutability": [
"create",
Expand All @@ -1470,13 +1475,6 @@
"create",
"update"
]
},
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Application-specific metadata in the form of key-value pairs."
}
},
"description": "The properties of a server."
Expand All @@ -1492,6 +1490,13 @@
"x-ms-client-flatten": true,
"description": "Properties of the server."
},
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Application-specific metadata in the form of key-value pairs."
},
xunsun-commits marked this conversation as resolved.
Show resolved Hide resolved
"systemData": {
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
"readOnly": true,
Expand All @@ -1509,19 +1514,26 @@
"properties": {
"administratorLoginPassword": {
"type": "string",
"x-ms-secret": true,
"format": "password",
"description": "The password of the administrator login."
"description": "The password of the administrator login.",
"x-ms-mutability": [
"update"
]
},
"storage": {
"$ref": "#/definitions/Storage",
"default": null,
"description": "Storage properties of a server."
},
"backup": {
"$ref": "#/definitions/Backup",
"default": null,
"description": "Backup properties of a server."
},
"highAvailability": {
"$ref": "#/definitions/HighAvailability",
"default": null,
"description": "High availability properties of a server."
},
"maintenanceWindow": {
Expand Down Expand Up @@ -1638,6 +1650,7 @@
},
"geoRedundantBackup": {
"type": "string",
"default": "Disabled",
"description": "A value indicating whether Geo-Redundant backup is enabled on the server.",
"enum": [
"Enabled",
Expand Down Expand Up @@ -1678,6 +1691,7 @@
},
"delegatedSubnetResourceId": {
"type": "string",
"default": "",
"description": "delegated subnet arm resource id.",
"x-ms-mutability": [
"create",
Expand All @@ -1686,6 +1700,7 @@
},
"privateDnsZoneArmResourceId": {
"type": "string",
"default": "",
"description": "private dns zone arm resource id.",
"x-ms-mutability": [
"create",
Expand All @@ -1699,6 +1714,7 @@
"properties": {
"mode": {
"type": "string",
"default": "Disabled",
"description": "The HA mode for the server.",
"enum": [
"Disabled",
Expand Down Expand Up @@ -1728,6 +1744,7 @@
},
"standbyAvailabilityZone": {
"type": "string",
"default": "",
"description": "availability zone information of the standby."
}
},
Expand All @@ -1739,21 +1756,25 @@
"properties": {
"customWindow": {
"type": "string",
"default": "Disabled",
"description": "indicates whether custom window is enabled or disabled"
},
"startHour": {
"type": "integer",
"format": "int32",
"default": 0,
"description": "start hour for maintenance window"
},
"startMinute": {
"type": "integer",
"format": "int32",
"default": 0,
"description": "start minute for maintenance window"
},
"dayOfWeek": {
"type": "integer",
"format": "int32",
"default": 0,
"description": "day of week for maintenance window"
}
}
Expand Down Expand Up @@ -1856,6 +1877,31 @@
"source": {
"type": "string",
"description": "Source of the configuration."
},
"isDynamicConfig": {
"type": "boolean",
"readOnly": true,
"description": "Configuration dynamic or static."
},
"isReadOnly": {
"type": "boolean",
"readOnly": true,
"description": "Configuration read-only or not."
},
"isConfigPendingRestart": {
"type": "boolean",
"readOnly": true,
"description": "Configuration is pending restart or not."
},
"unit": {
"type": "string",
"readOnly": true,
"description": "Configuration unit."
},
"documentationLink": {
"type": "string",
"readOnly": true,
"description": "Configuration documentation link."
}
},
"description": "The properties of a configuration."
Expand Down Expand Up @@ -2002,19 +2048,36 @@
"properties": {
"message": {
"type": "string",
"description": "Error Message."
"description": "Error Message.",
"readOnly": true
},
"nameAvailable": {
"type": "boolean",
"description": "Indicates whether the resource name is available."
"description": "Indicates whether the resource name is available.",
"readOnly": true
},
"name": {
"type": "string",
"description": "name of the PostgreSQL server."
"description": "name of the PostgreSQL server.",
"readOnly": true
},
"type": {
"type": "string",
"description": "type of the server"
"description": "type of the server",
"readOnly": true
},
"reason": {
"type": "string",
"description": "The name availability reason.",
"enum": [
"Invalid",
"AlreadyExists"
],
"x-ms-enum": {
"name": "Reason",
"modelAsString": true
},
"readOnly": true
}
},
"description": "Represents a resource name availability."
Expand Down
Loading