From fa61953e638677fe5e1308a1b7b326526caf1484 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 4 Aug 2020 12:17:44 -0700 Subject: [PATCH 1/8] Modified the names for Flexible server. --- .../2020-02-14-privatepreview/postgresql.json | 246 +++++++++--------- .../postgresql/resource-manager/readme.md | 5 + 2 files changed, 129 insertions(+), 122 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 8d350737eb01..4204738fb6f2 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json @@ -60,14 +60,14 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" }, "description": "The required parameters for creating or updating a server." } @@ -76,13 +76,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" } }, "202": { @@ -91,7 +91,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -119,14 +119,14 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ServerForUpdate" + "$ref": "#/definitions/FlexibleServerForUpdate" }, "description": "The required parameters for updating a server." } @@ -135,7 +135,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" } }, "202": { @@ -144,7 +144,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -172,7 +172,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { @@ -188,7 +188,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -219,20 +219,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -265,13 +265,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerListResult" + "$ref": "#/definitions/FlexibleServerListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -304,13 +304,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerListResult" + "$ref": "#/definitions/FlexibleServerListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -342,7 +342,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { @@ -355,7 +355,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -385,7 +385,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { @@ -398,7 +398,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -428,7 +428,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { @@ -441,7 +441,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -471,17 +471,17 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/FirewallRuleNameParameter" + "$ref": "#/parameters/FlexibleServerFirewallRuleNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" }, "description": "The required parameters for creating or updating a firewall rule." } @@ -490,13 +490,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" } }, "202": { @@ -505,7 +505,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -533,10 +533,10 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/FirewallRuleNameParameter" + "$ref": "#/parameters/FlexibleServerFirewallRuleNameParameter" } ], "responses": { @@ -552,7 +552,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -580,23 +580,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/FirewallRuleNameParameter" + "$ref": "#/parameters/FlexibleServerFirewallRuleNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -625,20 +625,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FirewallRuleListResult" + "$ref": "#/definitions/FlexibleServerFirewallRuleListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -670,20 +670,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ConfigurationListResult" + "$ref": "#/definitions/FlexibleServerConfigurationListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -715,23 +715,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/ConfigurationNameParameter" + "$ref": "#/parameters/FlexibleServerConfigurationNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Configuration" + "$ref": "#/definitions/FlexibleServerConfiguration" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -760,17 +760,17 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/MaintenanceWindowNameParameter" + "$ref": "#/parameters/FlexibleServerMaintenanceWindowNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" }, "description": "The required parameters for creating or updating a customer maintenance window." } @@ -779,13 +779,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" } }, "202": { @@ -794,7 +794,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -822,10 +822,10 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/MaintenanceWindowNameParameter" + "$ref": "#/parameters/FlexibleServerMaintenanceWindowNameParameter" } ], "responses": { @@ -841,7 +841,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -869,23 +869,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/MaintenanceWindowNameParameter" + "$ref": "#/parameters/FlexibleServerMaintenanceWindowNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -902,7 +902,7 @@ "$ref": "./examples/CustomerMaintenanceWindowListByServer.json" } }, - "description": "List all the Customer Maintenance Windows in a given PostgreSQL server.", + "description": "List all the Customer Maintenance Windows in a given PostgreSQL flexible server.", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -914,20 +914,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindowListResult" + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindowListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -957,7 +957,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/NameAvailabilityRequest" + "$ref": "#/definitions/FlexibleServerNameAvailabilityRequest" }, "description": "The required parameters for checking if resource name is available." } @@ -966,13 +966,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/NameAvailability" + "$ref": "#/definitions/FlexibleServerNameAvailability" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -999,13 +999,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/OperationListResult" + "$ref": "#/definitions/FlexibleServerOperationListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -1013,7 +1013,7 @@ } }, "definitions": { - "ServerVersion": { + "FlexibleServerVersion": { "type": "string", "description": "The version of a server.", "enum": [ @@ -1024,7 +1024,7 @@ "modelAsString": true } }, - "ServerProperties": { + "FlexibleServerProperties": { "properties": { "administratorLogin": { "type": "string", @@ -1045,7 +1045,7 @@ ] }, "version": { - "$ref": "#/definitions/ServerVersion", + "$ref": "#/definitions/FlexibleServerVersion", "description": "PostgreSQL Server version." }, "state": { @@ -1093,7 +1093,7 @@ "description": "The display name of a server." }, "storageProfile": { - "$ref": "#/definitions/StorageProfile", + "$ref": "#/definitions/FlexibleServerStorageProfile", "description": "Storage profile of a server." }, "publicNetworkAccess": { @@ -1148,23 +1148,33 @@ "x-ms-enum": { "name": "CreateMode", "modelAsString": true - } + }, + "x-ms-mutability": [ + "create" + ] + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Application-specific metadata in the form of key-value pairs." } }, "description": "The properties of a server." }, - "Server": { + "FlexibleServer": { "properties": { "identity": { "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Identity", "description": "The Azure Active Directory identity of the server." }, "sku": { - "$ref": "#/definitions/Sku", + "$ref": "#/definitions/FlexibleServerSku", "description": "The SKU (pricing tier) of the server." }, "properties": { - "$ref": "#/definitions/ServerProperties", + "$ref": "#/definitions/FlexibleServerProperties", "x-ms-client-flatten": true, "description": "Properties of the server." } @@ -1176,49 +1186,41 @@ ], "description": "Represents a server." }, - "ServerPropertiesForUpdate": { + "FlexibleServerPropertiesForUpdate": { "properties": { "administratorLoginPassword": { "type": "string", "format": "password", "description": "The password of the administrator login." }, - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "PostgreSQL Server version." - }, "vCores": { "type": "integer", "format": "int32", "description": "Max compute of a server is 64vCores." }, "storageProfile": { - "$ref": "#/definitions/StorageProfile", + "$ref": "#/definitions/FlexibleServerStorageProfile", "description": "Storage profile of a server." }, "standbyCount": { "type": "integer", "format": "int32", "description": "stand by count value can be either 0 or 1" - }, - "serverEdition": { - "type": "string", - "description": "server edition default to general purpose" } } }, - "ServerForUpdate": { + "FlexibleServerForUpdate": { "properties": { "location": { "type": "string", "description": "The location the resource resides in." }, "sku": { - "$ref": "#/definitions/Sku", + "$ref": "#/definitions/FlexibleServerSku", "description": "The SKU (pricing tier) of the server." }, "properties": { - "$ref": "#/definitions/ServerPropertiesForUpdate", + "$ref": "#/definitions/FlexibleServerPropertiesForUpdate", "x-ms-client-flatten": false, "description": "Properties of the server." }, @@ -1232,15 +1234,15 @@ }, "description": "Represents a server to be updated." }, - "ServerListResult": { + "FlexibleServerListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" }, - "description": "The list of servers" + "description": "The list of flexible servers" }, "nextLink": { "description": "The link used to get the next page of operations.", @@ -1249,7 +1251,7 @@ }, "description": "A list of servers." }, - "StorageProfile": { + "FlexibleServerStorageProfile": { "properties": { "backupRetentionDays": { "type": "integer", @@ -1264,7 +1266,7 @@ }, "description": "Storage Profile properties of a server" }, - "Sku": { + "FlexibleServerSku": { "properties": { "name": { "type": "string", @@ -1292,7 +1294,7 @@ }, "description": "Sku information related properties of a server." }, - "FirewallRuleProperties": { + "FlexibleServerFirewallRuleProperties": { "properties": { "startIpAddress": { "type": "string", @@ -1311,10 +1313,10 @@ ], "description": "The properties of a server firewall rule." }, - "FirewallRule": { + "FlexibleServerFirewallRule": { "properties": { "properties": { - "$ref": "#/definitions/FirewallRuleProperties", + "$ref": "#/definitions/FlexibleServerFirewallRuleProperties", "x-ms-client-flatten": true, "description": "The properties of a firewall rule." } @@ -1329,13 +1331,13 @@ ], "description": "Represents a server firewall rule." }, - "FirewallRuleListResult": { + "FlexibleServerFirewallRuleListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" }, "description": "The list of firewall rules in a server." }, @@ -1346,7 +1348,7 @@ }, "description": "A list of firewall rules." }, - "CustomerMaintenanceWindowProperties": { + "FlexibleServerCustomerMaintenanceWindowProperties": { "properties": { "dayOfWeek": { "type": "integer", @@ -1376,10 +1378,10 @@ ], "description": "The properties of a server firewall rule." }, - "CustomerMaintenanceWindow": { + "FlexibleServerCustomerMaintenanceWindow": { "properties": { "properties": { - "$ref": "#/definitions/CustomerMaintenanceWindowProperties", + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindowProperties", "x-ms-client-flatten": true, "description": "The properties of a customer maintenance window." } @@ -1394,19 +1396,19 @@ ], "description": "Represents a server firewall rule." }, - "CustomerMaintenanceWindowListResult": { + "FlexibleServerCustomerMaintenanceWindowListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/CustomerMaintenanceWindow" + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" }, "description": "The list of CustomerMaintenanceWindows in a PostgreSQL server." } }, "description": "A list of firewall rules." }, - "ConfigurationProperties": { + "FlexibleServerConfigurationProperties": { "properties": { "value": { "type": "string", @@ -1449,10 +1451,10 @@ }, "description": "The properties of a configuration." }, - "Configuration": { + "FlexibleServerConfiguration": { "properties": { "properties": { - "$ref": "#/definitions/ConfigurationProperties", + "$ref": "#/definitions/FlexibleServerConfigurationProperties", "x-ms-client-flatten": true, "description": "The properties of a configuration." } @@ -1464,13 +1466,13 @@ ], "description": "Represents a Configuration." }, - "ConfigurationListResult": { + "FlexibleServerConfigurationListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/Configuration" + "$ref": "#/definitions/FlexibleServerConfiguration" }, "description": "The list of server configurations." }, @@ -1481,7 +1483,7 @@ }, "description": "A list of server configurations." }, - "OperationDisplay": { + "FlexibleServerOperationDisplay": { "properties": { "provider": { "type": "string", @@ -1506,7 +1508,7 @@ }, "description": "Display metadata associated with the operation." }, - "Operation": { + "FlexibleServerOperation": { "properties": { "name": { "type": "string", @@ -1514,7 +1516,7 @@ "description": "The name of the operation being performed on this particular object." }, "display": { - "$ref": "#/definitions/OperationDisplay", + "$ref": "#/definitions/FlexibleServerOperationDisplay", "readOnly": true, "description": "The localized display information for this particular operation or action." }, @@ -1544,19 +1546,19 @@ }, "description": "REST API operation definition." }, - "OperationListResult": { + "FlexibleServerOperationListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/Operation" + "$ref": "#/definitions/FlexibleServerOperation" }, "description": "The list of resource provider operations." } }, "description": "A list of resource provider operations." }, - "NameAvailabilityRequest": { + "FlexibleServerNameAvailabilityRequest": { "required": [ "name" ], @@ -1572,7 +1574,7 @@ }, "description": "Request from client to check resource name availability." }, - "NameAvailability": { + "FlexibleServerNameAvailability": { "properties": { "message": { "type": "string", @@ -1593,7 +1595,7 @@ }, "description": "Represents a resource name availability." }, - "CloudError": { + "FlexibleServerCloudError": { "x-ms-external": true, "properties": { "error": { @@ -1604,7 +1606,7 @@ } }, "parameters": { - "ServerNameParameter": { + "FlexibleServerNameParameter": { "name": "serverName", "in": "path", "required": true, @@ -1612,7 +1614,7 @@ "description": "The name of the server.", "x-ms-parameter-location": "method" }, - "FirewallRuleNameParameter": { + "FlexibleServerFirewallRuleNameParameter": { "name": "firewallRuleName", "in": "path", "required": true, @@ -1620,7 +1622,7 @@ "description": "The name of the server firewall rule.", "x-ms-parameter-location": "method" }, - "ConfigurationNameParameter": { + "FlexibleServerConfigurationNameParameter": { "name": "configurationName", "in": "path", "required": true, @@ -1628,7 +1630,7 @@ "description": "The name of the server configuration.", "x-ms-parameter-location": "method" }, - "MaintenanceWindowNameParameter": { + "FlexibleServerMaintenanceWindowNameParameter": { "name": "maintenanceWindowName", "in": "path", "required": true, diff --git a/specification/postgresql/resource-manager/readme.md b/specification/postgresql/resource-manager/readme.md index fff38f5d4148..158ffc2ea1a1 100644 --- a/specification/postgresql/resource-manager/readme.md +++ b/specification/postgresql/resource-manager/readme.md @@ -39,6 +39,11 @@ These settings apply only when `--tag=package-2020-02-14-privatepreview` is spec ``` yaml $(tag) == 'package-2020-02-14-privatepreview' input-file: - Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +- Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json +- Microsoft.DBforPostgreSQL/stable/2018-06-01/PrivateEndpointConnections.json +- Microsoft.DBforPostgreSQL/stable/2018-06-01/PrivateLinkResources.json +- Microsoft.DBforPostgreSQL/stable/2020-01-01/DataEncryptionKeys.json +- Microsoft.DBforPostgreSQL/stable/2020-01-01/ServerSecurityAlertPolicies.json ``` ### Tag: package-2020-01-01-privatepreview From 26cf293b9191a89c6149420eada3724cf05ccd61 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 4 Aug 2020 17:42:37 -0700 Subject: [PATCH 2/8] Rename Flexible Operations List operation id. --- .../preview/2020-02-14-privatepreview/postgresql.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 4204738fb6f2..3d7bd3717368 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json @@ -983,7 +983,7 @@ "tags": [ "Operations" ], - "operationId": "Operations_List", + "operationId": "FlexibleServerOperations_List", "x-ms-examples": { "OperationList": { "$ref": "./examples/OperationList.json" From ba16ec93dc3cbe72180356885626c0b098ddd795 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 4 Aug 2020 18:24:37 -0700 Subject: [PATCH 3/8] Fixed the skutier and Delete operaton --- .../preview/2020-02-14-privatepreview/postgresql.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 3d7bd3717368..1aaf6b7dd7cf 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json @@ -515,7 +515,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FirewallRules_Delete", + "operationId": "FlexibleServerFirewallRules_Delete", "x-ms-examples": { "FirewallRuleDelete": { "$ref": "./examples/FirewallRuleDelete.json" @@ -1281,7 +1281,7 @@ "MemoryOptimized" ], "x-ms-enum": { - "name": "SkuTier", + "name": "FlexibleServerSkuTier", "modelAsString": true } }, From 474767a72c9481d059f1823e24787b8b8bfe2fa9 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Thu, 6 Aug 2020 15:48:53 -0700 Subject: [PATCH 4/8] Revert the Model name changes --- .../2020-02-14-privatepreview/postgresql.json | 226 +++++++++--------- 1 file changed, 113 insertions(+), 113 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 1aaf6b7dd7cf..9ec9b33eeb38 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json @@ -60,14 +60,14 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FlexibleServer" + "$ref": "#/definitions/Server" }, "description": "The required parameters for creating or updating a server." } @@ -76,13 +76,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServer" + "$ref": "#/definitions/Server" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/FlexibleServer" + "$ref": "#/definitions/Server" } }, "202": { @@ -91,7 +91,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -119,14 +119,14 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FlexibleServerForUpdate" + "$ref": "#/definitions/ServerForUpdate" }, "description": "The required parameters for updating a server." } @@ -135,7 +135,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServer" + "$ref": "#/definitions/Server" } }, "202": { @@ -144,7 +144,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -172,7 +172,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { @@ -188,7 +188,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -219,20 +219,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServer" + "$ref": "#/definitions/Server" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -265,13 +265,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerListResult" + "$ref": "#/definitions/ServerListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -304,13 +304,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerListResult" + "$ref": "#/definitions/ServerListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -342,7 +342,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { @@ -355,7 +355,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -385,7 +385,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { @@ -398,7 +398,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -428,7 +428,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { @@ -441,7 +441,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -471,17 +471,17 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerFirewallRuleNameParameter" + "$ref": "#/parameters/FirewallRuleNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FlexibleServerFirewallRule" + "$ref": "#/definitions/FirewallRule" }, "description": "The required parameters for creating or updating a firewall rule." } @@ -490,13 +490,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerFirewallRule" + "$ref": "#/definitions/FirewallRule" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/FlexibleServerFirewallRule" + "$ref": "#/definitions/FirewallRule" } }, "202": { @@ -505,7 +505,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -515,7 +515,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServerFirewallRules_Delete", + "operationId": "FirewallRules_Delete", "x-ms-examples": { "FirewallRuleDelete": { "$ref": "./examples/FirewallRuleDelete.json" @@ -533,10 +533,10 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerFirewallRuleNameParameter" + "$ref": "#/parameters/FirewallRuleNameParameter" } ], "responses": { @@ -552,7 +552,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -580,23 +580,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerFirewallRuleNameParameter" + "$ref": "#/parameters/FirewallRuleNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerFirewallRule" + "$ref": "#/definitions/FirewallRule" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -625,20 +625,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerFirewallRuleListResult" + "$ref": "#/definitions/FirewallRuleListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -670,20 +670,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerConfigurationListResult" + "$ref": "#/definitions/ConfigurationListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -715,23 +715,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerConfigurationNameParameter" + "$ref": "#/parameters/ConfigurationNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerConfiguration" + "$ref": "#/definitions/Configuration" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -760,17 +760,17 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerMaintenanceWindowNameParameter" + "$ref": "#/parameters/MaintenanceWindowNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" + "$ref": "#/definitions/CustomerMaintenanceWindow" }, "description": "The required parameters for creating or updating a customer maintenance window." } @@ -779,13 +779,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" + "$ref": "#/definitions/CustomerMaintenanceWindow" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" + "$ref": "#/definitions/CustomerMaintenanceWindow" } }, "202": { @@ -794,7 +794,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -822,10 +822,10 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerMaintenanceWindowNameParameter" + "$ref": "#/parameters/MaintenanceWindowNameParameter" } ], "responses": { @@ -841,7 +841,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -869,23 +869,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerMaintenanceWindowNameParameter" + "$ref": "#/parameters/MaintenanceWindowNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" + "$ref": "#/definitions/CustomerMaintenanceWindow" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -914,20 +914,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindowListResult" + "$ref": "#/definitions/CustomerMaintenanceWindowListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -957,7 +957,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FlexibleServerNameAvailabilityRequest" + "$ref": "#/definitions/NameAvailabilityRequest" }, "description": "The required parameters for checking if resource name is available." } @@ -966,13 +966,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerNameAvailability" + "$ref": "#/definitions/NameAvailability" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -999,13 +999,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerOperationListResult" + "$ref": "#/definitions/OperationListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -1013,7 +1013,7 @@ } }, "definitions": { - "FlexibleServerVersion": { + "ServerVersion": { "type": "string", "description": "The version of a server.", "enum": [ @@ -1024,7 +1024,7 @@ "modelAsString": true } }, - "FlexibleServerProperties": { + "ServerProperties": { "properties": { "administratorLogin": { "type": "string", @@ -1045,7 +1045,7 @@ ] }, "version": { - "$ref": "#/definitions/FlexibleServerVersion", + "$ref": "#/definitions/ServerVersion", "description": "PostgreSQL Server version." }, "state": { @@ -1093,7 +1093,7 @@ "description": "The display name of a server." }, "storageProfile": { - "$ref": "#/definitions/FlexibleServerStorageProfile", + "$ref": "#/definitions/StorageProfile", "description": "Storage profile of a server." }, "publicNetworkAccess": { @@ -1163,18 +1163,18 @@ }, "description": "The properties of a server." }, - "FlexibleServer": { + "Server": { "properties": { "identity": { "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Identity", "description": "The Azure Active Directory identity of the server." }, "sku": { - "$ref": "#/definitions/FlexibleServerSku", + "$ref": "#/definitions/Sku", "description": "The SKU (pricing tier) of the server." }, "properties": { - "$ref": "#/definitions/FlexibleServerProperties", + "$ref": "#/definitions/ServerProperties", "x-ms-client-flatten": true, "description": "Properties of the server." } @@ -1186,7 +1186,7 @@ ], "description": "Represents a server." }, - "FlexibleServerPropertiesForUpdate": { + "ServerPropertiesForUpdate": { "properties": { "administratorLoginPassword": { "type": "string", @@ -1199,7 +1199,7 @@ "description": "Max compute of a server is 64vCores." }, "storageProfile": { - "$ref": "#/definitions/FlexibleServerStorageProfile", + "$ref": "#/definitions/StorageProfile", "description": "Storage profile of a server." }, "standbyCount": { @@ -1209,18 +1209,18 @@ } } }, - "FlexibleServerForUpdate": { + "ServerForUpdate": { "properties": { "location": { "type": "string", "description": "The location the resource resides in." }, "sku": { - "$ref": "#/definitions/FlexibleServerSku", + "$ref": "#/definitions/Sku", "description": "The SKU (pricing tier) of the server." }, "properties": { - "$ref": "#/definitions/FlexibleServerPropertiesForUpdate", + "$ref": "#/definitions/ServerPropertiesForUpdate", "x-ms-client-flatten": false, "description": "Properties of the server." }, @@ -1234,13 +1234,13 @@ }, "description": "Represents a server to be updated." }, - "FlexibleServerListResult": { + "ServerListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FlexibleServer" + "$ref": "#/definitions/Server" }, "description": "The list of flexible servers" }, @@ -1251,7 +1251,7 @@ }, "description": "A list of servers." }, - "FlexibleServerStorageProfile": { + "StorageProfile": { "properties": { "backupRetentionDays": { "type": "integer", @@ -1266,7 +1266,7 @@ }, "description": "Storage Profile properties of a server" }, - "FlexibleServerSku": { + "Sku": { "properties": { "name": { "type": "string", @@ -1281,7 +1281,7 @@ "MemoryOptimized" ], "x-ms-enum": { - "name": "FlexibleServerSkuTier", + "name": "SkuTier", "modelAsString": true } }, @@ -1294,7 +1294,7 @@ }, "description": "Sku information related properties of a server." }, - "FlexibleServerFirewallRuleProperties": { + "FirewallRuleProperties": { "properties": { "startIpAddress": { "type": "string", @@ -1313,10 +1313,10 @@ ], "description": "The properties of a server firewall rule." }, - "FlexibleServerFirewallRule": { + "FirewallRule": { "properties": { "properties": { - "$ref": "#/definitions/FlexibleServerFirewallRuleProperties", + "$ref": "#/definitions/FirewallRuleProperties", "x-ms-client-flatten": true, "description": "The properties of a firewall rule." } @@ -1331,13 +1331,13 @@ ], "description": "Represents a server firewall rule." }, - "FlexibleServerFirewallRuleListResult": { + "FirewallRuleListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FlexibleServerFirewallRule" + "$ref": "#/definitions/FirewallRule" }, "description": "The list of firewall rules in a server." }, @@ -1348,7 +1348,7 @@ }, "description": "A list of firewall rules." }, - "FlexibleServerCustomerMaintenanceWindowProperties": { + "CustomerMaintenanceWindowProperties": { "properties": { "dayOfWeek": { "type": "integer", @@ -1378,10 +1378,10 @@ ], "description": "The properties of a server firewall rule." }, - "FlexibleServerCustomerMaintenanceWindow": { + "CustomerMaintenanceWindow": { "properties": { "properties": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindowProperties", + "$ref": "#/definitions/CustomerMaintenanceWindowProperties", "x-ms-client-flatten": true, "description": "The properties of a customer maintenance window." } @@ -1396,19 +1396,19 @@ ], "description": "Represents a server firewall rule." }, - "FlexibleServerCustomerMaintenanceWindowListResult": { + "CustomerMaintenanceWindowListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" + "$ref": "#/definitions/CustomerMaintenanceWindow" }, "description": "The list of CustomerMaintenanceWindows in a PostgreSQL server." } }, "description": "A list of firewall rules." }, - "FlexibleServerConfigurationProperties": { + "ConfigurationProperties": { "properties": { "value": { "type": "string", @@ -1451,10 +1451,10 @@ }, "description": "The properties of a configuration." }, - "FlexibleServerConfiguration": { + "Configuration": { "properties": { "properties": { - "$ref": "#/definitions/FlexibleServerConfigurationProperties", + "$ref": "#/definitions/ConfigurationProperties", "x-ms-client-flatten": true, "description": "The properties of a configuration." } @@ -1466,13 +1466,13 @@ ], "description": "Represents a Configuration." }, - "FlexibleServerConfigurationListResult": { + "ConfigurationListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FlexibleServerConfiguration" + "$ref": "#/definitions/Configuration" }, "description": "The list of server configurations." }, @@ -1483,7 +1483,7 @@ }, "description": "A list of server configurations." }, - "FlexibleServerOperationDisplay": { + "OperationDisplay": { "properties": { "provider": { "type": "string", @@ -1508,7 +1508,7 @@ }, "description": "Display metadata associated with the operation." }, - "FlexibleServerOperation": { + "Operation": { "properties": { "name": { "type": "string", @@ -1516,7 +1516,7 @@ "description": "The name of the operation being performed on this particular object." }, "display": { - "$ref": "#/definitions/FlexibleServerOperationDisplay", + "$ref": "#/definitions/OperationDisplay", "readOnly": true, "description": "The localized display information for this particular operation or action." }, @@ -1546,19 +1546,19 @@ }, "description": "REST API operation definition." }, - "FlexibleServerOperationListResult": { + "OperationListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FlexibleServerOperation" + "$ref": "#/definitions/Operation" }, "description": "The list of resource provider operations." } }, "description": "A list of resource provider operations." }, - "FlexibleServerNameAvailabilityRequest": { + "NameAvailabilityRequest": { "required": [ "name" ], @@ -1574,7 +1574,7 @@ }, "description": "Request from client to check resource name availability." }, - "FlexibleServerNameAvailability": { + "NameAvailability": { "properties": { "message": { "type": "string", @@ -1595,7 +1595,7 @@ }, "description": "Represents a resource name availability." }, - "FlexibleServerCloudError": { + "CloudError": { "x-ms-external": true, "properties": { "error": { @@ -1606,7 +1606,7 @@ } }, "parameters": { - "FlexibleServerNameParameter": { + "ServerNameParameter": { "name": "serverName", "in": "path", "required": true, @@ -1614,7 +1614,7 @@ "description": "The name of the server.", "x-ms-parameter-location": "method" }, - "FlexibleServerFirewallRuleNameParameter": { + "FirewallRuleNameParameter": { "name": "firewallRuleName", "in": "path", "required": true, @@ -1622,7 +1622,7 @@ "description": "The name of the server firewall rule.", "x-ms-parameter-location": "method" }, - "FlexibleServerConfigurationNameParameter": { + "ConfigurationNameParameter": { "name": "configurationName", "in": "path", "required": true, @@ -1630,7 +1630,7 @@ "description": "The name of the server configuration.", "x-ms-parameter-location": "method" }, - "FlexibleServerMaintenanceWindowNameParameter": { + "MaintenanceWindowNameParameter": { "name": "maintenanceWindowName", "in": "path", "required": true, From 0451dc2002290e4b3886fd4d3fb09c7100ffec05 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Fri, 7 Aug 2020 11:39:08 -0700 Subject: [PATCH 5/8] Undo Operation ID name changes --- .../2020-02-14-privatepreview/postgresql.json | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 9ec9b33eeb38..c553c9b5a3cd 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json @@ -39,7 +39,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Create", + "operationId": "Servers_Create", "x-ms-examples": { "Create a new server": { "$ref": "./examples/ServerCreate.json" @@ -101,7 +101,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Update", + "operationId": "Servers_Update", "x-ms-examples": { "ServerUpdate": { "$ref": "./examples/ServerUpdate.json" @@ -154,7 +154,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Delete", + "operationId": "Servers_Delete", "x-ms-examples": { "ServerDelete": { "$ref": "./examples/ServerDelete.json" @@ -198,7 +198,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Get", + "operationId": "Servers_Get", "x-ms-examples": { "ServerGet": { "$ref": "./examples/ServerGet.json" @@ -243,7 +243,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_ListByResourceGroup", + "operationId": "Servers_ListByResourceGroup", "x-ms-examples": { "ServerListByResourceGroup": { "$ref": "./examples/ServerListByResourceGroup.json" @@ -285,7 +285,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_List", + "operationId": "Servers_List", "x-ms-examples": { "ServerList": { "$ref": "./examples/ServerList.json" @@ -324,7 +324,7 @@ "tags": [ "ServerRestart" ], - "operationId": "FlexibleServers_Restart", + "operationId": "Servers_Restart", "x-ms-examples": { "ServerRestart": { "$ref": "./examples/ServerRestart.json" @@ -367,7 +367,7 @@ "tags": [ "ServerStart" ], - "operationId": "FlexibleServers_Start", + "operationId": "Servers_Start", "x-ms-examples": { "ServerStart": { "$ref": "./examples/ServerStart.json" @@ -410,7 +410,7 @@ "tags": [ "ServerStop" ], - "operationId": "FlexibleServers_Stop", + "operationId": "Servers_Stop", "x-ms-examples": { "ServerStop": { "$ref": "./examples/ServerStop.json" @@ -453,7 +453,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_CreateOrUpdate", + "operationId": "FirewallRules_CreateOrUpdate", "x-ms-examples": { "FirewallRuleCreate": { "$ref": "./examples/FirewallRuleCreate.json" @@ -562,7 +562,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_Get", + "operationId": "FirewallRules_Get", "x-ms-examples": { "FirewallRuleList": { "$ref": "./examples/FirewallRuleGet.json" @@ -607,7 +607,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_ListByServer", + "operationId": "FirewallRules_ListByServer", "x-ms-examples": { "FirewallRuleList": { "$ref": "./examples/FirewallRuleListByServer.json" @@ -652,7 +652,7 @@ "tags": [ "Configurations" ], - "operationId": "FlexibleServersConfigurations_ListByServer", + "operationId": "Configurations_ListByServer", "x-ms-examples": { "ConfigurationList": { "$ref": "./examples/ConfigurationListByServer.json" @@ -697,7 +697,7 @@ "tags": [ "Configurations" ], - "operationId": "FlexibleServersConfigurations_Get", + "operationId": "Configurations_Get", "x-ms-examples": { "ConfigurationGet": { "$ref": "./examples/ConfigurationGet.json" @@ -742,7 +742,7 @@ "tags": [ "CustomerMaintenanceWindow" ], - "operationId": "FlexibleServersCustomerMaintenanceWindow_CreateOrUpdate", + "operationId": "CustomerMaintenanceWindow_CreateOrUpdate", "x-ms-examples": { "CustomerMaintenanceWindowCreate": { "$ref": "./examples/CustomerMaintenanceWindowCreate.json" @@ -804,7 +804,7 @@ "tags": [ "CustomerMaintenanceWindow" ], - "operationId": "FlexibleServersCustomerMaintenanceWindow_Delete", + "operationId": "CustomerMaintenanceWindow_Delete", "x-ms-examples": { "CustomerMaintenanceWindowDelete": { "$ref": "./examples/CustomerMaintenanceWindowDelete.json" @@ -851,7 +851,7 @@ "tags": [ "CustomerMaintenanceWindow" ], - "operationId": "FlexibleServersCustomerMaintenanceWindow_Get", + "operationId": "CustomerMaintenanceWindow_Get", "x-ms-examples": { "CustomerMaintenanceWindowGet": { "$ref": "./examples/CustomerMaintenanceWindowGet.json" @@ -896,7 +896,7 @@ "tags": [ "CustomerMaintenanceWindow" ], - "operationId": "FlexibleServersCustomerMaintenanceWindow_ListByServer", + "operationId": "CustomerMaintenanceWindow_ListByServer", "x-ms-examples": { "CustomerMaintenanceWindowList": { "$ref": "./examples/CustomerMaintenanceWindowListByServer.json" @@ -938,7 +938,7 @@ "tags": [ "CheckNameAvailability" ], - "operationId": "FlexibleServersCheckNameAvailability_Execute", + "operationId": "CheckNameAvailability_Execute", "x-ms-examples": { "NameAvailability": { "$ref": "./examples/CheckNameAvailability.json" @@ -983,7 +983,7 @@ "tags": [ "Operations" ], - "operationId": "FlexibleServerOperations_List", + "operationId": "Operations_List", "x-ms-examples": { "OperationList": { "$ref": "./examples/OperationList.json" From 8240bca3162b67316748e3b7ab407792cf0875e4 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Fri, 7 Aug 2020 12:02:42 -0700 Subject: [PATCH 6/8] revert readme.md file. --- specification/postgresql/resource-manager/readme.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/specification/postgresql/resource-manager/readme.md b/specification/postgresql/resource-manager/readme.md index 158ffc2ea1a1..fff38f5d4148 100644 --- a/specification/postgresql/resource-manager/readme.md +++ b/specification/postgresql/resource-manager/readme.md @@ -39,11 +39,6 @@ These settings apply only when `--tag=package-2020-02-14-privatepreview` is spec ``` yaml $(tag) == 'package-2020-02-14-privatepreview' input-file: - Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json -- Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json -- Microsoft.DBforPostgreSQL/stable/2018-06-01/PrivateEndpointConnections.json -- Microsoft.DBforPostgreSQL/stable/2018-06-01/PrivateLinkResources.json -- Microsoft.DBforPostgreSQL/stable/2020-01-01/DataEncryptionKeys.json -- Microsoft.DBforPostgreSQL/stable/2020-01-01/ServerSecurityAlertPolicies.json ``` ### Tag: package-2020-01-01-privatepreview From a5a04de1d67cde4a59df0eef35a48c930d8c3a98 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 18 Aug 2020 16:36:20 -0700 Subject: [PATCH 7/8] removed capacity and added update configurations --- .../examples/ConfigurationUpdate.json | 33 +++++++++ .../examples/ServerCreate.json | 15 ++-- .../ServerCreatePointInTimeRestore.json | 8 +-- .../examples/ServerGet.json | 4 +- .../examples/ServerGetWithVnet.json | 7 +- .../examples/ServerList.json | 16 ++--- .../examples/ServerListByResourceGroup.json | 12 ++-- .../examples/ServerUpdate.json | 5 +- .../2020-02-14-privatepreview/postgresql.json | 70 +++++++++++++++++-- 9 files changed, 131 insertions(+), 39 deletions(-) create mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ConfigurationUpdate.json diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ConfigurationUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ConfigurationUpdate.json new file mode 100644 index 000000000000..11a554470c34 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ConfigurationUpdate.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "serverName": "testserver", + "configurationName": "event_scheduler", + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "value": "on", + "source": "user-override" + } + } + }, + "responses": { + "200": { + "body": { + "properties": { + "value": "ON", + "description": "Indicates the status of the Event Scheduler.", + "defaultValue": "OFF", + "dataType": "Enumeration", + "allowedValues": "ON,OFF,DISABLED", + "source": "user-override" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/testserver/configurations/event_scheduler", + "name": "event_scheduler", + "type": "Microsoft.DBforPostgreSQL/flexibleServers/configurations" + } + }, + "202": {} + } + } \ No newline at end of file diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreate.json index 3c3908a9039a..ebb30c443b02 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreate.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreate.json @@ -8,7 +8,6 @@ "location": "westus", "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -19,12 +18,14 @@ "vnetInjArgs": { "delegatedSubnetName": "test-subnet", "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "delegatedVnetName": "test-vnet", + "delegatedVnetResourceGroup": "test-vnet-rg" }, "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "tags": { "ElasticServer": "1" @@ -36,7 +37,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -56,7 +56,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { @@ -71,7 +72,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -91,7 +91,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreatePointInTimeRestore.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreatePointInTimeRestore.json index 37fbec167d04..a1218b930091 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreatePointInTimeRestore.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreatePointInTimeRestore.json @@ -18,7 +18,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -34,7 +33,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { @@ -49,7 +49,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -65,7 +64,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGet.json index fdb65ca0219c..90c6c3275d72 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGet.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGet.json @@ -10,7 +10,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -24,7 +23,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGetWithVnet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGetWithVnet.json index 639fb674d91a..bfb6f8603d5e 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGetWithVnet.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGetWithVnet.json @@ -10,7 +10,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -24,12 +23,14 @@ "vnetInjArgs": { "delegatedSubnetName": "test-subnet", "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "delegatedVnetName": "test-vnet", + "delegatedVnetResourceGroup": "test-vnet-rg" }, "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerList.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerList.json index c45b4e7331f2..494a116c5baa 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerList.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerList.json @@ -11,7 +11,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -25,7 +24,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { @@ -38,7 +38,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -52,7 +51,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "2" }, "location": "westus", "tags": { @@ -65,7 +65,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -79,7 +78,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "3" }, "location": "westus", "tags": { @@ -92,7 +92,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -106,7 +105,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerListByResourceGroup.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerListByResourceGroup.json index eb147eed2fbf..f2861579356f 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerListByResourceGroup.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerListByResourceGroup.json @@ -12,7 +12,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -26,7 +25,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc1", @@ -36,7 +36,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -50,7 +49,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "2" }, "location": "westus", "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/pgtestsvc2", @@ -60,7 +60,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -74,7 +73,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "3" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdate.json index 9340c6e76e9b..9be524337d1a 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdate.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdate.json @@ -8,7 +8,6 @@ "location": "westus", "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -25,7 +24,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -40,7 +38,8 @@ "storageMB": 524288, "backupRetentionDays": 20 }, - "vnetInjArgs": {} + "vnetInjArgs": {}, + "availabilityZone": "1" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index c553c9b5a3cd..047b068c01e8 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json @@ -735,6 +735,62 @@ } } } + }, + "patch": { + "tags": [ + "Configurations" + ], + "operationId": "Configurations_Update", + "x-ms-examples": { + "Update a user configuration": { + "$ref": "./examples/ConfigurationUpdate.json" + } + }, + "description": "Updates a configuration of a server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/ConfigurationNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Configuration" + }, + "description": "The required parameters for updating a server configuration." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Configuration" + } + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/maintenanceWindows/{maintenanceWindowName}": { @@ -1122,6 +1178,10 @@ "format": "date-time", "description": "Restore point creation time (ISO8601 format), specifying the time to restore from." }, + "availabilityZone": { + "type": "string", + "description": "availability Zone information of the server." + }, "vnetInjArgs": { "properties": { "delegatedVnetID": { @@ -1135,6 +1195,10 @@ "delegatedVnetName": { "type": "string", "description": "delegated vNet name" + }, + "delegatedVnetResourceGroup": { + "type": "string", + "description": "delegated vNet resource group name" } } }, @@ -1284,12 +1348,6 @@ "name": "SkuTier", "modelAsString": true } - }, - "capacity": { - "type": "integer", - "format": "int32", - "minimum": 0, - "description": "The scale up/out capacity, representing server's compute units." } }, "description": "Sku information related properties of a server." From bb35b2c450fee8353c7e1fe95553d387b6a05cf7 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 18 Aug 2020 16:45:36 -0700 Subject: [PATCH 8/8] Fixed json prettier issues. --- .../examples/ConfigurationUpdate.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ConfigurationUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ConfigurationUpdate.json index 11a554470c34..7853c92ea534 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ConfigurationUpdate.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ConfigurationUpdate.json @@ -1,33 +1,33 @@ { + "parameters": { + "serverName": "testserver", + "configurationName": "event_scheduler", + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "parameters": { - "serverName": "testserver", - "configurationName": "event_scheduler", - "resourceGroupName": "testrg", - "api-version": "2020-07-01-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "parameters": { + "properties": { + "value": "on", + "source": "user-override" + } + } + }, + "responses": { + "200": { + "body": { "properties": { - "value": "on", + "value": "ON", + "description": "Indicates the status of the Event Scheduler.", + "defaultValue": "OFF", + "dataType": "Enumeration", + "allowedValues": "ON,OFF,DISABLED", "source": "user-override" - } + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/testserver/configurations/event_scheduler", + "name": "event_scheduler", + "type": "Microsoft.DBforPostgreSQL/flexibleServers/configurations" } }, - "responses": { - "200": { - "body": { - "properties": { - "value": "ON", - "description": "Indicates the status of the Event Scheduler.", - "defaultValue": "OFF", - "dataType": "Enumeration", - "allowedValues": "ON,OFF,DISABLED", - "source": "user-override" - }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/testserver/configurations/event_scheduler", - "name": "event_scheduler", - "type": "Microsoft.DBforPostgreSQL/flexibleServers/configurations" - } - }, - "202": {} - } - } \ No newline at end of file + "202": {} + } +}