From 1e3988d335713aff2d2971e58a412c527b3adc19 Mon Sep 17 00:00:00 2001 From: xunsun-commits <84804232+xunsun-commits@users.noreply.github.com> Date: Fri, 12 Nov 2021 21:20:55 -0800 Subject: [PATCH] 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 --- .../2021-06-01-preview/postgresql.json | 80 ++++++++++++++++--- .../stable/2021-06-01/postgresql.json | 80 ++++++++++++++++--- 2 files changed, 136 insertions(+), 24 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json index 7ccbbb6349f7..e0b188eb888f 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2021-06-01-preview/postgresql.json @@ -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", @@ -1419,6 +1422,7 @@ }, "highAvailability": { "$ref": "#/definitions/HighAvailability", + "default": null, "description": "High availability properties of a server." }, "maintenanceWindow": { @@ -1447,6 +1451,7 @@ }, "availabilityZone": { "type": "string", + "default": "", "description": "availability zone information of the server.", "x-ms-mutability": [ "create", @@ -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." @@ -1509,19 +1507,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": { @@ -1638,6 +1643,7 @@ }, "geoRedundantBackup": { "type": "string", + "default": "Disabled", "description": "A value indicating whether Geo-Redundant backup is enabled on the server.", "enum": [ "Enabled", @@ -1678,6 +1684,7 @@ }, "delegatedSubnetResourceId": { "type": "string", + "default": "", "description": "delegated subnet arm resource id.", "x-ms-mutability": [ "create", @@ -1686,6 +1693,7 @@ }, "privateDnsZoneArmResourceId": { "type": "string", + "default": "", "description": "private dns zone arm resource id.", "x-ms-mutability": [ "create", @@ -1699,6 +1707,7 @@ "properties": { "mode": { "type": "string", + "default": "Disabled", "description": "The HA mode for the server.", "enum": [ "Disabled", @@ -1728,6 +1737,7 @@ }, "standbyAvailabilityZone": { "type": "string", + "default": "", "description": "availability zone information of the standby." } }, @@ -1739,21 +1749,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" } } @@ -1856,6 +1870,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." @@ -2002,19 +2041,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." diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json index 63abd95aadf0..660ed94fa066 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/postgresql.json @@ -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", @@ -1419,6 +1422,7 @@ }, "highAvailability": { "$ref": "#/definitions/HighAvailability", + "default": null, "description": "High availability properties of a server." }, "maintenanceWindow": { @@ -1447,6 +1451,7 @@ }, "availabilityZone": { "type": "string", + "default": "", "description": "availability zone information of the server.", "x-ms-mutability": [ "create", @@ -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." @@ -1509,19 +1507,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": { @@ -1638,6 +1643,7 @@ }, "geoRedundantBackup": { "type": "string", + "default": "Disabled", "description": "A value indicating whether Geo-Redundant backup is enabled on the server.", "enum": [ "Enabled", @@ -1678,6 +1684,7 @@ }, "delegatedSubnetResourceId": { "type": "string", + "default": "", "description": "delegated subnet arm resource id.", "x-ms-mutability": [ "create", @@ -1686,6 +1693,7 @@ }, "privateDnsZoneArmResourceId": { "type": "string", + "default": "", "description": "private dns zone arm resource id.", "x-ms-mutability": [ "create", @@ -1699,6 +1707,7 @@ "properties": { "mode": { "type": "string", + "default": "Disabled", "description": "The HA mode for the server.", "enum": [ "Disabled", @@ -1728,6 +1737,7 @@ }, "standbyAvailabilityZone": { "type": "string", + "default": "", "description": "availability zone information of the standby." } }, @@ -1739,21 +1749,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" } } @@ -1856,6 +1870,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." @@ -2002,19 +2041,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."