From b2b39054f9043558241c226c027ca57f6cbf57e6 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Tue, 3 Nov 2020 11:17:31 +0100 Subject: [PATCH 01/65] New Readme Config File --- .../postgresqlhsc/resource-manager/readme.md | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 specification/postgresqlhsc/resource-manager/readme.md diff --git a/specification/postgresqlhsc/resource-manager/readme.md b/specification/postgresqlhsc/resource-manager/readme.md new file mode 100644 index 000000000000..4a28bcc8cde4 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/readme.md @@ -0,0 +1,79 @@ +# postgresqlhsc + +> see https://aka.ms/autorest + +This is the AutoRest configuration file for postgresqlhsc. + +## Getting Started + +To build the SDKs for My API, simply install AutoRest via `npm` (`npm install -g autorest`) and then run: + +> `autorest readme.md` + +To see additional help and options, run: + +> `autorest --help` + +For other options on installation see [Installing AutoRest](https://aka.ms/autorest/install) on the AutoRest github page. + +--- + +## Configuration + +### Basic Information + +These are the global settings for the postgresqlhsc. + +```yaml +openapi-type: arm +tag: package-2020-10-05-privatepreview +``` + +### Tag: package-2020-10-05-privatepreview + +These settings apply only when `--tag=package-2020-10-05-privatepreview` is specified on the command line. + +```yaml $(tag) == 'package-2020-10-05-privatepreview' +input-file: + - Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +``` + +--- + +# Code Generation + +## Swagger to SDK + +This section describes what SDK should be generated by the automatic system. +This is not used by Autorest itself. + +```yaml $(swagger-to-sdk) +swagger-to-sdk: + - repo: azure-sdk-for-python + - repo: azure-sdk-for-java + - repo: azure-sdk-for-go + - repo: azure-sdk-for-js + - repo: azure-sdk-for-ruby + after_scripts: + - bundle install && rake arm:regen_all_profiles['azure_mgmt_postgresqlhsc'] +``` + +## Go + +See configuration in [readme.go.md](./readme.go.md) + +## Python + +See configuration in [readme.python.md](./readme.python.md) + +## Ruby + +See configuration in [readme.ruby.md](./readme.ruby.md) + +## TypeScript + +See configuration in [readme.typescript.md](./readme.typescript.md) + +## CSharp + +See configuration in [readme.csharp.md](./readme.csharp.md) From 4d096ff43179bde0a4ab9dd8c5a780ca0d9bb309 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Tue, 3 Nov 2020 11:17:32 +0100 Subject: [PATCH 02/65] New Go Language Readme Config File --- .../resource-manager/readme.go.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 specification/postgresqlhsc/resource-manager/readme.go.md diff --git a/specification/postgresqlhsc/resource-manager/readme.go.md b/specification/postgresqlhsc/resource-manager/readme.go.md new file mode 100644 index 000000000000..078fc89e9109 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/readme.go.md @@ -0,0 +1,19 @@ +## Go + +These settings apply only when `--go` is specified on the command line. + +```yaml $(go) +go: + license-header: MICROSOFT_APACHE_NO_VERSION + clear-output-folder: true +``` + +### Tag: package-2020-10-05-privatepreview and go + +These settings apply only when `--tag=package-2020-10-05-privatepreview --go` is specified on the command line. +Please also specify `--go-sdks-folder=`. + +```yaml $(tag) == 'package-2020-10-05-privatepreview' && $(go) +namespace: Microsoft.DBforPostgreSQL +output-folder: $(go-sdks-folder)/postgresqlhsc/Generated +``` From caadca9c642786ec07ceea89a7f00c2e05e3ca51 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Tue, 3 Nov 2020 11:17:32 +0100 Subject: [PATCH 03/65] New Typescript Language Readme Config File --- .../resource-manager/readme.typescript.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 specification/postgresqlhsc/resource-manager/readme.typescript.md diff --git a/specification/postgresqlhsc/resource-manager/readme.typescript.md b/specification/postgresqlhsc/resource-manager/readme.typescript.md new file mode 100644 index 000000000000..36ea02fa1207 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/readme.typescript.md @@ -0,0 +1,13 @@ +## TypeScript + +These settings apply only when `--typescript` is specified on the command line. +Please also specify `--typescript-sdks-folder=`. + +```yaml $(typescript) +typescript: + azure-arm: true + package-name: "postgresqlhsc" + output-folder: "$(typescript-sdks-folder)/packages/postgresqlhsc" + payload-flattening-threshold: 1 + generate-metadata: true +``` From 29d882998440b71d836df7841743caca2efb522e Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Tue, 3 Nov 2020 11:17:33 +0100 Subject: [PATCH 04/65] New Python Language Readme Config File --- .../resource-manager/readme.python.md | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 specification/postgresqlhsc/resource-manager/readme.python.md diff --git a/specification/postgresqlhsc/resource-manager/readme.python.md b/specification/postgresqlhsc/resource-manager/readme.python.md new file mode 100644 index 000000000000..edfb2657133a --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/readme.python.md @@ -0,0 +1,21 @@ +## Python + +These settings apply only when `--python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +```yaml $(python) +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 2 + namespace: Microsoft.DBforPostgreSQL + package-name: postgresqlhsc + package-version: 2020-10-05-privatepreview + clear-output-folder: true +``` + +```yaml $(python) +python: + no-namespace-folders: true + output-folder: $(python-sdks-folder)/azure-mgmt/postgresqlhsc +``` From 2d7a127bbaad550dfb9ac6be2fefb486d2a40852 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Tue, 3 Nov 2020 11:17:34 +0100 Subject: [PATCH 05/65] New C# Language Readme Config File --- .../resource-manager/readme.csharp.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 specification/postgresqlhsc/resource-manager/readme.csharp.md diff --git a/specification/postgresqlhsc/resource-manager/readme.csharp.md b/specification/postgresqlhsc/resource-manager/readme.csharp.md new file mode 100644 index 000000000000..8f007dcb8894 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/readme.csharp.md @@ -0,0 +1,15 @@ +## C + +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +```yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 1 + clear-output-folder: true + client-side-validation: false + namespace: Microsoft.DBforPostgreSQL + output-folder: $(csharp-sdks-folder)/postgresqlhsc/management/Microsoft.DBforPostgreSQL/GeneratedProtocol +``` From 73c009d57118da24786e2b6de7330323f342be22 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Tue, 3 Nov 2020 11:17:35 +0100 Subject: [PATCH 06/65] New Ruby Language Readme Config File --- .../resource-manager/readme.ruby.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 specification/postgresqlhsc/resource-manager/readme.ruby.md diff --git a/specification/postgresqlhsc/resource-manager/readme.ruby.md b/specification/postgresqlhsc/resource-manager/readme.ruby.md new file mode 100644 index 000000000000..46a479bcb414 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/readme.ruby.md @@ -0,0 +1,19 @@ +## Ruby + +These settings apply only when `--ruby` is specified on the command line. + +```yaml +package-name: azure_mgmt_postgresqlhsc +package-version: 2020-10-05-privatepreview +azure-arm: true +``` + +### Tag: package-2020-10-05-privatepreview and ruby + +These settings apply only when `--tag=package-2020-10-05-privatepreview --ruby` is specified on the command line. +Please also specify `--ruby-sdks-folder=`. + +```yaml $(tag) == 'package-2020-10-05-privatepreview' && $(ruby) +namespace: Microsoft.DBforPostgreSQL +output-folder: $(ruby-sdks-folder)/postgresqlhsc +``` From 060511654890a0a97a985f106bcb01cf9463bf73 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Tue, 3 Nov 2020 11:17:36 +0100 Subject: [PATCH 07/65] New Swagger Spec File --- .../postgresqlhsc.json | 132 ++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json new file mode 100644 index 000000000000..bbc1d444cd29 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -0,0 +1,132 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-10-05-privatepreview", + "title": "postgresqlhsc", + "description": "Description of the new service", + "x-ms-code-generation-settings": { + "name": "postgresqlhscClient" + } + }, + "host": "management.azure.com", + "schemes": ["https"], + "consumes": ["application/json"], + "produces": ["application/json"], + "security": [ + { + "azure_auth": ["user_impersonation"] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/operations": { + "get": { + "tags": ["Tag1"], + "operationId": "OperationGroup_Get", + "x-ms-examples": { + "BatchAccountDelete": { "$ref": "./examples/OperationGroupGet.json" } + }, + "description": "This is a sample get operation, please see guidelines in azure-rest-api-specs repository for more info", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "Describe the result of a successful operation.", + "schema": { + "$ref": "#/definitions/Result" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "Result": { + "description": "Sample result definition", + "properties": { + "sampleProperty": { + "type": "string", + "description": "Sample property of type string" + } + } + }, + "ErrorResponse": { + "description": "Error response.", + "properties": { + "error": { + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." + } + } + }, + "ErrorDefinition": { + "description": "Error definition.", + "properties": { + "code": { + "description": "Service specific error code which serves as the substatus for the HTTP error code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "Description of the error.", + "type": "string", + "readOnly": true + }, + "details": { + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + }, + "readOnly": true + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000)" + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group.", + "x-ms-parameter-location": "method" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "The API version to be used with the HTTP request." + } + } +} From baa7ebd55fe6987d13fb77b8d87caff513bfabb0 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Tue, 3 Nov 2020 11:17:37 +0100 Subject: [PATCH 08/65] New Swagger Example Spec File --- .../examples/OperationGroupGet.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationGroupGet.json diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationGroupGet.json new file mode 100644 index 000000000000..7ba3361e9fa9 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationGroupGet.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "accountName": "sampleacct", + "resourceGroupName": "postgresqlhscClient", + "api-version": "2020-10-05-privatepreview", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "sampleProperty": "sampleProperty" + } + } + } +} From 8ea82bb5c82324227dc9779dafaed8a3a531e287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mehmet=20furkan=20=C5=9Fahin?= Date: Tue, 3 Nov 2020 13:07:41 +0100 Subject: [PATCH 09/65] initial swagger --- .../examples/CheckNameAvailability.json | 20 + .../examples/ConfigurationBatchUpdate.json | 45 + .../examples/ConfigurationGet.json | 48 + .../examples/ConfigurationListByServer.json | 56 + .../ConfigurationListByServerGroup.json | 76 + .../examples/ConfigurationUpdate.json | 32 + .../examples/FirewallRuleCreate.json | 40 + .../examples/FirewallRuleDelete.json | 14 + .../examples/FirewallRuleGet.json | 22 + .../FirewallRuleListByServerGroup.json | 34 + .../examples/OperationGroupGet.json | 15 - .../examples/OperationList.json | 197 ++ .../examples/RoleCreate.json | 19 + .../examples/RoleDelete.json | 14 + .../examples/RoleListByServerGroup.json | 28 + .../examples/ServerGroupAddNode.json | 20 + .../examples/ServerGroupCreate.json | 52 + .../examples/ServerGroupCreatePITR.json | 21 + .../examples/ServerGroupDelete.json | 13 + .../examples/ServerGroupGet.json | 64 + .../examples/ServerGroupGetServer.json | 30 + .../examples/ServerGroupListServers.json | 67 + .../examples/ServerGroupRestart.json | 12 + .../examples/ServerGroupScaleCompute.json | 20 + .../examples/ServerGroupScaleStorage.json | 20 + .../examples/ServerGroupStart.json | 12 + .../examples/ServerGroupStop.json | 12 + .../examples/ServerGroupUpdatePatch.json | 39 + .../examples/ServerGroupUpdatePut.json | 43 + .../postgresqlhsc.json | 2039 ++++++++++++++++- 30 files changed, 3032 insertions(+), 92 deletions(-) create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json delete mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationGroupGet.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationList.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupRestart.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStart.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStop.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json new file mode 100644 index 000000000000..81d1f7ea55ae --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json @@ -0,0 +1,20 @@ + +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "api-version": "2020-10-05-preview", + "nameAvailabilityRequest": { + "name": "name1", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2" + } + }, + "responses": { + "200": { + "body": { + "nameAvailable": true, + "message": "", + "reason": "" + } + } + } + } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json new file mode 100644 index 000000000000..a71182b0e50e --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json @@ -0,0 +1,45 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestResourceGroup", + "serverGroupName": "hsctestsg", + "api-version": "2020-10-05-preview", + "parameters": { + "properties": { + "serverRoleGroupConfigurations": [ + { + "role": "Coordinator", + "configurations": [ + { + "name": "array_nulls", + "value": "on" + }, + { + "name": "backslash_quote", + "value": "safe_encoding" + }, + { + "name": "bytea_output", + "value": "hex" + } + ] + }, + { + "role": "Worker", + "configurations": [ + { + "name": "check_function_bodies", + "value": "on" + }, + { + "name": "client_encoding", + "value": "sql_ascii" + } + ] + } + ] + } + } + }, + "responses": {} +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json new file mode 100644 index 000000000000..25c7eb5e86b7 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestResourceGroup", + "serverGroupName": "hsctestsg", + "configurationName": "array_nulls", + "api-version": "2020-10-05-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/array_nulls", + "name": "hsctestsgconfigs", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", + "properties": { + "serverRoleGroupConfigurations": [ + { + "role": "Coordinator", + "configurations": [ + { + "value": "on", + "description": "Enable input of NULL elements in arrays.", + "defaultValue": "on", + "dataType": "Boolean", + "allowedValues": "on,off", + "source": "system-default" + } + ] + }, + { + "role": "Worker", + "configurations": [ + { + "value": "on", + "description": "Enable input of NULL elements in arrays.", + "defaultValue": "on", + "dataType": "Boolean", + "allowedValues": "on,off", + "source": "system-default" + } + ] + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json new file mode 100644 index 000000000000..536c964d2163 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json @@ -0,0 +1,56 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestResourceGroup", + "serverGroupName": "hsctestsg", + "serverName": "testserver", + "api-version": "2020-10-05-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "value": "", + "description": "Sets the application name to be reported in statistics and logs.", + "defaultValue": "", + "dataType": "String", + "allowedValues": "[A-Za-z0-9._-]*", + "source": "system-default" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/servers/testserver/configurations/application_name", + "name": "application_name", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers/configurations" + }, + { + "properties": { + "value": "on", + "description": "Enables input of NULL elements in arrays.", + "defaultValue": "on", + "dataType": "Boolean", + "allowedValues": "on,off", + "source": "system-default" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/servers/testserver/configurations/array_nulls", + "name": "array_nulls", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers/configurations" + }, + { + "properties": { + "value": "on", + "description": "Starts the autovacuum subprocess.", + "defaultValue": "on", + "dataType": "Boolean", + "allowedValues": "on,off", + "source": "system-default" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/servers/testserver/configurations/autovacuum", + "name": "autovacuum", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers/configurations" + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json new file mode 100644 index 000000000000..54cab10b8b98 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json @@ -0,0 +1,76 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestResourceGroup", + "serverGroupName": "hsctestsg", + "api-version": "2020-10-05-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations", + "name": "hsctestsgconfigs", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", + "properties": { + "serverRoleGroupConfigurations": [ + { + "role": "Coordinator", + "configurations": [ + { + "name": "array_nulls", + "value": "on", + "description": "Enable input of NULL elements in arrays.", + "defaultValue": "on", + "dataType": "Boolean", + "allowedValues": "on,off", + "source": "system-default" + }, + { + "name": "backslash_quote", + "value": "safe_encoding", + "description": "Sets whether \"\\'\" is allowed in string literals.", + "defaultValue": "safe_encoding", + "dataType": "Enumeration", + "allowedValues": "safe_encoding,on,off", + "source": "system-default" + }, + { + "name": "bytea_output", + "value": "hex", + "description": "Sets the output format for bytea.", + "defaultValue": "hex", + "dataType": "Enumeration", + "allowedValues": "escape,hex", + "source": "system-default" + } + ] + }, + { + "role": "Worker", + "configurations": [ + { + "name": "check_function_bodies", + "value": "on", + "description": "Check function bodies during CREATE FUNCTION.", + "defaultValue": "on", + "dataType": "Boolean", + "allowedValues": "on,off", + "source": "system-default" + }, + { + "name": "client_encoding", + "value": "sql_ascii", + "description": "Sets the client's character set encoding.", + "defaultValue": "sql_ascii", + "dataType": "Enumeration", + "allowedValues": "BIG5,EUC_CN,EUC_JP,EUC_JIS_2004,EUC_KR,EUC_TW,GB18030,GBK,ISO_8859_5,ISO_8859_6,ISO_8859_7,ISO_8859_8,JOHAB,KOI8R,KOI8U,LATIN1,LATIN2,LATIN3,LATIN4,LATIN5,LATIN6,LATIN7,LATIN8,LATIN9,LATIN10,MULE_INTERNAL,SJIS,SHIFT_JIS_2004,SQL_ASCII,UHC,UTF8,WIN866,WIN874,WIN1250,WIN1251,WIN1252,WIN1253,WIN1254,WIN1255,WIN1256,WIN1257,WIN1258", + "source": "system-default" + } + ] + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json new file mode 100644 index 000000000000..04386acc54c1 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestResourceGroup", + "serverGroupName": "hsctestsg", + "configurationName": "array_nulls", + "api-version": "2020-10-05-preview", + "parameters": { + "properties": { + "serverRoleGroupConfigurations": [ + { + "role": "Coordinator", + "configurations": [ + { + "value": "on" + } + ] + }, + { + "role": "Worker", + "configurations": [ + { + "value": "off" + } + ] + } + ] + } + } + }, + "responses": {} +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json new file mode 100644 index 000000000000..8c8eca925d9a --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "firewallRuleName": "rule1", + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "startIpAddress": "0.0.0.0", + "endIpAddress": "255.255.255.255" + } + } + }, + "responses": { + "201": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroups/pgtestsvc4/firewallRules/rule1", + "name": "rule1", + "type": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules", + "properties": { + "startIpAddress": "0.0.0.0", + "endIpAddress": "255.255.255.255" + } + } + }, + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroups/pgtestsvc4/firewallRules/rule1", + "name": "rule1", + "type": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules", + "properties": { + "startIpAddress": "0.0.0.0", + "endIpAddress": "255.255.255.255" + } + } + }, + "202": {} + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json new file mode 100644 index 000000000000..8729b633e2c4 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "firewallRuleName": "rule1", + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json new file mode 100644 index 000000000000..4fcb2496282d --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json @@ -0,0 +1,22 @@ +{ + "parameters": { + "firewallRuleName": "rule1", + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroups/pgtestsvc4/firewallRules/rule1", + "name": "rule1", + "type": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules", + "properties": { + "startIpAddress": "0.0.0.0", + "endIpAddress": "255.255.255.255" + } + } + } + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json new file mode 100644 index 000000000000..de8446a3527a --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroups/pgtestsvc4/firewallRules/rule1", + "name": "rule1", + "type": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules", + "properties": { + "startIpAddress": "0.0.0.0", + "endIpAddress": "255.255.255.255" + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroups/pgtestsvc4/firewallRules/rule2", + "name": "rule2", + "type": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules", + "properties": { + "startIpAddress": "1.0.0.0", + "endIpAddress": "255.0.0.0" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationGroupGet.json deleted file mode 100644 index 7ba3361e9fa9..000000000000 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationGroupGet.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parameters": { - "accountName": "sampleacct", - "resourceGroupName": "postgresqlhscClient", - "api-version": "2020-10-05-privatepreview", - "subscriptionId": "subid" - }, - "responses": { - "200": { - "body": { - "sampleProperty": "sampleProperty" - } - } - } -} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationList.json new file mode 100644 index 000000000000..8295c7885504 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationList.json @@ -0,0 +1,197 @@ +{ + "parameters": { + "api-version": "2017-12-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.DBforPostgreSQL/serverGroups/read", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "PostgreSQL Server Group", + "operation": "List/Get PostgreSQL Server Groups", + "description": "Return the list of server groups or gets the properties for the specified server group." + } + }, + { + "name": "Microsoft.DBforPostgreSQL/serverGroups/write", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "PostgreSQL Server Group", + "operation": "Create/Update PostgreSQL Server Group", + "description": "Creates a server group with the specified parameters or update the properties or tags for the specified server group." + } + }, + { + "name": "Microsoft.DBforPostgreSQL/serverGroups/delete", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "PostgreSQL Server Grouo", + "operation": "Delete PostgreSQL Server Group", + "description": "Deletes an existing server group." + } + }, + { + "name": "Microsoft.DBforPostgreSQL/serverGroups/servers/read", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "PostgreSQL Server", + "operation": "List/Get PostgreSQL Servers of Server Group", + "description": "Return the list of servers of server group or gets the properties for the specified server from server group." + } + }, + { + "name": "Microsoft.DBforPostgreSQL/serverGroups/servers/configurations/read", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "Configurations", + "operation": "List/Get Configurations of Server", + "description": "Return the list of configurations for a server or gets the value for the specified configuration." + } + }, + { + "name": "Microsoft.DBforPostgreSQL/serverGroups/configurations/read", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "Configurations", + "operation": "List/Get Configurations of Server Group", + "description": "Return the list of configurations for a server group or gets the value for the specified configuration." + } + }, + { + "name": "Microsoft.DBforPostgreSQL/serverGroups/configurations/write", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "Configurations", + "operation": "Update Configurations of Server Group", + "description": "Update an value of configurations." + } + }, + { + "name": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules/read", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "Firewall Rules", + "operation": "List/Get Firewall Rules", + "description": "Return the list of firewall rules for a server group or gets the properties for the specified firewall rule." + } + }, + { + "name": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules/write", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "Firewall Rules", + "operation": "Create/Update Firewall Rule", + "description": "Creates a firewall rule with the specified parameters or update an existing rule." + } + }, + { + "name": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules/delete", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "Firewall Rules", + "operation": "Delete Firewall Rule", + "description": "Deletes an existing firewall rule." + } + }, + { + "name": "Microsoft.DBforPostgreSQL/servers/providers/Microsoft.Insights/metricDefinitions/read", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "Database Metric Definition", + "operation": "Get database metric definitions", + "description": "Return types of metrics that are available for databases" + }, + "properties": { + "serviceSpecification": { + "metricSpecifications": [ + { + "name": "cpu_percent", + "displayName": "CPU percent", + "displayDescription": "CPU percent", + "unit": "Percent", + "aggregationType": "Average", + "fillGapWithZero": true + }, + { + "name": "memory_percent", + "displayName": "Memory percent", + "displayDescription": "Memory percent", + "unit": "Percent", + "aggregationType": "Average", + "fillGapWithZero": true + }, + { + "name": "io_consumption_percent", + "displayName": "IO percent", + "displayDescription": "IO percent", + "unit": "Percent", + "aggregationType": "Average", + "fillGapWithZero": true + }, + { + "name": "storage_percent", + "displayName": "Storage percentage", + "displayDescription": "Storage percentage", + "unit": "Percent", + "aggregationType": "Average" + }, + { + "name": "storage_used", + "displayName": "Storage used", + "displayDescription": "Storage used", + "unit": "Bytes", + "aggregationType": "Average" + }, + { + "name": "storage_limit", + "displayName": "Storage limit", + "displayDescription": "Storage limit", + "unit": "Bytes", + "aggregationType": "Average" + }, + { + "name": "active_connections", + "displayName": "Total active connections", + "displayDescription": "Total active connections", + "unit": "Count", + "aggregationType": "Average", + "fillGapWithZero": true + }, + { + "name": "connections_failed", + "displayName": "Total failed connections", + "displayDescription": "Total failed connections", + "unit": "Count", + "aggregationType": "Average", + "fillGapWithZero": true + } + ] + } + } + }, + { + "name": "Microsoft.DBforPostgreSQL/servers/providers/Microsoft.Insights/diagnosticSettings/read", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "Database Metric Definition", + "operation": "Read diagnostic setting", + "description": "Gets the disagnostic setting for the resource" + } + }, + { + "name": "Microsoft.DBforPostgreSQL/servers/providers/Microsoft.Insights/diagnosticSettings/write", + "display": { + "provider": "Microsoft DB for PostgreSQL", + "resource": "Database Metric Definition", + "operation": "Write diagnostic setting", + "description": "Creates or updates the diagnostic setting for the resource" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json new file mode 100644 index 000000000000..7b9369dc9111 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "roleName": "role1", + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "password": "secret" + } + } + }, + "responses": { + "201": {}, + "200": {}, + "202": {} + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json new file mode 100644 index 000000000000..a57df4e8d424 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "roleName": "role1", + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json new file mode 100644 index 000000000000..16f99478bc10 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/roles/role1", + "name": "role1", + "type": "Microsoft.DBforPostgreSQL/roles", + "properties": {} + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/roles/role2", + "name": "role2", + "type": "Microsoft.DBforPostgreSQL/roles", + "properties": {} + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json new file mode 100644 index 000000000000..6f3115e2d83d --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "serverRoleGroups": [ + { + "name": "", + "role": "Worker", + "serverCount": 10 + } + ] + } + } + }, + "responses": {} +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json new file mode 100644 index 000000000000..b7112e8aa031 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -0,0 +1,52 @@ +{ + "parameters": { + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "serverGroupName": "pgtestsvc4", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "location": "westus", + "properties": { + "createMode": "Create", + "administratorLogin": "cloudsa", + "administratorLoginPassword": "password", + "backupRetentionMinutes": 50400, + "vnetInjArgs": { + "delegatedSubnetName": "test-subnet", + "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", + "delegatedVnetName": "test-vnet" + }, + "mx": "Enabled", + "zfs": "Disabled", + "version": "12", + "citusVersion": "9.5", + "serverRoleGroups": [ + { + "name": "", + "role": "Coordinator", + "serverCount": 1, + "serverEdition": "GeneralPurpose", + "vCores": 4, + "storageQuotaInMb": 524288, + "standbyCount": 1, + "publicIpRequested": true + }, + { + "name": "", + "role": "Worker", + "serverCount": 3, + "serverEdition": "MemoryOptimized", + "vCores": 4, + "storageQuotaInMb": 524288, + "standbyCount": 0, + "publicIpRequested": false + } + ] + }, + "tags": { + "ElasticServer": "1" + } + } + }, + "responses": {} +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json new file mode 100644 index 000000000000..55cebce5b252 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "location": "westus", + "properties": { + "createMode": "PointInTimeRestore", + "pointInTimeUTC": "2017-12-14T00:00:37.467Z", + "sourceSubscriptionId": "dddddddd-dddd-dddd-dddd-dddddddddddd", + "sourceResourceGroupName": "SourceGroup", + "sourceServerGroupName": "pgtests_source_server_group", + "mx": "Enabled", + "zfs": "Disabled" + } + } + }, + "responses": {} +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json new file mode 100644 index 000000000000..6480757bc69a --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "serverGroupName": "testservergroup", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json new file mode 100644 index 000000000000..70a2ca8b6ce0 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -0,0 +1,64 @@ +{ + "parameters": { + "serverGroupName": "hsctestsg1", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "id": "2a3fe856-9ba3-4551-97e2-d496c1a39bba", + "name": "hsctestsg1", + "tags": { + "additionalProp1": "string", + "additionalProp2": "string", + "additionalProp3": "string" + }, + "location": "eastus", + "properties": { + "administratorLogin": "string", + "version": "12", + "citusVersion": "9.5", + "mx": "Enabled", + "zfs": "Disabled", + "vnetInjArgs": { + "delegatedSubnetName": "test-subnet", + "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", + "delegatedVnetName": "test-vnet" + }, + "serverRoleGroups": [ + { + "name": "", + "role": "Coordinator", + "serverCount": 1, + "serverEdition": "MemoryOptimized", + "storageQuotaInMb": 10000, + "vCores": 4, + "standbyCount": 1, + "publicIpRequested": true, + "serverNames": [ + "hsctestsg1-c" + ] + }, + { + "name": "", + "role": "Worker", + "serverCount": 3, + "serverEdition": "GeneralPurpose", + "storageQuotaInMb": 10000, + "vCores": 8, + "standbyCount": 0, + "publicIpRequested": false, + "serverNames": [ + "hsctestsg1-w0", + "hsctestsg1-w1", + "hsctestsg1-w2" + ] + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json new file mode 100644 index 000000000000..49a0d9bb06bb --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json @@ -0,0 +1,30 @@ +{ + "parameters": { + "serverGroupName": "hsctestsg1", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "serverName": "hsctestsg1-c" + }, + "responses": { + "200": { + "body": { + "id": "2a3fe856-9ba3-4551-97e2-d496c1a39bba", + "name": "hsctestsg1-c", + "type": "Microsoft.DBforPostgreSQL/serverGroups/servers", + "properties": { + "administratorLogin": "string", + "version": "12", + "role": "Coordinator", + "serverEdition": "MemoryOptimized", + "storageQuotaInMb": 10000, + "vCores": 4, + "standbyCount": 1, + "publicIpRequested": true, + "state": "Ready", + "haState": "Ready" + } + } + } + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json new file mode 100644 index 000000000000..b76a492c5594 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json @@ -0,0 +1,67 @@ +{ + "parameters": { + "serverGroupName": "hsctestsg1", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "value":[ + { + "id": "2a3fe856-9ba3-4551-97e2-d496c1a39bba", + "name": "hsctestsg1-c", + "type": "Microsoft.DBforPostgreSQL/serverGroups/servers", + "properties": { + "administratorLogin": "string", + "version": "12", + "role": "Coordinator", + "serverEdition": "MemoryOptimized", + "storageQuotaInMb": 10000, + "vCores": 4, + "standbyCount": 1, + "publicIpRequested": true, + "state": "Ready", + "haState": "Ready" + } + }, + { + "id": "2a3fe856-9ba3-4551-97e2-d496c1a39bba", + "name": "hsctestsg1-w0", + "type": "Microsoft.DBforPostgreSQL/serverGroups/servers", + "properties": { + "administratorLogin": "string", + "version": "12", + "role": "Worker", + "serverEdition": "MemoryOptimized", + "storageQuotaInMb": 10000, + "vCores": 4, + "standbyCount": 0, + "publicIpRequested": false, + "state": "Ready", + "haState": "Ready" + } + }, + { + "id": "2a3fe856-9ba3-4551-97e2-d496c1a39bba", + "name": "hsctestsg1-w1", + "type": "Microsoft.DBforPostgreSQL/serverGroups/servers", + "properties": { + "administratorLogin": "string", + "version": "12", + "role": "Worker", + "serverEdition": "MemoryOptimized", + "storageQuotaInMb": 10000, + "vCores": 4, + "standbyCount": 0, + "publicIpRequested": false, + "state": "Ready", + "haState": "Ready" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupRestart.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupRestart.json new file mode 100644 index 000000000000..84c10363cf13 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupRestart.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "serverGroupName": "hsctestsg1", + "resourceGroupName": "TestGroup", + "api-version": "2020-02-14-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {} + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json new file mode 100644 index 000000000000..fbde6f99b40b --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "serverRoleGroups": [ + { + "name": "", + "role": "Coordinator", + "vCores": 16 + } + ] + } + } + }, + "responses": {} +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json new file mode 100644 index 000000000000..5cc94dee5b19 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "serverRoleGroups": [ + { + "name": "", + "role": "Worker", + "storageQuotaInMb": 8388608 + } + ] + } + } + }, + "responses": {} +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStart.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStart.json new file mode 100644 index 000000000000..84c10363cf13 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStart.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "serverGroupName": "hsctestsg1", + "resourceGroupName": "TestGroup", + "api-version": "2020-02-14-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {} + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStop.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStop.json new file mode 100644 index 000000000000..84c10363cf13 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStop.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "serverGroupName": "hsctestsg1", + "resourceGroupName": "TestGroup", + "api-version": "2020-02-14-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {} + } +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json new file mode 100644 index 000000000000..cfaaabbf4ec2 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "version": "12", + "administratorLoginPassword": "secret", + "backupRetentionMinutes": 100800, + "serverRoleGroups": [ + { + "name": "", + "role": "Coordinator", + "serverCount": 1, + "serverEdition": "GeneralPurpose", + "vCores": 8, + "storageQuotaInMb": 1048576, + "standbyCount": 0 + }, + { + "name": "", + "role": "Worker", + "serverCount": 4, + "serverEdition": "MemoryOptimized", + "vCores": 4, + "storageQuotaInMb": 524288, + "standbyCount": 1 + } + ] + }, + "tags": { + "ElasticServer": "2" + } + } + }, + "responses": {} +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json new file mode 100644 index 000000000000..9c8b92cb94f2 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "serverGroupName": "pgtestsvc4", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "location": "westus", + "properties": { + "createMode": "Update", + "version": "12", + "administratorLoginPassword": "secret", + "backupRetentionMinutes": 100800, + "serverRoleGroups": [ + { + "name": "", + "role": "Coordinator", + "serverCount": 1, + "serverEdition": "GeneralPurpose", + "vCores": 4, + "storageQuotaInMb": 524288, + "standbyCount": 1, + "publicIpRequested": true + }, + { + "name": "", + "role": "Worker", + "serverCount": 3, + "serverEdition": "MemoryOptimized", + "vCores": 4, + "storageQuotaInMb": 524288, + "standbyCount": 0, + "publicIpRequested": false + } + ] + }, + "tags": { + "ElasticServer": "1" + } + } + }, + "responses": {} +} \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index bbc1d444cd29..6884e3653a9e 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1,20 +1,25 @@ { "swagger": "2.0", "info": { - "version": "2020-10-05-privatepreview", - "title": "postgresqlhsc", - "description": "Description of the new service", - "x-ms-code-generation-settings": { - "name": "postgresqlhscClient" - } + "title": "HyperscaleCitusManagementClient", + "description": "The Microsoft Azure management API provides create, read, update, and delete functionality for Azure PostgreSQL Hyperscale (Citus) resources including server groups, servers, databases, firewall rules, VNET rules, security alert policies, log files and configurations.", + "version": "2020-10-05-privatepreview" }, "host": "management.azure.com", - "schemes": ["https"], - "consumes": ["application/json"], - "produces": ["application/json"], + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "security": [ { - "azure_auth": ["user_impersonation"] + "azure_auth": [ + "user_impersonation" + ] } ], "securityDefinitions": { @@ -29,104 +34,1984 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/operations": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}": { + "put": { + "description": "Creates a new server group with servers.", + "tags": [ + "ServerGroups" + ], + "operationId": "ServerGroups_CreateOrUpdate", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Create a new server group": { + "$ref": "./examples/ServerGroupCreate.json" + }, + "Create a new server group as a point in time restore": { + "$ref": "./examples/ServerGroupCreatePITR.json" + }, + "Update the server group": { + "$ref": "./examples/ServerGroupUpdatePut.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ServerGroupForCreate" + }, + "description": "The required parameters for creating or updating a server group." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerGroupForCreate" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/ServerGroupForCreate" + } + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "NoContent" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + }, "get": { - "tags": ["Tag1"], - "operationId": "OperationGroup_Get", + "description": "Gets information about a server group.", + "tags": [ + "ServerGroups" + ], + "operationId": "ServerGroups_Get", "x-ms-examples": { - "BatchAccountDelete": { "$ref": "./examples/OperationGroupGet.json" } + "Get the server group": { + "$ref": "./examples/ServerGroupGet.json" + } }, - "description": "This is a sample get operation, please see guidelines in azure-rest-api-specs repository for more info", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "#/parameters/ServerGroupNameParameter" } ], "responses": { "200": { - "description": "Describe the result of a successful operation.", + "description": "OK", "schema": { - "$ref": "#/definitions/Result" + "$ref": "#/definitions/ServerGroup" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } - } - } - }, - "definitions": { - "Result": { - "description": "Sample result definition", - "properties": { - "sampleProperty": { - "type": "string", - "description": "Sample property of type string" + }, + "delete": { + "description": "Deletes a server group together with servers in it.", + "tags": [ + "ServerGroups" + ], + "operationId": "ServerGroups_Delete", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Delete the server group": { + "$ref": "./examples/ServerGroupDelete.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "NoContent" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + }, + "patch": { + "description": "Updates an existing server group. The request body can contain one to many of the properties present in the normal server group definition.", + "tags": [ + "ServerGroups" + ], + "operationId": "ServerGroups_Update", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Update the server group": { + "$ref": "./examples/ServerGroupUpdatePatch.json" + }, + "Scale compute": { + "$ref": "./examples/ServerGroupScaleCompute.json" + }, + "Scale storage": { + "$ref": "./examples/ServerGroupScaleStorage.json" + }, + "Add new worker nodes": { + "$ref": "./examples/ServerGroupAddNode.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ServerGroupForUpdate" + }, + "description": "The parameters for updating a server group." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Server" + } + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } } } }, - "ErrorResponse": { - "description": "Error response.", - "properties": { - "error": { - "$ref": "#/definitions/ErrorDefinition", - "description": "The error details." + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/servers": { + "get": { + "description": "Lists servers of a server group.", + "tags": [ + "ServerGroups" + ], + "operationId": "ServerGroups_ListServers", + "x-ms-examples": { + "List servers of the server group": { + "$ref": "./examples/ServerGroupListServers.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerGroupServerList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } } } }, - "ErrorDefinition": { - "description": "Error definition.", - "properties": { - "code": { - "description": "Service specific error code which serves as the substatus for the HTTP error code.", - "type": "string", - "readOnly": true - }, - "message": { - "description": "Description of the error.", - "type": "string", - "readOnly": true + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/servers/{serverName}": { + "get": { + "description": "Gets information about a server in server group.", + "tags": [ + "ServerGroups" + ], + "operationId": "ServerGroups_GetServer", + "x-ms-examples": { + "Get the server of server group": { + "$ref": "./examples/ServerGroupGetServer.json" + } }, - "details": { - "description": "Internal error details.", - "type": "array", - "items": { - "$ref": "#/definitions/ErrorDefinition" + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" }, - "readOnly": true + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerGroupServer" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } } } - } - }, - "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000)" }, - "ResourceGroupNameParameter": { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group.", - "x-ms-parameter-location": "method" + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/servers/{serverName}/configurations": { + "get": { + "description": "List all the configurations of a server in server group.", + "tags": [ + "Configurations" + ], + "operationId": "Configurations_ListByServer", + "x-ms-examples": { + "List configurations of the server that in the server group": { + "$ref": "./examples/ConfigurationListByServer.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConfigurationList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "The API version to be used with the HTTP request." + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/configurations": { + "put": { + "description": "Updates configurations of a server group", + "tags": [ + "Configurations" + ], + "operationId": "Configurations_BatchUpdate", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Update configurations of the server group": { + "$ref": "./examples/ConfigurationBatchUpdate.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ServerGroupConfiguration" + }, + "description": "The required parameters for updating a server group configurations." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerGroupConfiguration" + } + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + }, + "get": { + "description": "List all the configurations of a server group.", + "tags": [ + "Configurations" + ], + "operationId": "Configurations_ListByServerGroup", + "x-ms-examples": { + "List configurations of the server group": { + "$ref": "./examples/ConfigurationListByServerGroup.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerGroupConfiguration" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/configurations/{configurationName}": { + "put": { + "description": "Updates single configuration of servers in a server group", + "tags": [ + "Configurations" + ], + "operationId": "Configurations_Update", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Update single configuration of the server group": { + "$ref": "./examples/ConfigurationUpdate.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + }, + { + "$ref": "#/parameters/ConfigurationNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ServerGroupConfiguration" + }, + "description": "The required parameters for updating a server group configuration." + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "NoContent" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + }, + "get": { + "description": "Gets information about single server group configuration.", + "tags": [ + "Configurations" + ], + "operationId": "Configurations_Get", + "x-ms-examples": { + "Get single configuration of the server group": { + "$ref": "./examples/ConfigurationGet.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + }, + { + "$ref": "#/parameters/ConfigurationNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerGroupConfiguration" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/firewallRules/{firewallRuleName}": { + "put": { + "description": "Creates a new firewall rule or updates an existing firewall rule.", + "tags": [ + "FirewallRules" + ], + "operationId": "FirewallRules_CreateOrUpdate", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Create a firewall rule of the server group": { + "$ref": "./examples/FirewallRuleCreate.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + }, + { + "$ref": "#/parameters/FirewallRuleNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/FirewallRule" + }, + "description": "The required parameters for creating or updating a firewall rule." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FirewallRule" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/FirewallRule" + } + }, + "202": { + "description": "Accepted" + } + } + }, + "delete": { + "description": "Deletes a server group firewall rule.", + "tags": [ + "FirewallRules" + ], + "operationId": "FirewallRules_Delete", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Delete the firewall rule of the server group": { + "$ref": "./examples/FirewallRuleDelete.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + }, + { + "$ref": "#/parameters/FirewallRuleNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "NoContent" + } + } + }, + "get": { + "description": "Gets information about a server group firewall rule.", + "tags": [ + "FirewallRules" + ], + "operationId": "FirewallRules_Get", + "x-ms-examples": { + "Get the firewall rule of the server group": { + "$ref": "./examples/FirewallRuleGet.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + }, + { + "$ref": "#/parameters/FirewallRuleNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FirewallRule" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/firewallRules": { + "get": { + "description": "List all the firewall rules in a given server group.", + "tags": [ + "FirewallRules" + ], + "operationId": "FirewallRules_ListByServerGroup", + "x-ms-examples": { + "List firewall rules of the server group": { + "$ref": "./examples/FirewallRuleListByServerGroup.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FirewallRuleListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/roles/{roleName}": { + "put": { + "tags": [ + "Roles" + ], + "operationId": "Roles_Create", + "x-ms-examples": { + "RoleCreate": { + "$ref": "./examples/RoleCreate.json" + } + }, + "description": "Creates a new role or updates an existing role.", + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + }, + { + "$ref": "#/parameters/RoleNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/RoleForCreate" + }, + "description": "The required parameters for creating or updating a role." + } + ], + "responses": { + "200": { + "description": "OK" + }, + "201": { + "description": "Created" + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true + }, + "delete": { + "tags": [ + "Roles" + ], + "operationId": "Roles_Delete", + "x-ms-examples": { + "RoleDelete": { + "$ref": "./examples/RoleDelete.json" + } + }, + "description": "Deletes a server group role.", + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + }, + { + "$ref": "#/parameters/RoleNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "NoContent" + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/roles": { + "get": { + "tags": [ + "Roles" + ], + "operationId": "Roles_ListByServerGroup", + "x-ms-examples": { + "RoleList": { + "$ref": "./examples/RoleListByServerGroup.json" + } + }, + "description": "List all the roles in a given server group.", + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/RoleListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/restart": { + "post": { + "description": "Restarts the server group.", + "tags": [ + "ServerGroupOperations" + ], + "operationId": "ServerGroups_Restart", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Restart all servers in the server group": { + "$ref": "./examples/ServerGroupRestart.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/start": { + "post": { + "description": "Starts the server group.", + "tags": [ + "ServerGroupOperations" + ], + "operationId": "ServerGroups_Start", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Start all servers in the server group": { + "$ref": "./examples/ServerGroupStart.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/stop": { + "post": { + "description": "Stops the server group.", + "tags": [ + "ServerGroupOperations" + ], + "operationId": "ServerGroups_Stop", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Stop all servers in the server group": { + "$ref": "./examples/ServerGroupStop.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DBforPostgreSQL/checkNameAvailability": { + "post": { + "description": "Check the availability of name for resource", + "tags": [ + "CheckNameAvailability" + ], + "operationId": "CheckNameAvailability_Execute", + "x-ms-examples": { + "Check name availability": { + "$ref": "./examples/CheckNameAvailability.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "nameAvailabilityRequest", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/NameAvailabilityRequest" + }, + "description": "The required parameters for checking if resource name is available." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/NameAvailability" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, + "/providers/Microsoft.DBforPostgreSQL/operations": { + "get": { + "description": "Lists all of the available REST API operations.", + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "x-ms-examples": { + "List all available operations": { + "$ref": "./examples/OperationList.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationListResult" + } + } + } + } + } + }, + "definitions": { + "ServerVersion": { + "type": "string", + "description": "The version of a server.", + "enum": [ + "11", + "12" + ], + "x-ms-enum": { + "name": "ServerVersion", + "modelAsString": true + } + }, + "CitusVersion": { + "type": "string", + "description": "The citus version of a server.", + "enum": [ + "8.3", + "9.0", + "9.1", + "9.2", + "9.3", + "9.4", + "9.5" + ], + "x-ms-enum": { + "name": "ServerCitusVersion", + "modelAsString": true + } + }, + "ServerRole": { + "type": "string", + "description": "The role of a server.", + "enum": [ + "Coordinator", + "Worker" + ], + "x-ms-enum": { + "name": "ServerRole", + "modelAsString": true + } + }, + "ServerProperties": { + "description": "The properties of a server.", + "properties": { + "serverEdition": { + "type": "string", + "description": "The edition of a server (default: GeneralPurpose).", + "enum": [ + "GeneralPurpose", + "MemoryOptimized" + ], + "x-ms-enum": { + "name": "ServerEdition", + "modelAsString": true + } + }, + "storageQuotaInMb": { + "type": "integer", + "format": "int32", + "description": "The storage of a server in MB (max: 2097152 = 2TiB)." + }, + "vCores": { + "type": "integer", + "format": "int32", + "description": "The vCores count of a server (max: 64)." + }, + "standbyCount": { + "type": "integer", + "format": "int32", + "description": "The standby count of a server.", + "minimum": 0, + "maximum": 1 + }, + "publicIpRequested": { + "type": "boolean", + "description": "If public IP is requested or not for server." + } + } + }, + "ServerRoleGroupList": { + "type": "array", + "description": "The list of server role groups.", + "items": { + "$ref": "#/definitions/ServerRoleGroup" + }, + "minItems": 2, + "maxItems": 2, + "uniqueItems": true + }, + "ServerRoleGroup": { + "description": "Represents a server role group.", + "allOf": [ + { + "$ref": "#/definitions/ServerProperties" + } + ], + "properties": { + "name": { + "type": "string", + "description": "The name of the server role group." + }, + "role": { + "$ref": "#/definitions/ServerRole", + "description": "The role of servers in the server role group." + }, + "serverCount": { + "type": "integer", + "format": "int32", + "description": "The number of servers in the server role group." + }, + "serverNames": { + "type": "array", + "description": "The list of server names in the server role group.", + "items": { + "type": "string" + }, + "readOnly": true, + "minItems": 1, + "uniqueItems": true + } + } + }, + "ServerGroupProperties": { + "description": "The properties of a server group.", + "properties": { + "administratorLogin": { + "type": "string", + "description": "The administrator's login name of servers in server group. Can only be specified when the server is being created (and is required for creation)." + }, + "backupRetentionMinutes": { + "type": "integer", + "description": "The backup retention minutes for server group." + }, + "version": { + "$ref": "#/definitions/ServerVersion", + "description": "The version of servers." + }, + "citusVersion": { + "$ref": "#/definitions/CitusVersion", + "description": "The citus version of servers." + }, + "vnetInjArgs": { + "properties": { + "delegatedVnetID": { + "type": "string", + "description": "delegated vNet ID" + }, + "delegatedSubnetName": { + "type": "string", + "description": "delegated subnet name" + }, + "delegatedVnetName": { + "type": "string", + "description": "delegated vNet name" + } + } + }, + "serverRoleGroups": { + "$ref": "#/definitions/ServerRoleGroupList", + "description": "The list of server role groups." + } + } + }, + "ServerGroup": { + "description": "Represents a server group.", + "allOf": [ + { + "$ref": "../../../../../common-types.json#/definitions/TrackedResource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/ServerGroupProperties", + "description": "The properties of a server group.", + "x-ms-client-flatten": true + } + } + }, + "ServerGroupServerProperties": { + "description": "The properties of a server in server group.", + "allOf": [ + { + "$ref": "#/definitions/ServerProperties" + } + ], + "properties": { + "role": { + "$ref": "#/definitions/ServerRole", + "description": "The role of server in the server group." + }, + "state": { + "type": "string", + "description": "A state of a server that is visible to user.", + "enum": [ + "Ready", + "Dropping", + "Disabled", + "Inaccessible" + ], + "x-ms-enum": { + "name": "ServerState", + "modelAsString": true + } + }, + "haState": { + "type": "string", + "description": "A state of a server that is visible to user for HA feature.", + "enum": [ + "Ready" + ], + "x-ms-enum": { + "name": "ServerHAState", + "modelAsString": true + } + }, + "administratorLogin": { + "type": "string", + "description": "The administrator's login name of a servers in server group." + }, + "version": { + "$ref": "#/definitions/ServerVersion", + "description": "The version of a server." + } + } + }, + "ServerGroupServer": { + "description": "Represents a server in a server group.", + "allOf": [ + { + "$ref": "../../../../../common-types.json#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/ServerGroupServerProperties", + "description": "The properties of a server in a server group.", + "x-ms-client-flatten": true + } + } + }, + "ServerGroupServerList": { + "description": "A list of servers in a server group.", + "properties": { + "value": { + "type": "array", + "description": "The list of servers in a server group.", + "items": { + "$ref": "#/definitions/ServerGroupServer" + } + } + } + }, + "ServerGroupForUpdate": { + "description": "Parameters allowed to update for a server group.", + "allOf": [ + { + "$ref": "../../../../../common-types.json#/definitions/TrackedResource" + } + ], + "properties": { + "administratorLoginPassword": { + "type": "string", + "format": "password", + "description": "The password of the administrator login." + }, + "backupRetentionMinutes": { + "type": "integer", + "description": "Backup retention minutes for the server group." + }, + "version": { + "$ref": "#/definitions/ServerVersion", + "description": "The version of a server." + }, + "serverRoleGroups": { + "$ref": "#/definitions/ServerRoleGroupList", + "description": "The list of server role groups." + } + } + }, + "ServerGroupForCreate": { + "description": "Represents a server group for create.", + "allOf": [ + { + "$ref": "../../../../../common-types.json#/definitions/TrackedResource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/ServerGroupPropertiesForCreate", + "description": "Properties of the server group create." + } + } + }, + "ServerGroupPropertiesForCreate": { + "discriminator": "createMode", + "required": [ + "createMode" + ], + "properties": { + "createMode": { + "type": "string", + "description": "The mode to create a new server group.", + "enum": [ + "Create", + "Update", + "PointInTimeRestore" + ], + "x-ms-enum": { + "name": "CreateMode", + "modelAsString": true + } + } + }, + "description": "The properties used to create a new server group." + }, + "ServerGroupPropertiesForDefaultCreate": { + "x-ms-discriminator-value": "Create", + "description": "The properties used to create a new server group.", + "allOf": [ + { + "$ref": "#/definitions/ServerGroupPropertiesForCreate" + } + ], + "properties": { + "administratorLogin": { + "type": "string", + "description": "The administrator's login name of servers in server group. Can only be specified when the server is being created (and is required for creation)." + }, + "administratorLoginPassword": { + "type": "string", + "format": "password", + "description": "The password of the administrator login." + }, + "backupRetentionMinutes": { + "type": "integer", + "description": "Backup retention minutes for the server group." + }, + "mx": { + "type": "string", + "description": "Data type of the configuration.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "mxEnabledDataType", + "modelAsString": true + } + }, + "zfs": { + "type": "string", + "description": "Data type of the configuration.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "zfsEnabledDataType", + "modelAsString": true + } + }, + "version": { + "$ref": "#/definitions/ServerVersion", + "description": "The version of a server." + }, + "citusVersion": { + "$ref": "#/definitions/CitusVersion", + "description": "The citus version of a server." + }, + "vnetInjArgs": { + "properties": { + "delegatedVnetID": { + "type": "string", + "description": "delegated vNet ID" + }, + "delegatedSubnetName": { + "type": "string", + "description": "delegated subnet name" + }, + "delegatedVnetName": { + "type": "string", + "description": "delegated vNet name" + } + } + }, + "serverRoleGroups": { + "$ref": "#/definitions/ServerRoleGroupList", + "description": "The list of server role groups." + } + }, + "required": [ + "administratorLogin", + "administratorLoginPassword", + "backupRetentionMinutes", + "version", + "serverRoleGroups" + ] + }, + "ServerGroupPropertiesForRestore": { + "x-ms-discriminator-value": "PointInTimeRestore", + "description": "The properties used to create a new server group by restoring from a backup.", + "allOf": [ + { + "$ref": "#/definitions/ServerGroupPropertiesForCreate" + } + ], + "properties": { + "sourceSubscriptionId": { + "type": "string", + "description": "The source subscription id to restore from." + }, + "sourceResourceGroupName": { + "type": "string", + "description": "The source resource group name to restore from." + }, + "sourceServerGroupName": { + "type": "string", + "description": "The source server group name to restore from." + }, + "pointInTimeUTC": { + "type": "string", + "format": "date-time", + "description": "Restore point creation time (ISO8601 format), specifying the time to restore from." + }, + "mx": { + "type": "string", + "description": "Data type of the configuration.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "mxEnabledDataType", + "modelAsString": true + } + }, + "zfs": { + "type": "string", + "description": "Data type of the configuration.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "zfsEnabledDataType", + "modelAsString": true + } + } + }, + "required": [ + "sourceSubscriptionId", + "sourceResourceGroupName", + "sourceServerGroupName", + "pointInTimeUTC" + ] + }, + "ServerGroupPropertiesForUpdate": { + "x-ms-discriminator-value": "Update", + "description": "The properties used to update a server group.", + "allOf": [ + { + "$ref": "#/definitions/ServerGroupPropertiesForCreate" + } + ], + "properties": { + "administratorLoginPassword": { + "type": "string", + "format": "password", + "description": "The password of the administrator login." + }, + "backupRetentionMinutes": { + "type": "integer", + "description": "Backup retention minutes for the server group." + }, + "version": { + "$ref": "#/definitions/ServerVersion", + "description": "The version of a server." + }, + "citusVersion": { + "$ref": "#/definitions/CitusVersion", + "description": "The citus version of a server." + }, + "serverRoleGroups": { + "$ref": "#/definitions/ServerRoleGroupList", + "description": "The list of server role groups." + } + } + }, + "ServerGroupConfiguration": { + "description": "Represents the configuration list of server role groups in a server group.", + "allOf": [ + { + "$ref": "../../../../../common-types.json#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/ServerGroupConfigurationProperties", + "description": "The properties of server group configuration.", + "x-ms-client-flatten": true + } + } + }, + "ServerGroupConfigurationProperties": { + "description": "The properties of server group configuration.", + "properties": { + "serverRoleGroupConfigurations": { + "type": "array", + "description": "The list of server role group configurations.", + "items": { + "$ref": "#/definitions/ServerRoleGroupConfiguration" + }, + "uniqueItems": true + } + } + }, + "ServerRoleGroupConfiguration": { + "description": "Represents server role group configurations.", + "properties": { + "role": { + "$ref": "#/definitions/ServerRole", + "description": "The role of servers in the server role group." + }, + "configurations": { + "type": "array", + "description": "The list of configurations.", + "items": { + "$ref": "#/definitions/ConfigurationPropertiesWithName" + }, + "uniqueItems": true + } + }, + "required": [ + "role", + "configurations" + ] + }, + "ConfigurationPropertiesWithName": { + "description": "The properties of a configuration with name.", + "allOf": [ + { + "$ref": "#/definitions/ConfigurationProperties" + } + ], + "properties": { + "name": { + "type": "string", + "description": "Name of the configuration." + } + }, + "required": [ + "name" + ] + }, + "ConfigurationProperties": { + "description": "The properties of a configuration.", + "properties": { + "value": { + "type": "string", + "description": "Value of the configuration." + }, + "source": { + "type": "string", + "description": "Source of the configuration." + }, + "description": { + "type": "string", + "description": "Description of the configuration.", + "readOnly": true + }, + "defaultValue": { + "type": "string", + "description": "Default value of the configuration.", + "readOnly": true + }, + "dataType": { + "type": "string", + "description": "Data type of the configuration.", + "enum": [ + "Boolean", + "Numeric", + "Integer", + "Enumeration" + ], + "x-ms-enum": { + "name": "ConfigurationDataType", + "modelAsString": true + }, + "readOnly": true + }, + "allowedValues": { + "type": "string", + "description": "Allowed values of the configuration.", + "readOnly": true + } + }, + "required": [ + "value" + ] + }, + "Configuration": { + "description": "Represents a configuration.", + "allOf": [ + { + "$ref": "../../../../../common-types.json#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/ConfigurationProperties", + "description": "The properties of a configuration.", + "x-ms-client-flatten": true + } + } + }, + "ConfigurationList": { + "description": "A list of server configurations.", + "properties": { + "value": { + "type": "array", + "description": "The list of server configurations.", + "items": { + "$ref": "#/definitions/Configuration" + } + }, + "nextLink": { + "type": "string", + "description": "Link to retrieve next page of results.", + "readOnly": true + } + } + }, + "FirewallRuleProperties": { + "description": "The properties of a server group firewall rule.", + "properties": { + "startIpAddress": { + "type": "string", + "description": "The start IP address of the server group firewall rule. Must be IPv4 format.", + "pattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$" + }, + "endIpAddress": { + "type": "string", + "description": "The end IP address of the server group firewall rule. Must be IPv4 format.", + "pattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$" + } + }, + "required": [ + "startIpAddress", + "endIpAddress" + ] + }, + "FirewallRule": { + "description": "Represents a server group firewall rule.", + "allOf": [ + { + "$ref": "../../../../../common-types.json#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/FirewallRuleProperties", + "x-ms-client-flatten": true, + "description": "The properties of a firewall rule." + } + }, + "required": [ + "properties" + ] + }, + "FirewallRuleListResult": { + "description": "A list of firewall rules.", + "properties": { + "value": { + "type": "array", + "description": "The list of firewall rules in a server group.", + "items": { + "$ref": "#/definitions/FirewallRule" + } + } + } + }, + "RolePropertiesForCreate": { + "properties": { + "password": { + "type": "string", + "format": "password", + "description": "The password of the server group role." + } + }, + "required": [ + "password" + ], + "description": "The properties of a server group role." + }, + "RoleForCreate": { + "properties": { + "properties": { + "$ref": "#/definitions/RolePropertiesForCreate", + "x-ms-client-flatten": true, + "description": "The properties of a role for create." + } + }, + "allOf": [ + { + "$ref": "#/definitions/Role" + } + ], + "required": [ + "properties" + ], + "description": "Represents a server group role for create." + }, + "Role": { + "properties": { + "properties": {} + }, + "allOf": [ + { + "$ref": "../../../../../common-types.json#/definitions/TrackedResource" + } + ], + "description": "Represents a server group role." + }, + "RoleListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Role" + }, + "description": "The list of roles in a server group." + } + }, + "description": "A list of roles." + }, + "OperationDisplay": { + "description": "Display metadata associated with the operation.", + "properties": { + "provider": { + "type": "string", + "description": "Operation resource provider name.", + "readOnly": true + }, + "resource": { + "type": "string", + "description": "Resource on which the operation is performed.", + "readOnly": true + }, + "operation": { + "type": "string", + "description": "Localized friendly name for the operation.", + "readOnly": true + }, + "description": { + "type": "string", + "description": "Operation description.", + "readOnly": true + } + } + }, + "Operation": { + "description": "REST API operation definition.", + "properties": { + "name": { + "type": "string", + "description": "The name of the operation being performed on this particular object.", + "readOnly": true + }, + "display": { + "$ref": "#/definitions/OperationDisplay", + "description": "The localized display information for this particular operation or action.", + "readOnly": true + }, + "origin": { + "type": "string", + "description": "The intended executor of the operation.", + "enum": [ + "NotSpecified", + "user", + "system" + ], + "x-ms-enum": { + "name": "OperationOrigin", + "modelAsString": true + }, + "readOnly": true + }, + "properties": { + "type": "object", + "description": "Additional descriptions for the operation.", + "additionalProperties": { + "type": "object" + }, + "readOnly": true, + "x-ms-client-flatten": false + } + } + }, + "OperationListResult": { + "description": "A list of resource provider operations.", + "properties": { + "value": { + "type": "array", + "description": "The list of resource provider operations.", + "items": { + "$ref": "#/definitions/Operation" + } + } + } + }, + "NameAvailabilityRequest": { + "description": "Request from client to check resource name availability.", + "properties": { + "name": { + "type": "string", + "description": "Resource name to verify." + }, + "type": { + "type": "string", + "description": "Resource type used for verification." + } + }, + "required": [ + "name" + ] + }, + "NameAvailability": { + "description": "Represents a resource name availability.", + "properties": { + "message": { + "type": "string", + "description": "Error Message." + }, + "nameAvailable": { + "type": "boolean", + "description": "Indicates whether the resource name is available." + }, + "reason": { + "type": "string", + "description": "Reason for name being unavailable." + } + } + }, + "CloudError": { + "x-ms-external": true, + "description": "An error response from the Batch service.", + "properties": { + "error": { + "$ref": "#/definitions/CloudErrorBody" + } + } + }, + "CloudErrorBody": { + "x-ms-external": true, + "description": "An error response from the Batch service.", + "properties": { + "code": { + "type": "string", + "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically." + }, + "message": { + "type": "string", + "description": "A message describing the error, intended to be suitable for display in a user interface." + }, + "target": { + "type": "string", + "description": "The target of the particular error. For example, the name of the property in error." + }, + "details": { + "type": "array", + "description": "A list of additional details about the error.", + "items": { + "$ref": "#/definitions/CloudErrorBody" + } + } + } + } + }, + "parameters": { + "ServerGroupNameParameter": { + "name": "serverGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the server group.", + "minLength": 1, + "maxLength": 90, + "x-ms-parameter-location": "method" + }, + "ServerNameParameter": { + "name": "serverName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the server.", + "minLength": 1, + "maxLength": 90, + "x-ms-parameter-location": "method" + }, + "ConfigurationNameParameter": { + "name": "configurationName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the server group configuration.", + "minLength": 1, + "maxLength": 90, + "x-ms-parameter-location": "method" + }, + "FirewallRuleNameParameter": { + "name": "firewallRuleName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the server group firewall rule.", + "x-ms-parameter-location": "method" + }, + "RoleNameParameter": { + "name": "roleName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the server group role name.", + "x-ms-parameter-location": "method" } } -} +} \ No newline at end of file From 964f866e10b0605f46406b302efdf7e5608b7857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mehmet=20furkan=20=C5=9Fahin?= Date: Tue, 3 Nov 2020 13:14:35 +0100 Subject: [PATCH 10/65] common-types path fix --- .../postgresqlhsc.json | 148 +++++++++--------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 6884e3653a9e..98fedc046250 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -55,13 +55,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -116,13 +116,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -157,13 +157,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -210,13 +210,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -264,13 +264,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -306,13 +306,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -351,13 +351,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -397,13 +397,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -449,13 +449,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -492,13 +492,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -547,13 +547,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -593,13 +593,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -649,13 +649,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -689,13 +689,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -728,13 +728,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -767,13 +767,13 @@ "description": "Creates a new role or updates an existing role.", "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -817,13 +817,13 @@ "description": "Deletes a server group role.", "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -860,13 +860,13 @@ "description": "List all the roles in a given server group.", "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -900,13 +900,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -943,13 +943,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -986,13 +986,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ServerGroupNameParameter" @@ -1028,10 +1028,10 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { "name": "nameAvailabilityRequest", @@ -1073,7 +1073,7 @@ }, "parameters": [ { - "$ref": "../../../../../common-types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -1255,7 +1255,7 @@ "description": "Represents a server group.", "allOf": [ { - "$ref": "../../../../../common-types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" } ], "properties": { @@ -1317,7 +1317,7 @@ "description": "Represents a server in a server group.", "allOf": [ { - "$ref": "../../../../../common-types.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -1344,7 +1344,7 @@ "description": "Parameters allowed to update for a server group.", "allOf": [ { - "$ref": "../../../../../common-types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" } ], "properties": { @@ -1371,7 +1371,7 @@ "description": "Represents a server group for create.", "allOf": [ { - "$ref": "../../../../../common-types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" } ], "properties": { @@ -1580,7 +1580,7 @@ "description": "Represents the configuration list of server role groups in a server group.", "allOf": [ { - "$ref": "../../../../../common-types.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -1692,7 +1692,7 @@ "description": "Represents a configuration.", "allOf": [ { - "$ref": "../../../../../common-types.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -1743,7 +1743,7 @@ "description": "Represents a server group firewall rule.", "allOf": [ { - "$ref": "../../../../../common-types.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -1806,7 +1806,7 @@ }, "allOf": [ { - "$ref": "../../../../../common-types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" } ], "description": "Represents a server group role." From e51be4289aa180ea24de0b57c3158337f25a72b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mehmet=20furkan=20=C5=9Fahin?= Date: Tue, 3 Nov 2020 13:22:20 +0100 Subject: [PATCH 11/65] definition reference fix --- .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 98fedc046250..bc91287f5b1a 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -235,7 +235,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/ServerGroup" } }, "202": { From f7fb3351153ea7cb36a71688aefa5547659848b4 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Tue, 3 Nov 2020 17:34:07 +0300 Subject: [PATCH 12/65] Change publicIpRequested boolean with publicNetworkAccess enum --- .../examples/ServerGroupCreate.json | 6 ++---- .../examples/ServerGroupGet.json | 4 ++-- .../examples/ServerGroupGetServer.json | 2 +- .../examples/ServerGroupListServers.json | 6 +++--- .../examples/ServerGroupUpdatePut.json | 6 ++---- .../2020-10-05-privatepreview/postgresqlhsc.json | 15 ++++++++++++--- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index b7112e8aa031..25c5711262b4 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -28,8 +28,7 @@ "serverEdition": "GeneralPurpose", "vCores": 4, "storageQuotaInMb": 524288, - "standbyCount": 1, - "publicIpRequested": true + "standbyCount": 1 }, { "name": "", @@ -38,8 +37,7 @@ "serverEdition": "MemoryOptimized", "vCores": 4, "storageQuotaInMb": 524288, - "standbyCount": 0, - "publicIpRequested": false + "standbyCount": 0 } ] }, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index 70a2ca8b6ce0..1ce75bb94d4b 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -36,7 +36,7 @@ "storageQuotaInMb": 10000, "vCores": 4, "standbyCount": 1, - "publicIpRequested": true, + "publicNetworkAccess": "Enabled", "serverNames": [ "hsctestsg1-c" ] @@ -49,7 +49,7 @@ "storageQuotaInMb": 10000, "vCores": 8, "standbyCount": 0, - "publicIpRequested": false, + "publicNetworkAccess": "Disabled", "serverNames": [ "hsctestsg1-w0", "hsctestsg1-w1", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json index 49a0d9bb06bb..9d8d67802c76 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json @@ -20,7 +20,7 @@ "storageQuotaInMb": 10000, "vCores": 4, "standbyCount": 1, - "publicIpRequested": true, + "publicNetworkAccess": "Enabled", "state": "Ready", "haState": "Ready" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json index b76a492c5594..3b4a0845d735 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json @@ -21,7 +21,7 @@ "storageQuotaInMb": 10000, "vCores": 4, "standbyCount": 1, - "publicIpRequested": true, + "publicNetworkAccess": "Enabled", "state": "Ready", "haState": "Ready" } @@ -38,7 +38,7 @@ "storageQuotaInMb": 10000, "vCores": 4, "standbyCount": 0, - "publicIpRequested": false, + "publicNetworkAccess": "Disabled", "state": "Ready", "haState": "Ready" } @@ -55,7 +55,7 @@ "storageQuotaInMb": 10000, "vCores": 4, "standbyCount": 0, - "publicIpRequested": false, + "publicNetworkAccess": "Disabled", "state": "Ready", "haState": "Ready" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json index 9c8b92cb94f2..c1076df16246 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json @@ -19,8 +19,7 @@ "serverEdition": "GeneralPurpose", "vCores": 4, "storageQuotaInMb": 524288, - "standbyCount": 1, - "publicIpRequested": true + "standbyCount": 1 }, { "name": "", @@ -29,8 +28,7 @@ "serverEdition": "MemoryOptimized", "vCores": 4, "storageQuotaInMb": 524288, - "standbyCount": 0, - "publicIpRequested": false + "standbyCount": 0 } ] }, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index bc91287f5b1a..5a236695b292 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1161,9 +1161,18 @@ "minimum": 0, "maximum": 1 }, - "publicIpRequested": { - "type": "boolean", - "description": "If public IP is requested or not for server." + "publicNetworkAccess": { + "type": "string", + "description": "public network access is enabled or not", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "ServerPublicNetworkAccessState", + "modelAsString": true + }, + "readOnly": true } } }, From 4a2f0a16d4616b1f21035f9001ee67960807c8a7 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Tue, 3 Nov 2020 18:13:23 +0300 Subject: [PATCH 13/65] Change serverGroups to ServerGroupsv2 in path and id --- .../examples/CheckNameAvailability.json | 2 +- .../examples/ConfigurationBatchUpdate.json | 2 +- .../examples/ConfigurationGet.json | 2 +- .../examples/ConfigurationListByServer.json | 2 +- .../ConfigurationListByServerGroup.json | 2 +- .../examples/ConfigurationUpdate.json | 2 +- .../examples/FirewallRuleCreate.json | 16 +++++------ .../examples/FirewallRuleDelete.json | 8 +++--- .../examples/FirewallRuleGet.json | 12 ++++---- .../FirewallRuleListByServerGroup.json | 14 +++++----- .../examples/OperationList.json | 28 +++++++++---------- .../examples/RoleCreate.json | 8 +++--- .../examples/RoleDelete.json | 8 +++--- .../examples/RoleListByServerGroup.json | 14 +++++----- .../examples/ServerGroupAddNode.json | 6 ++-- .../examples/ServerGroupCreate.json | 4 +-- .../examples/ServerGroupCreatePITR.json | 8 +++--- .../examples/ServerGroupDelete.json | 6 ++-- .../examples/ServerGroupGet.json | 11 ++++---- .../examples/ServerGroupGetServer.json | 12 ++++---- .../examples/ServerGroupListServers.json | 18 ++++++------ .../examples/ServerGroupRestart.json | 6 ++-- .../examples/ServerGroupScaleCompute.json | 6 ++-- .../examples/ServerGroupScaleStorage.json | 6 ++-- .../examples/ServerGroupStart.json | 6 ++-- .../examples/ServerGroupStop.json | 6 ++-- .../examples/ServerGroupUpdatePatch.json | 6 ++-- .../examples/ServerGroupUpdatePut.json | 6 ++-- .../postgresqlhsc.json | 20 ++++++------- 29 files changed, 124 insertions(+), 123 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json index 81d1f7ea55ae..a7d03988de6e 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json @@ -2,7 +2,7 @@ { "parameters": { "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "api-version": "2020-10-05-preview", + "api-version": "2020-10-05-privatepreview", "nameAvailabilityRequest": { "name": "name1", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2" diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json index a71182b0e50e..0254f2fd9341 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json @@ -3,7 +3,7 @@ "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestResourceGroup", "serverGroupName": "hsctestsg", - "api-version": "2020-10-05-preview", + "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { "serverRoleGroupConfigurations": [ diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json index 25c7eb5e86b7..8dd4b008b182 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json @@ -4,7 +4,7 @@ "resourceGroupName": "TestResourceGroup", "serverGroupName": "hsctestsg", "configurationName": "array_nulls", - "api-version": "2020-10-05-preview" + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": { diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json index 536c964d2163..492d45e2c915 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json @@ -4,7 +4,7 @@ "resourceGroupName": "TestResourceGroup", "serverGroupName": "hsctestsg", "serverName": "testserver", - "api-version": "2020-10-05-preview" + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": { diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json index 54cab10b8b98..3da57eb031e5 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json @@ -3,7 +3,7 @@ "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestResourceGroup", "serverGroupName": "hsctestsg", - "api-version": "2020-10-05-preview" + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": { diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json index 04386acc54c1..4dac83edf055 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json @@ -4,7 +4,7 @@ "resourceGroupName": "TestResourceGroup", "serverGroupName": "hsctestsg", "configurationName": "array_nulls", - "api-version": "2020-10-05-preview", + "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { "serverRoleGroupConfigurations": [ diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json index 8c8eca925d9a..687ab2fa6383 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json @@ -1,10 +1,10 @@ { "parameters": { - "firewallRuleName": "rule1", - "serverGroupName": "pgtestsvc4", - "resourceGroupName": "TestGroup", - "api-version": "2017-12-01", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverGroupName": "pgtestsvc4", + "firewallRuleName": "rule1", + "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { "startIpAddress": "0.0.0.0", @@ -15,9 +15,9 @@ "responses": { "201": { "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroups/pgtestsvc4/firewallRules/rule1", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/firewallRules/rule1", "name": "rule1", - "type": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules", "properties": { "startIpAddress": "0.0.0.0", "endIpAddress": "255.255.255.255" @@ -26,9 +26,9 @@ }, "200": { "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroups/pgtestsvc4/firewallRules/rule1", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/firewallRules/rule1", "name": "rule1", - "type": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules", "properties": { "startIpAddress": "0.0.0.0", "endIpAddress": "255.255.255.255" diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json index 8729b633e2c4..1a7dd878f04a 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json @@ -1,10 +1,10 @@ { "parameters": { - "firewallRuleName": "rule1", - "serverGroupName": "pgtestsvc4", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "api-version": "2017-12-01", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + "serverGroupName": "pgtestsvc4", + "firewallRuleName": "rule1", + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": {}, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json index 4fcb2496282d..6dab2ba865e5 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json @@ -1,17 +1,17 @@ { "parameters": { - "firewallRuleName": "rule1", - "serverGroupName": "pgtestsvc4", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "api-version": "2017-12-01", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + "serverGroupName": "pgtestsvc4", + "firewallRuleName": "rule1", + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": { "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroups/pgtestsvc4/firewallRules/rule1", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/firewallRules/rule1", "name": "rule1", - "type": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules", "properties": { "startIpAddress": "0.0.0.0", "endIpAddress": "255.255.255.255" diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json index de8446a3527a..d6a866ce6ab8 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json @@ -1,27 +1,27 @@ { "parameters": { - "serverGroupName": "pgtestsvc4", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "api-version": "2017-12-01", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + "serverGroupName": "pgtestsvc4", + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroups/pgtestsvc4/firewallRules/rule1", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/firewallRules/rule1", "name": "rule1", - "type": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules", "properties": { "startIpAddress": "0.0.0.0", "endIpAddress": "255.255.255.255" } }, { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroups/pgtestsvc4/firewallRules/rule2", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/firewallRules/rule2", "name": "rule2", - "type": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules", "properties": { "startIpAddress": "1.0.0.0", "endIpAddress": "255.0.0.0" diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationList.json index 8295c7885504..b1aaf96d6cc2 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationList.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationList.json @@ -1,13 +1,13 @@ { "parameters": { - "api-version": "2017-12-01" + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": { "body": { "value": [ { - "name": "Microsoft.DBforPostgreSQL/serverGroups/read", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/read", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "PostgreSQL Server Group", @@ -16,7 +16,7 @@ } }, { - "name": "Microsoft.DBforPostgreSQL/serverGroups/write", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/write", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "PostgreSQL Server Group", @@ -25,7 +25,7 @@ } }, { - "name": "Microsoft.DBforPostgreSQL/serverGroups/delete", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/delete", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "PostgreSQL Server Grouo", @@ -34,7 +34,7 @@ } }, { - "name": "Microsoft.DBforPostgreSQL/serverGroups/servers/read", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers/read", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "PostgreSQL Server", @@ -43,7 +43,7 @@ } }, { - "name": "Microsoft.DBforPostgreSQL/serverGroups/servers/configurations/read", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers/configurations/read", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "Configurations", @@ -52,7 +52,7 @@ } }, { - "name": "Microsoft.DBforPostgreSQL/serverGroups/configurations/read", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations/read", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "Configurations", @@ -61,7 +61,7 @@ } }, { - "name": "Microsoft.DBforPostgreSQL/serverGroups/configurations/write", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations/write", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "Configurations", @@ -70,7 +70,7 @@ } }, { - "name": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules/read", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules/read", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "Firewall Rules", @@ -79,7 +79,7 @@ } }, { - "name": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules/write", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules/write", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "Firewall Rules", @@ -88,7 +88,7 @@ } }, { - "name": "Microsoft.DBforPostgreSQL/serverGroups/firewallRules/delete", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules/delete", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "Firewall Rules", @@ -97,7 +97,7 @@ } }, { - "name": "Microsoft.DBforPostgreSQL/servers/providers/Microsoft.Insights/metricDefinitions/read", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/providers/Microsoft.Insights/metricDefinitions/read", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "Database Metric Definition", @@ -173,7 +173,7 @@ } }, { - "name": "Microsoft.DBforPostgreSQL/servers/providers/Microsoft.Insights/diagnosticSettings/read", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/providers/Microsoft.Insights/diagnosticSettings/read", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "Database Metric Definition", @@ -182,7 +182,7 @@ } }, { - "name": "Microsoft.DBforPostgreSQL/servers/providers/Microsoft.Insights/diagnosticSettings/write", + "name": "Microsoft.DBforPostgreSQL/serverGroupsv2/providers/Microsoft.Insights/diagnosticSettings/write", "display": { "provider": "Microsoft DB for PostgreSQL", "resource": "Database Metric Definition", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json index 7b9369dc9111..1793208adf9f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json @@ -1,10 +1,10 @@ { "parameters": { - "roleName": "role1", - "serverGroupName": "pgtestsvc4", - "resourceGroupName": "TestGroup", - "api-version": "2017-12-01", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverGroupName": "pgtestsvc4", + "roleName": "role1", + "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { "password": "secret" diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json index a57df4e8d424..b041e47cf268 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json @@ -1,10 +1,10 @@ { "parameters": { - "roleName": "role1", - "serverGroupName": "pgtestsvc4", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "api-version": "2017-12-01", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + "serverGroupName": "pgtestsvc4", + "roleName": "role1", + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": {}, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json index 16f99478bc10..906afff7cf5c 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json @@ -1,24 +1,24 @@ { "parameters": { - "serverGroupName": "pgtestsvc4", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "api-version": "2017-12-01", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + "serverGroupName": "pgtestsvc4", + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/roles/role1", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/roles/role1", "name": "role1", - "type": "Microsoft.DBforPostgreSQL/roles", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/roles", "properties": {} }, { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/roles/role2", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/roles/role2", "name": "role2", - "type": "Microsoft.DBforPostgreSQL/roles", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/roles", "properties": {} } ] diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json index 6f3115e2d83d..4a67d6db3a09 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json @@ -1,9 +1,9 @@ { "parameters": { - "serverGroupName": "pgtestsvc4", - "resourceGroupName": "TestGroup", - "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverGroupName": "pgtestsvc4", + "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { "serverRoleGroups": [ diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index b7112e8aa031..0fe50b576f3d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -1,9 +1,9 @@ { "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "api-version": "2017-12-01-preview", "serverGroupName": "pgtestsvc4", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "api-version": "2020-10-05-privatepreview", "parameters": { "location": "westus", "properties": { diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json index 55cebce5b252..34ad22798642 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json @@ -1,9 +1,9 @@ { "parameters": { - "serverGroupName": "pgtestsvc4", - "resourceGroupName": "TestGroup", - "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverGroupName": "pgtestsvc4", + "api-version": "2020-10-05-privatepreview", "parameters": { "location": "westus", "properties": { @@ -11,7 +11,7 @@ "pointInTimeUTC": "2017-12-14T00:00:37.467Z", "sourceSubscriptionId": "dddddddd-dddd-dddd-dddd-dddddddddddd", "sourceResourceGroupName": "SourceGroup", - "sourceServerGroupName": "pgtests_source_server_group", + "sourceServerGroupName": "pgtests-source-server-group", "mx": "Enabled", "zfs": "Disabled" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json index 6480757bc69a..398ad68b4a9e 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json @@ -1,9 +1,9 @@ { "parameters": { - "serverGroupName": "testservergroup", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "api-version": "2017-12-01-preview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + "serverGroupName": "testservergroup", + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": {}, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index 70a2ca8b6ce0..8a3c126e60fe 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -1,15 +1,16 @@ { "parameters": { - "serverGroupName": "hsctestsg1", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "api-version": "2017-12-01-preview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + "serverGroupName": "hsctestsg1", + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": { "body": { - "id": "2a3fe856-9ba3-4551-97e2-d496c1a39bba", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg1", "name": "hsctestsg1", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", "tags": { "additionalProp1": "string", "additionalProp2": "string", @@ -17,7 +18,7 @@ }, "location": "eastus", "properties": { - "administratorLogin": "string", + "administratorLogin": "citus", "version": "12", "citusVersion": "9.5", "mx": "Enabled", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json index 49a0d9bb06bb..4c47cc501f02 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json @@ -1,17 +1,17 @@ { "parameters": { - "serverGroupName": "hsctestsg1", - "resourceGroupName": "TestGroup", - "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "serverName": "hsctestsg1-c" + "resourceGroupName": "TestGroup", + "serverGroupName": "hsctestsg1", + "serverName": "hsctestsg1-c", + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": { "body": { - "id": "2a3fe856-9ba3-4551-97e2-d496c1a39bba", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg1/servers/hsctestsg1-c", "name": "hsctestsg1-c", - "type": "Microsoft.DBforPostgreSQL/serverGroups/servers", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers", "properties": { "administratorLogin": "string", "version": "12", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json index b76a492c5594..aa2bc72168a3 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json @@ -1,18 +1,18 @@ { "parameters": { - "serverGroupName": "hsctestsg1", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "api-version": "2017-12-01-preview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + "serverGroupName": "hsctestsg1", + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": { "body": { "value":[ { - "id": "2a3fe856-9ba3-4551-97e2-d496c1a39bba", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg1/servers/hsctestsg1-c", "name": "hsctestsg1-c", - "type": "Microsoft.DBforPostgreSQL/serverGroups/servers", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers", "properties": { "administratorLogin": "string", "version": "12", @@ -27,9 +27,9 @@ } }, { - "id": "2a3fe856-9ba3-4551-97e2-d496c1a39bba", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg1/servers/hsctestsg1-w0", "name": "hsctestsg1-w0", - "type": "Microsoft.DBforPostgreSQL/serverGroups/servers", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers", "properties": { "administratorLogin": "string", "version": "12", @@ -44,9 +44,9 @@ } }, { - "id": "2a3fe856-9ba3-4551-97e2-d496c1a39bba", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg1/servers/hsctestsg1-w1", "name": "hsctestsg1-w1", - "type": "Microsoft.DBforPostgreSQL/serverGroups/servers", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers", "properties": { "administratorLogin": "string", "version": "12", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupRestart.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupRestart.json index 84c10363cf13..90373f83b169 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupRestart.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupRestart.json @@ -1,9 +1,9 @@ { "parameters": { - "serverGroupName": "hsctestsg1", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "api-version": "2020-02-14-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + "serverGroupName": "hsctestsg1", + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": {}, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json index fbde6f99b40b..2ec28bf24c1c 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json @@ -1,9 +1,9 @@ { "parameters": { - "serverGroupName": "pgtestsvc4", - "resourceGroupName": "TestGroup", - "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverGroupName": "pgtestsvc4", + "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { "serverRoleGroups": [ diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json index 5cc94dee5b19..5e3f1fce0505 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json @@ -1,9 +1,9 @@ { "parameters": { - "serverGroupName": "pgtestsvc4", - "resourceGroupName": "TestGroup", - "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverGroupName": "pgtestsvc4", + "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { "serverRoleGroups": [ diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStart.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStart.json index 84c10363cf13..90373f83b169 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStart.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStart.json @@ -1,9 +1,9 @@ { "parameters": { - "serverGroupName": "hsctestsg1", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "api-version": "2020-02-14-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + "serverGroupName": "hsctestsg1", + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": {}, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStop.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStop.json index 84c10363cf13..90373f83b169 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStop.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStop.json @@ -1,9 +1,9 @@ { "parameters": { - "serverGroupName": "hsctestsg1", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "api-version": "2020-02-14-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + "serverGroupName": "hsctestsg1", + "api-version": "2020-10-05-privatepreview" }, "responses": { "200": {}, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json index cfaaabbf4ec2..cb305952a2ed 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json @@ -1,9 +1,9 @@ { "parameters": { - "serverGroupName": "pgtestsvc4", - "resourceGroupName": "TestGroup", - "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverGroupName": "pgtestsvc4", + "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { "version": "12", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json index 9c8b92cb94f2..2e13628b878d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json @@ -1,9 +1,9 @@ { "parameters": { - "serverGroupName": "pgtestsvc4", - "resourceGroupName": "TestGroup", - "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverGroupName": "pgtestsvc4", + "api-version": "2020-10-05-privatepreview", "parameters": { "location": "westus", "properties": { diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index bc91287f5b1a..852970025bc2 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -34,7 +34,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}": { "put": { "description": "Creates a new server group with servers.", "tags": [ @@ -250,7 +250,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/servers": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/servers": { "get": { "description": "Lists servers of a server group.", "tags": [ @@ -292,7 +292,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/servers/{serverName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/servers/{serverName}": { "get": { "description": "Gets information about a server in server group.", "tags": [ @@ -578,7 +578,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/firewallRules/{firewallRuleName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/firewallRules/{firewallRuleName}": { "put": { "description": "Creates a new firewall rule or updates an existing firewall rule.", "tags": [ @@ -714,7 +714,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/firewallRules": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/firewallRules": { "get": { "description": "List all the firewall rules in a given server group.", "tags": [ @@ -753,7 +753,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/roles/{roleName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/roles/{roleName}": { "put": { "tags": [ "Roles" @@ -846,7 +846,7 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/roles": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/roles": { "get": { "tags": [ "Roles" @@ -885,7 +885,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/restart": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/restart": { "post": { "description": "Restarts the server group.", "tags": [ @@ -928,7 +928,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/start": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/start": { "post": { "description": "Starts the server group.", "tags": [ @@ -971,7 +971,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroups/{serverGroupName}/stop": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/stop": { "post": { "description": "Stops the server group.", "tags": [ From eb7f898d765d9b74ba10e112c45b8ca70a9f3cc6 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Thu, 19 Nov 2020 20:17:57 +0300 Subject: [PATCH 14/65] Add responses to examples --- .../examples/ConfigurationBatchUpdate.json | 45 ++++++++++++- .../examples/ConfigurationUpdate.json | 31 ++++++++- .../examples/FirewallRuleDelete.json | 3 +- .../examples/RoleDelete.json | 3 +- .../examples/ServerGroupAddNode.json | 14 ++++- .../examples/ServerGroupCreate.json | 22 ++++++- .../examples/ServerGroupCreatePITR.json | 22 ++++++- .../examples/ServerGroupDelete.json | 3 +- .../examples/ServerGroupScaleCompute.json | 14 ++++- .../examples/ServerGroupScaleStorage.json | 14 ++++- .../examples/ServerGroupUpdatePatch.json | 14 ++++- .../examples/ServerGroupUpdatePut.json | 20 +++++- .../postgresqlhsc.json | 63 +++++++++++++------ 13 files changed, 229 insertions(+), 39 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json index 0254f2fd9341..e7a67ef67c8d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json @@ -41,5 +41,48 @@ } } }, - "responses": {} + "responses": { + "200": { + "body": { + "properties": { + "serverRoleGroupConfigurations": [ + { + "role": "Coordinator", + "configurations": [ + { + "name": "array_nulls", + "value": "on" + }, + { + "name": "backslash_quote", + "value": "safe_encoding" + }, + { + "name": "bytea_output", + "value": "hex" + } + ] + }, + { + "role": "Worker", + "configurations": [ + { + "name": "check_function_bodies", + "value": "on" + }, + { + "name": "client_encoding", + "value": "sql_ascii" + } + ] + } + ] + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations", + "name": "hsctestsg-config", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations" + } + }, + "202": {} + } } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json index 4dac83edf055..ede4e921b504 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json @@ -28,5 +28,34 @@ } } }, - "responses": {} + "responses": { + "200": { + "body": { + "properties": { + "serverRoleGroupConfigurations": [ + { + "role": "Coordinator", + "configurations": [ + { + "value": "on" + } + ] + }, + { + "role": "Worker", + "configurations": [ + { + "value": "off" + } + ] + } + ] + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/array_nulls", + "name": "hsctestsg-array_nulls", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations" + } + }, + "202": {} + } } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json index 1a7dd878f04a..0435c004de7e 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json @@ -8,7 +8,6 @@ }, "responses": { "200": {}, - "202": {}, - "204": {} + "202": {} } } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json index b041e47cf268..4da6e7a5155d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json @@ -8,7 +8,6 @@ }, "responses": { "200": {}, - "202": {}, - "204": {} + "202": {} } } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json index 4a67d6db3a09..3c80777c481d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "serverGroupName": "pgtestsvc4", + "serverGroupName": "hsctestsg", "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { @@ -16,5 +16,15 @@ } } }, - "responses": {} + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", + "name": "hsctestsg", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "properties": {} + } + }, + "202": {} + } } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index 8e965d48aebb..98b42c9d82ae 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "serverGroupName": "pgtestsvc4", + "serverGroupName": "hsctestsg", "api-version": "2020-10-05-privatepreview", "parameters": { "location": "westus", @@ -46,5 +46,23 @@ } } }, - "responses": {} + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", + "name": "hsctestsg", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "properties": {} + } + }, + "201": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", + "name": "hsctestsg", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "properties": {} + } + }, + "202": {} + } } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json index 34ad22798642..52acfb306337 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "serverGroupName": "pgtestsvc4", + "serverGroupName": "hsctestsg", "api-version": "2020-10-05-privatepreview", "parameters": { "location": "westus", @@ -17,5 +17,23 @@ } } }, - "responses": {} + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", + "name": "hsctestsg", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "properties": {} + } + }, + "201": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", + "name": "hsctestsg", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "properties": {} + } + }, + "202": {} + } } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json index 398ad68b4a9e..45c7a551c094 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json @@ -7,7 +7,6 @@ }, "responses": { "200": {}, - "202": {}, - "204": {} + "202": {} } } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json index 2ec28bf24c1c..960b54d173ce 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "serverGroupName": "pgtestsvc4", + "serverGroupName": "hsctestsg", "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { @@ -16,5 +16,15 @@ } } }, - "responses": {} + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", + "name": "hsctestsg", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "properties": {} + } + }, + "202": {} + } } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json index 5e3f1fce0505..841605fe03d3 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "serverGroupName": "pgtestsvc4", + "serverGroupName": "hsctestsg", "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { @@ -16,5 +16,15 @@ } } }, - "responses": {} + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", + "name": "hsctestsg", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "properties": {} + } + }, + "202": {} + } } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json index cb305952a2ed..8cca7e301760 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "serverGroupName": "pgtestsvc4", + "serverGroupName": "hsctestsg", "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { @@ -35,5 +35,15 @@ } } }, - "responses": {} + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", + "name": "hsctestsg", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "properties": {} + } + }, + "202": {} + } } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json index d458d5b3fcd6..8480e468f191 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json @@ -37,5 +37,23 @@ } } }, - "responses": {} + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", + "name": "hsctestsg", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "properties": {} + } + }, + "201": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", + "name": "hsctestsg", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "properties": {} + } + }, + "202": {} + } } \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index bb3d32624485..016253434588 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -92,9 +92,6 @@ "202": { "description": "Accepted" }, - "204": { - "description": "NoContent" - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -176,9 +173,6 @@ "202": { "description": "Accepted" }, - "204": { - "description": "NoContent" - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -523,9 +517,6 @@ "202": { "description": "Accepted" }, - "204": { - "description": "NoContent" - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -632,6 +623,12 @@ }, "202": { "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } } }, @@ -671,8 +668,11 @@ "202": { "description": "Accepted" }, - "204": { - "description": "NoContent" + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } } }, @@ -710,6 +710,12 @@ "schema": { "$ref": "#/definitions/FirewallRule" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } } } @@ -746,6 +752,12 @@ "schema": { "$ref": "#/definitions/FirewallRuleListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-pageable": { @@ -759,6 +771,7 @@ "Roles" ], "operationId": "Roles_Create", + "x-ms-long-running-operation": true, "x-ms-examples": { "RoleCreate": { "$ref": "./examples/RoleCreate.json" @@ -800,15 +813,21 @@ }, "202": { "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } - }, - "x-ms-long-running-operation": true + } }, "delete": { "tags": [ "Roles" ], "operationId": "Roles_Delete", + "x-ms-long-running-operation": true, "x-ms-examples": { "RoleDelete": { "$ref": "./examples/RoleDelete.json" @@ -839,11 +858,13 @@ "202": { "description": "Accepted" }, - "204": { - "description": "NoContent" + "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/serverGroupsv2/{serverGroupName}/roles": { @@ -878,6 +899,12 @@ "schema": { "$ref": "#/definitions/RoleListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-pageable": { @@ -1400,7 +1427,7 @@ "type": "string", "description": "The mode to create a new server group.", "enum": [ - "Create", + "Default", "Update", "PointInTimeRestore" ], From 6322d76119ae24c39d037d16b6794ebf77f5f5d6 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Thu, 19 Nov 2020 20:45:27 +0300 Subject: [PATCH 15/65] Add missing location property to examples --- .../examples/ServerGroupAddNode.json | 3 ++- .../examples/ServerGroupCreate.json | 6 ++++-- .../examples/ServerGroupCreatePITR.json | 6 ++++-- .../examples/ServerGroupScaleCompute.json | 3 ++- .../examples/ServerGroupScaleStorage.json | 3 ++- .../examples/ServerGroupUpdatePatch.json | 3 ++- .../examples/ServerGroupUpdatePut.json | 6 ++++-- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json index 3c80777c481d..06acb5d4de7d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json @@ -22,7 +22,8 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", - "properties": {} + "properties": {}, + "location": "westus2" } }, "202": {} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index 98b42c9d82ae..2bb202a7f0ca 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -52,7 +52,8 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", - "properties": {} + "properties": {}, + "location": "westus2" } }, "201": { @@ -60,7 +61,8 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", - "properties": {} + "properties": {}, + "location": "westus2" } }, "202": {} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json index 52acfb306337..e68f5dd4fd7f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json @@ -23,7 +23,8 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", - "properties": {} + "properties": {}, + "location": "westus2" } }, "201": { @@ -31,7 +32,8 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", - "properties": {} + "properties": {}, + "location": "westus2" } }, "202": {} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json index 960b54d173ce..eedc51f511c1 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json @@ -22,7 +22,8 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", - "properties": {} + "properties": {}, + "location": "westus2" } }, "202": {} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json index 841605fe03d3..d422a60a4bf8 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json @@ -22,7 +22,8 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", - "properties": {} + "properties": {}, + "location": "westus2" } }, "202": {} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json index 8cca7e301760..13d3cac77a0d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json @@ -41,7 +41,8 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", - "properties": {} + "properties": {}, + "location": "westus2" } }, "202": {} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json index 8480e468f191..7ee8551e0a49 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json @@ -43,7 +43,8 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", - "properties": {} + "properties": {}, + "location": "westus2" } }, "201": { @@ -51,7 +52,8 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", - "properties": {} + "properties": {}, + "location": "westus2" } }, "202": {} From 58d4da926d053251bbc0dfd374620b07e0a60ce9 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Thu, 19 Nov 2020 21:01:49 +0300 Subject: [PATCH 16/65] Add missing locations to requests --- .../2020-10-05-privatepreview/examples/ServerGroupAddNode.json | 1 + .../examples/ServerGroupScaleCompute.json | 1 + .../examples/ServerGroupScaleStorage.json | 1 + .../examples/ServerGroupUpdatePatch.json | 1 + .../examples/ServerGroupUpdatePut.json | 2 +- .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 2 +- 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json index 06acb5d4de7d..0fca6d272a19 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json @@ -5,6 +5,7 @@ "serverGroupName": "hsctestsg", "api-version": "2020-10-05-privatepreview", "parameters": { + "location": "westus", "properties": { "serverRoleGroups": [ { diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json index eedc51f511c1..d95982c251eb 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json @@ -5,6 +5,7 @@ "serverGroupName": "hsctestsg", "api-version": "2020-10-05-privatepreview", "parameters": { + "location": "westus", "properties": { "serverRoleGroups": [ { diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json index d422a60a4bf8..5e2e710ea384 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json @@ -5,6 +5,7 @@ "serverGroupName": "hsctestsg", "api-version": "2020-10-05-privatepreview", "parameters": { + "location": "westus", "properties": { "serverRoleGroups": [ { diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json index 13d3cac77a0d..ac67f3ac9d4c 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json @@ -5,6 +5,7 @@ "serverGroupName": "hsctestsg", "api-version": "2020-10-05-privatepreview", "parameters": { + "location": "westus", "properties": { "version": "12", "administratorLoginPassword": "secret", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json index 7ee8551e0a49..982325c20e92 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "TestGroup", - "serverGroupName": "pgtestsvc4", + "serverGroupName": "hsctestsg", "api-version": "2020-10-05-privatepreview", "parameters": { "location": "westus", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 016253434588..f7e27e36de26 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1842,7 +1842,7 @@ }, "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a server group role." From c6d2d060828475df574363827557b8dee903c61b Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Thu, 19 Nov 2020 21:32:38 +0300 Subject: [PATCH 17/65] Remove required name --- .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index f7e27e36de26..2d9902e58c4c 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1673,10 +1673,7 @@ "type": "string", "description": "Name of the configuration." } - }, - "required": [ - "name" - ] + } }, "ConfigurationProperties": { "description": "The properties of a configuration.", From 2997d6235738458dff4796d96b144b574407b806 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 00:47:03 +0300 Subject: [PATCH 18/65] Fix server group update --- .../postgresqlhsc.json | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 2d9902e58c4c..ec536be60251 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1384,22 +1384,9 @@ } ], "properties": { - "administratorLoginPassword": { - "type": "string", - "format": "password", - "description": "The password of the administrator login." - }, - "backupRetentionMinutes": { - "type": "integer", - "description": "Backup retention minutes for the server group." - }, - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "The version of a server." - }, - "serverRoleGroups": { - "$ref": "#/definitions/ServerRoleGroupList", - "description": "The list of server role groups." + "properties": { + "$ref": "#/definitions/ServerGroupPropertiesForUpdate", + "description": "Properties of the server group update." } } }, @@ -1419,9 +1406,6 @@ }, "ServerGroupPropertiesForCreate": { "discriminator": "createMode", - "required": [ - "createMode" - ], "properties": { "createMode": { "type": "string", From 94eac91d6b64c978462267bc9da97e984bbbe22f Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 10:51:32 +0300 Subject: [PATCH 19/65] Convert some enums to boolean and renamings --- .../examples/ServerGroupAddNode.json | 1 + .../examples/ServerGroupCreate.json | 4 +- .../examples/ServerGroupCreatePITR.json | 4 +- .../examples/ServerGroupGet.json | 8 +- .../examples/ServerGroupGetServer.json | 2 +- .../examples/ServerGroupListServers.json | 6 +- .../examples/ServerGroupScaleCompute.json | 1 + .../examples/ServerGroupScaleStorage.json | 1 + .../examples/ServerGroupUpdatePatch.json | 1 + .../postgresqlhsc.json | 169 ++++++++---------- 10 files changed, 86 insertions(+), 111 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json index 0fca6d272a19..9eec93697c96 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json @@ -7,6 +7,7 @@ "parameters": { "location": "westus", "properties": { + "createMode": "Update", "serverRoleGroups": [ { "name": "", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index 2bb202a7f0ca..02a9eb3511ef 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -16,8 +16,8 @@ "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", "delegatedVnetName": "test-vnet" }, - "mx": "Enabled", - "zfs": "Disabled", + "isMx": true, + "isZfs": false, "version": "12", "citusVersion": "9.5", "serverRoleGroups": [ diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json index e68f5dd4fd7f..ee08312ba365 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json @@ -12,8 +12,8 @@ "sourceSubscriptionId": "dddddddd-dddd-dddd-dddd-dddddddddddd", "sourceResourceGroupName": "SourceGroup", "sourceServerGroupName": "pgtests-source-server-group", - "mx": "Enabled", - "zfs": "Disabled" + "isMx": true, + "isZfs": false } } }, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index f06659e99384..ddb59ce124db 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -21,8 +21,8 @@ "administratorLogin": "citus", "version": "12", "citusVersion": "9.5", - "mx": "Enabled", - "zfs": "Disabled", + "isMx": true, + "isZfs": false, "vnetInjArgs": { "delegatedSubnetName": "test-subnet", "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", @@ -37,7 +37,7 @@ "storageQuotaInMb": 10000, "vCores": 4, "standbyCount": 1, - "publicNetworkAccess": "Enabled", + "isPublicIpRequested": true, "serverNames": [ "hsctestsg1-c" ] @@ -50,7 +50,7 @@ "storageQuotaInMb": 10000, "vCores": 8, "standbyCount": 0, - "publicNetworkAccess": "Disabled", + "isPublicIpReqested": false, "serverNames": [ "hsctestsg1-w0", "hsctestsg1-w1", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json index cd2769642c6d..8f0cca929599 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json @@ -20,7 +20,7 @@ "storageQuotaInMb": 10000, "vCores": 4, "standbyCount": 1, - "publicNetworkAccess": "Enabled", + "isPublicIpRequested": true, "state": "Ready", "haState": "Ready" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json index c5f0f260ba56..dea68d787b5d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json @@ -21,7 +21,7 @@ "storageQuotaInMb": 10000, "vCores": 4, "standbyCount": 1, - "publicNetworkAccess": "Enabled", + "isPublicIpRequested": true, "state": "Ready", "haState": "Ready" } @@ -38,7 +38,7 @@ "storageQuotaInMb": 10000, "vCores": 4, "standbyCount": 0, - "publicNetworkAccess": "Disabled", + "isPublicIpRequested": false, "state": "Ready", "haState": "Ready" } @@ -55,7 +55,7 @@ "storageQuotaInMb": 10000, "vCores": 4, "standbyCount": 0, - "publicNetworkAccess": "Disabled", + "isPublicIpRequested": false, "state": "Ready", "haState": "Ready" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json index d95982c251eb..72a0f5947cab 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json @@ -7,6 +7,7 @@ "parameters": { "location": "westus", "properties": { + "createMode": "Update", "serverRoleGroups": [ { "name": "", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json index 5e2e710ea384..562cc5a95c0d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json @@ -7,6 +7,7 @@ "parameters": { "location": "westus", "properties": { + "createMode": "Update", "serverRoleGroups": [ { "name": "", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json index ac67f3ac9d4c..a6ff0b5aee37 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json @@ -7,6 +7,7 @@ "parameters": { "location": "westus", "properties": { + "createMode": "Update", "version": "12", "administratorLoginPassword": "secret", "backupRetentionMinutes": 100800, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index ec536be60251..3723fcf5ce7e 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -71,7 +71,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ServerGroupForCreate" + "$ref": "#/definitions/ServerGroupForPut" }, "description": "The required parameters for creating or updating a server group." } @@ -80,13 +80,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerGroupForCreate" + "$ref": "#/definitions/ServerGroupForPut" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/ServerGroupForCreate" + "$ref": "#/definitions/ServerGroupForPut" } }, "202": { @@ -220,7 +220,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ServerGroupForUpdate" + "$ref": "#/definitions/ServerGroupForPatch" }, "description": "The parameters for updating a server group." } @@ -1188,17 +1188,9 @@ "minimum": 0, "maximum": 1 }, - "publicNetworkAccess": { - "type": "string", - "description": "public network access is enabled or not", - "enum": [ - "Enabled", - "Disabled" - ], - "x-ms-enum": { - "name": "ServerPublicNetworkAccessState", - "modelAsString": true - }, + "isPublicIpRequested": { + "type": "boolean", + "description": "If public IP is requested or not for a server.", "readOnly": true } } @@ -1209,7 +1201,7 @@ "items": { "$ref": "#/definitions/ServerRoleGroup" }, - "minItems": 2, + "minItems": 1, "maxItems": 2, "uniqueItems": true }, @@ -1265,6 +1257,14 @@ "$ref": "#/definitions/CitusVersion", "description": "The citus version of servers." }, + "isMx": { + "type": "boolean", + "description": "If zfs is enabled or not for the server group." + }, + "isZfs": { + "type": "boolean", + "description": "If zfs is enabled or not for the server group." + }, "vnetInjArgs": { "properties": { "delegatedVnetID": { @@ -1376,7 +1376,7 @@ } } }, - "ServerGroupForUpdate": { + "ServerGroupForPatch": { "description": "Parameters allowed to update for a server group.", "allOf": [ { @@ -1390,7 +1390,7 @@ } } }, - "ServerGroupForCreate": { + "ServerGroupForPut": { "description": "Represents a server group for create.", "allOf": [ { @@ -1399,13 +1399,16 @@ ], "properties": { "properties": { - "$ref": "#/definitions/ServerGroupPropertiesForCreate", + "$ref": "#/definitions/ServerGroupPropertiesForPut", "description": "Properties of the server group create." } } }, - "ServerGroupPropertiesForCreate": { + "ServerGroupPropertiesForPut": { "discriminator": "createMode", + "required": [ + "createMode" + ], "properties": { "createMode": { "type": "string", @@ -1423,12 +1426,12 @@ }, "description": "The properties used to create a new server group." }, - "ServerGroupPropertiesForDefaultCreate": { + "ServerGroupPropertiesForDefault": { "x-ms-discriminator-value": "Create", "description": "The properties used to create a new server group.", "allOf": [ { - "$ref": "#/definitions/ServerGroupPropertiesForCreate" + "$ref": "#/definitions/ServerGroupPropertiesForPut" } ], "properties": { @@ -1445,29 +1448,13 @@ "type": "integer", "description": "Backup retention minutes for the server group." }, - "mx": { - "type": "string", - "description": "Data type of the configuration.", - "enum": [ - "Enabled", - "Disabled" - ], - "x-ms-enum": { - "name": "mxEnabledDataType", - "modelAsString": true - } + "isMx": { + "type": "boolean", + "description": "If zfs is enabled or not for the server group." }, - "zfs": { - "type": "string", - "description": "Data type of the configuration.", - "enum": [ - "Enabled", - "Disabled" - ], - "x-ms-enum": { - "name": "zfsEnabledDataType", - "modelAsString": true - } + "isZfs": { + "type": "boolean", + "description": "If zfs is enabled or not for the server group." }, "version": { "$ref": "#/definitions/ServerVersion", @@ -1506,12 +1493,44 @@ "serverRoleGroups" ] }, + "ServerGroupPropertiesForUpdate": { + "x-ms-discriminator-value": "Update", + "description": "The properties used to update a server group.", + "allOf": [ + { + "$ref": "#/definitions/ServerGroupPropertiesForPut" + } + ], + "properties": { + "administratorLoginPassword": { + "type": "string", + "format": "password", + "description": "The password of the administrator login." + }, + "backupRetentionMinutes": { + "type": "integer", + "description": "Backup retention minutes for the server group." + }, + "version": { + "$ref": "#/definitions/ServerVersion", + "description": "The version of a server." + }, + "citusVersion": { + "$ref": "#/definitions/CitusVersion", + "description": "The citus version of a server." + }, + "serverRoleGroups": { + "$ref": "#/definitions/ServerRoleGroupList", + "description": "The list of server role groups." + } + } + }, "ServerGroupPropertiesForRestore": { "x-ms-discriminator-value": "PointInTimeRestore", "description": "The properties used to create a new server group by restoring from a backup.", "allOf": [ { - "$ref": "#/definitions/ServerGroupPropertiesForCreate" + "$ref": "#/definitions/ServerGroupPropertiesForPut" } ], "properties": { @@ -1532,29 +1551,13 @@ "format": "date-time", "description": "Restore point creation time (ISO8601 format), specifying the time to restore from." }, - "mx": { - "type": "string", - "description": "Data type of the configuration.", - "enum": [ - "Enabled", - "Disabled" - ], - "x-ms-enum": { - "name": "mxEnabledDataType", - "modelAsString": true - } + "isMx": { + "type": "boolean", + "description": "If zfs is enabled or not for the server group." }, - "zfs": { - "type": "string", - "description": "Data type of the configuration.", - "enum": [ - "Enabled", - "Disabled" - ], - "x-ms-enum": { - "name": "zfsEnabledDataType", - "modelAsString": true - } + "isZfs": { + "type": "boolean", + "description": "If zfs is enabled or not for the server group." } }, "required": [ @@ -1564,38 +1567,6 @@ "pointInTimeUTC" ] }, - "ServerGroupPropertiesForUpdate": { - "x-ms-discriminator-value": "Update", - "description": "The properties used to update a server group.", - "allOf": [ - { - "$ref": "#/definitions/ServerGroupPropertiesForCreate" - } - ], - "properties": { - "administratorLoginPassword": { - "type": "string", - "format": "password", - "description": "The password of the administrator login." - }, - "backupRetentionMinutes": { - "type": "integer", - "description": "Backup retention minutes for the server group." - }, - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "The version of a server." - }, - "citusVersion": { - "$ref": "#/definitions/CitusVersion", - "description": "The citus version of a server." - }, - "serverRoleGroups": { - "$ref": "#/definitions/ServerRoleGroupList", - "description": "The list of server role groups." - } - } - }, "ServerGroupConfiguration": { "description": "Represents the configuration list of server role groups in a server group.", "allOf": [ From b5de45ea7ae41d35c00fa20bf3724e1a9b3bb3fc Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 10:55:31 +0300 Subject: [PATCH 20/65] Fix typo --- .../2020-10-05-privatepreview/examples/ServerGroupGet.json | 2 +- .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index ddb59ce124db..4b0f6682f043 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -50,7 +50,7 @@ "storageQuotaInMb": 10000, "vCores": 8, "standbyCount": 0, - "isPublicIpReqested": false, + "isPublicIpRequested": false, "serverNames": [ "hsctestsg1-w0", "hsctestsg1-w1", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 3723fcf5ce7e..ff867bf791df 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -512,7 +512,10 @@ ], "responses": { "200": { - "description": "OK" + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerGroupConfiguration" + } }, "202": { "description": "Accepted" From ae18751de93e6e53d657a51cfffc8c39f2bf795e Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 11:17:26 +0300 Subject: [PATCH 21/65] Fix role properties problem --- .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index ff867bf791df..a31699dc5799 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1792,9 +1792,6 @@ "description": "Represents a server group role for create." }, "Role": { - "properties": { - "properties": {} - }, "allOf": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" From b2af3bb1aaf1ab5f5487fa27479daf02d0047b01 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 11:22:41 +0300 Subject: [PATCH 22/65] Add Citus to custom words --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index 596f3ecdca7b..f43fddc46306 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -294,6 +294,7 @@ CIDRs CIFS ciphertext CISCOASA +Citus claimCondition claimType clfs From 768f7fd1bc0b3ac412f99a9b31a67873fbe2a253 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 11:26:35 +0300 Subject: [PATCH 23/65] Run json prettier --- .../examples/CheckNameAvailability.json | 33 +++++++++---------- .../examples/ConfigurationBatchUpdate.json | 2 +- .../examples/ConfigurationGet.json | 2 +- .../examples/ConfigurationListByServer.json | 2 +- .../ConfigurationListByServerGroup.json | 2 +- .../examples/ConfigurationUpdate.json | 2 +- .../examples/FirewallRuleCreate.json | 2 +- .../examples/FirewallRuleDelete.json | 2 +- .../examples/FirewallRuleGet.json | 2 +- .../FirewallRuleListByServerGroup.json | 2 +- .../examples/OperationList.json | 2 +- .../examples/RoleCreate.json | 2 +- .../examples/RoleDelete.json | 2 +- .../examples/RoleListByServerGroup.json | 2 +- .../examples/ServerGroupAddNode.json | 2 +- .../examples/ServerGroupCreate.json | 4 +-- .../examples/ServerGroupCreatePITR.json | 2 +- .../examples/ServerGroupDelete.json | 2 +- .../examples/ServerGroupGet.json | 2 +- .../examples/ServerGroupGetServer.json | 22 ++++++------- .../examples/ServerGroupListServers.json | 4 +-- .../examples/ServerGroupRestart.json | 2 +- .../examples/ServerGroupScaleCompute.json | 2 +- .../examples/ServerGroupScaleStorage.json | 2 +- .../examples/ServerGroupStart.json | 2 +- .../examples/ServerGroupStop.json | 2 +- .../examples/ServerGroupUpdatePatch.json | 2 +- .../examples/ServerGroupUpdatePut.json | 2 +- .../postgresqlhsc.json | 2 +- 29 files changed, 56 insertions(+), 57 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json index a7d03988de6e..dfb8c68438eb 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json @@ -1,20 +1,19 @@ - { - "parameters": { - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "api-version": "2020-10-05-privatepreview", - "nameAvailabilityRequest": { - "name": "name1", - "type": "Microsoft.DBforPostgreSQL/serverGroupsv2" - } - }, - "responses": { - "200": { - "body": { - "nameAvailable": true, - "message": "", - "reason": "" - } + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "api-version": "2020-10-05-privatepreview", + "nameAvailabilityRequest": { + "name": "name1", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2" + } + }, + "responses": { + "200": { + "body": { + "nameAvailable": true, + "message": "", + "reason": "" } } - } \ No newline at end of file + } +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json index e7a67ef67c8d..1508f4d6cf39 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json @@ -85,4 +85,4 @@ }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json index 8dd4b008b182..3b3965f938c2 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json @@ -45,4 +45,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json index 492d45e2c915..849308f478fa 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json @@ -53,4 +53,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json index 3da57eb031e5..ba4edd33f7d0 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json @@ -73,4 +73,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json index ede4e921b504..c79356f90ac7 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json @@ -58,4 +58,4 @@ }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json index 687ab2fa6383..f9a2f4b74449 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json @@ -37,4 +37,4 @@ }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json index 0435c004de7e..1f7a4666f071 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json @@ -10,4 +10,4 @@ "200": {}, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json index 6dab2ba865e5..6246f172eed8 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json @@ -19,4 +19,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json index d6a866ce6ab8..e91e259fa3aa 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json @@ -31,4 +31,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationList.json index b1aaf96d6cc2..be0464cc5513 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationList.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/OperationList.json @@ -194,4 +194,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json index 1793208adf9f..6ddaeab8b7e8 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json @@ -16,4 +16,4 @@ "200": {}, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json index 4da6e7a5155d..582e1ca1e1ef 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json @@ -10,4 +10,4 @@ "200": {}, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json index 906afff7cf5c..4de69f5bd888 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json @@ -25,4 +25,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json index 9eec93697c96..5f9581ed0ea8 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json @@ -30,4 +30,4 @@ }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index 02a9eb3511ef..5dd0dd9320e9 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -34,7 +34,7 @@ "name": "", "role": "Worker", "serverCount": 3, - "serverEdition": "MemoryOptimized", + "serverEdition": "MemoryOptimized", "vCores": 4, "storageQuotaInMb": 524288, "standbyCount": 0 @@ -67,4 +67,4 @@ }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json index ee08312ba365..0d50571d03dc 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json @@ -38,4 +38,4 @@ }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json index 45c7a551c094..f156dc6a7dd2 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json @@ -9,4 +9,4 @@ "200": {}, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index 4b0f6682f043..b171cc3f9e63 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -62,4 +62,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json index 8f0cca929599..d4b49d4be1d0 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json @@ -13,18 +13,18 @@ "name": "hsctestsg1-c", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers", "properties": { - "administratorLogin": "string", - "version": "12", - "role": "Coordinator", - "serverEdition": "MemoryOptimized", - "storageQuotaInMb": 10000, - "vCores": 4, - "standbyCount": 1, - "isPublicIpRequested": true, - "state": "Ready", - "haState": "Ready" + "administratorLogin": "string", + "version": "12", + "role": "Coordinator", + "serverEdition": "MemoryOptimized", + "storageQuotaInMb": 10000, + "vCores": 4, + "standbyCount": 1, + "isPublicIpRequested": true, + "state": "Ready", + "haState": "Ready" } } } } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json index dea68d787b5d..278a3837fd58 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json @@ -8,7 +8,7 @@ "responses": { "200": { "body": { - "value":[ + "value": [ { "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg1/servers/hsctestsg1-c", "name": "hsctestsg1-c", @@ -64,4 +64,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupRestart.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupRestart.json index 90373f83b169..bc35e1d9ec94 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupRestart.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupRestart.json @@ -9,4 +9,4 @@ "200": {}, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json index 72a0f5947cab..a24f0752d7e6 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json @@ -30,4 +30,4 @@ }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json index 562cc5a95c0d..8743d60d2c69 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json @@ -30,4 +30,4 @@ }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStart.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStart.json index 90373f83b169..bc35e1d9ec94 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStart.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStart.json @@ -9,4 +9,4 @@ "200": {}, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStop.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStop.json index 90373f83b169..bc35e1d9ec94 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStop.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupStop.json @@ -9,4 +9,4 @@ "200": {}, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json index a6ff0b5aee37..002c5ce348c6 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json @@ -49,4 +49,4 @@ }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json index 982325c20e92..12ead03e956f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json @@ -58,4 +58,4 @@ }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index a31699dc5799..34bc10f10075 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -2002,4 +2002,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} From 8debbf5fe77bb8537853604a0c870d57e827c017 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 11:28:27 +0300 Subject: [PATCH 24/65] Change responce for put server group --- .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 34bc10f10075..d6c06eb29912 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -80,13 +80,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerGroupForPut" + "$ref": "#/definitions/ServerGroup" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/ServerGroupForPut" + "$ref": "#/definitions/ServerGroup" } }, "202": { From d8b04bcd389c3c7840a7eed771af91d45de29e90 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 11:51:29 +0300 Subject: [PATCH 25/65] Fix role empty properties --- .../2020-10-05-privatepreview/postgresqlhsc.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index d6c06eb29912..8046cfdc0384 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1783,15 +1783,19 @@ }, "allOf": [ { - "$ref": "#/definitions/Role" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ], - "required": [ - "properties" - ], "description": "Represents a server group role for create." }, "Role": { + "properties": { + "properties": { + "properties": {}, + "x-ms-client-flatten": true, + "description": "The properties of a role for create." + } + }, "allOf": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" From e4621079565fff55a0486ada738baab51afc7774 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 17:36:17 +0300 Subject: [PATCH 26/65] Add state to server group --- .../examples/ServerGroupGet.json | 7 ++- .../examples/ServerGroupGetServer.json | 2 +- .../examples/ServerGroupListServers.json | 6 +-- .../postgresqlhsc.json | 45 ++++++++++++++++++- 4 files changed, 52 insertions(+), 8 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index b171cc3f9e63..a5c7c6e27fbc 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -23,6 +23,7 @@ "citusVersion": "9.5", "isMx": true, "isZfs": false, + "state": "Ready", "vnetInjArgs": { "delegatedSubnetName": "test-subnet", "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", @@ -40,7 +41,8 @@ "isPublicIpRequested": true, "serverNames": [ "hsctestsg1-c" - ] + ], + "haState": "Healthy" }, { "name": "", @@ -55,7 +57,8 @@ "hsctestsg1-w0", "hsctestsg1-w1", "hsctestsg1-w2" - ] + ], + "haState": "NotEnabled" } ] } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json index d4b49d4be1d0..b2c8096684ee 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json @@ -22,7 +22,7 @@ "standbyCount": 1, "isPublicIpRequested": true, "state": "Ready", - "haState": "Ready" + "haState": "Healthy" } } } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json index 278a3837fd58..a2081ef30473 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json @@ -23,7 +23,7 @@ "standbyCount": 1, "isPublicIpRequested": true, "state": "Ready", - "haState": "Ready" + "haState": "Healthy" } }, { @@ -40,7 +40,7 @@ "standbyCount": 0, "isPublicIpRequested": false, "state": "Ready", - "haState": "Ready" + "haState": "NotEnabled" } }, { @@ -57,7 +57,7 @@ "standbyCount": 0, "isPublicIpRequested": false, "state": "Ready", - "haState": "Ready" + "haState": "NotEnabled" } } ] diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 8046cfdc0384..b3ff082d4598 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1229,6 +1229,23 @@ "format": "int32", "description": "The number of servers in the server role group." }, + "haState": { + "type": "string", + "description": "A state of a server role group that is visible to user for HA feature.", + "enum": [ + "NotEnabled", + "CreatingStandby", + "ReplicatingData", + "FailingOver", + "Healthy", + "RemovingStandby", + "NotSync" + ], + "x-ms-enum": { + "name": "ServerRoleGroupHAState", + "modelAsString": true + } + }, "serverNames": { "type": "array", "description": "The list of server names in the server role group.", @@ -1268,6 +1285,22 @@ "type": "boolean", "description": "If zfs is enabled or not for the server group." }, + "state": { + "type": "string", + "description": "A state of a server group that is visible to user.", + "enum": [ + "Ready", + "Dropping", + "Starting", + "Stopping", + "Stopped", + "Updating" + ], + "x-ms-enum": { + "name": "ServerGroupState", + "modelAsString": true + } + }, "vnetInjArgs": { "properties": { "delegatedVnetID": { @@ -1324,7 +1357,10 @@ "Ready", "Dropping", "Disabled", - "Inaccessible" + "Starting", + "Stopping", + "Stopped", + "Updating" ], "x-ms-enum": { "name": "ServerState", @@ -1335,7 +1371,12 @@ "type": "string", "description": "A state of a server that is visible to user for HA feature.", "enum": [ - "Ready" + "NotEnabled", + "CreatingStandby", + "ReplicatingData", + "FailingOver", + "Healthy", + "RemovingStandby" ], "x-ms-enum": { "name": "ServerHAState", From b5d3631d8e78418bb749d1dee480e11628671120 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 18:10:08 +0300 Subject: [PATCH 27/65] Update readmes --- .../resource-manager/readme.az.md | 14 +++++++ .../readme.azureresourceschema.md | 22 +++++++++++ .../resource-manager/readme.cli.md | 39 +++++++++++++++++++ .../resource-manager/readme.go.md | 19 ++++++--- .../resource-manager/readme.java.md | 33 ++++++++++++++++ .../postgresqlhsc/resource-manager/readme.md | 27 +++++++++++++ .../resource-manager/readme.nodejs.md | 14 +++++++ 7 files changed, 162 insertions(+), 6 deletions(-) create mode 100644 specification/postgresqlhsc/resource-manager/readme.az.md create mode 100644 specification/postgresqlhsc/resource-manager/readme.azureresourceschema.md create mode 100644 specification/postgresqlhsc/resource-manager/readme.cli.md create mode 100644 specification/postgresqlhsc/resource-manager/readme.java.md create mode 100644 specification/postgresqlhsc/resource-manager/readme.nodejs.md diff --git a/specification/postgresqlhsc/resource-manager/readme.az.md b/specification/postgresqlhsc/resource-manager/readme.az.md new file mode 100644 index 000000000000..c0d84f0e1d75 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/readme.az.md @@ -0,0 +1,14 @@ +## AZ + +These settings apply only when `--az` is specified on the command line. + +``` yaml $(az) +az: + extensions: postgresqlhsc + namespace: azure.mgmt.postgresqlhsc + package-name: azure-mgmt-postgresqlhsc +az-output-folder: $(azure-cli-extension-folder)/src/postgresqlhsc +python-sdk-output-folder: "$(az-output-folder)/azext_postgresqlhsc/vendored_sdks/postgresqlhsc" +# add additinal configuration here specific for Azure CLI +# refer to the faq.md for more details +``` \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/readme.azureresourceschema.md b/specification/postgresqlhsc/resource-manager/readme.azureresourceschema.md new file mode 100644 index 000000000000..6458135cdb53 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/readme.azureresourceschema.md @@ -0,0 +1,22 @@ +## AzureResourceSchema + +These settings apply only when `--azureresourceschema` is specified on the command line. + +### AzureResourceSchema multi-api + +``` yaml $(azureresourceschema) && $(multiapi) +batch: + - tag: schema-dbforpostgresqlhsc-2020-10-05-privatepreview +``` + +Please also specify `--azureresourceschema-folder=`. + +### Tag: schema-dbforpostgresqlhsc2020-10-05-privatepreview and azureresourceschema + +``` yaml $(tag) == 'schema-dbforpostgresqlhsc-2020-10-05-privatepreview' && $(azureresourceschema) +output-folder: $(azureresourceschema-folder)/schemas + +# all the input files in this apiVersion +input-file: + - Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +``` diff --git a/specification/postgresqlhsc/resource-manager/readme.cli.md b/specification/postgresqlhsc/resource-manager/readme.cli.md new file mode 100644 index 000000000000..dd6730a33b97 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/readme.cli.md @@ -0,0 +1,39 @@ +## CLI + +These settings don't need to apply `--cli` on the command line. + +``` yaml +cli: + cli-name: postgresqlhsc + package-name: azure-mgmt-rdbms-postgresqlhsc + namespace: azure.mgmt.rdbms.postgresqlhsc + test-scenario: + - name: Create a new server group + - name: Create a new server group as a point in time restore + - name: Update the server group + - name: Get the server group + - name: Delete the server group + - name: Update the server group + - name: Scale compute + - name: Scale storage + - name: Add new worker nodes + - name: List servers of the server group + - name: Get the server of server group + - name: List configurations of the server that in the server group + - name: Update configurations of the server group + - name: List configurations of the server group + - name: Update single configuration of the server group + - name: Get single configuration of the server group + - name: Create a firewall rule of the server group + - name: Delete the firewall rule of the server group + - name: Get the firewall rule of the server group + - name: List firewall rules of the server group + - name: RoleCreate + - name: RoleDelete + - name: RoleList + - name: Restart all servers in the server group + - name: Start all servers in the server group + - name: Stop all servers in the server group + - name: Check name availability + - name: List all available operations +``` \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/readme.go.md b/specification/postgresqlhsc/resource-manager/readme.go.md index 078fc89e9109..cdac0abc5180 100644 --- a/specification/postgresqlhsc/resource-manager/readme.go.md +++ b/specification/postgresqlhsc/resource-manager/readme.go.md @@ -2,18 +2,25 @@ These settings apply only when `--go` is specified on the command line. -```yaml $(go) +``` yaml $(go) go: license-header: MICROSOFT_APACHE_NO_VERSION clear-output-folder: true ``` +### Go multi-api + +``` yaml $(go) && $(multiapi) +batch: + - tag: package-2020-10-05-privatepreview +``` + ### Tag: package-2020-10-05-privatepreview and go These settings apply only when `--tag=package-2020-10-05-privatepreview --go` is specified on the command line. -Please also specify `--go-sdks-folder=`. +Please also specify `--go-sdk-folder=`. -```yaml $(tag) == 'package-2020-10-05-privatepreview' && $(go) -namespace: Microsoft.DBforPostgreSQL -output-folder: $(go-sdks-folder)/postgresqlhsc/Generated -``` +``` yaml $(tag) == 'package-2020-10-05-privatepreview' && $(go) +namespace: postgresqlhsc +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-10-05-privatepreview/$(namespace) +``` \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/readme.java.md b/specification/postgresqlhsc/resource-manager/readme.java.md new file mode 100644 index 000000000000..d0311f82cd29 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/readme.java.md @@ -0,0 +1,33 @@ +## Java + +These settings apply only when `--java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(java) +azure-arm: true +fluent: true +namespace: com.microsoft.azure.management.postgresqlhsc +license-header: MICROSOFT_MIT_NO_CODEGEN +payload-flattening-threshold: 1 +output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-postgresqlhsc +``` + +### Java multi-api + +``` yaml $(java) && $(multiapi) +batch: + - tag: package-2020-10-05-privatepreview +``` + +### Tag: package-2020-10-05-privatepreview and java + +These settings apply only when `--tag=package-2020-10-05-privatepreview --java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'package-2020-10-05-privatepreview' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.postgresql.v2020_10_05_privatepreview + output-folder: $(azure-libraries-for-java-folder)/sdk/postgresqlhsc/mgmt-v2020_10_05_privatepreview +regenerate-manager: true +generate-interface: true +``` \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/readme.md b/specification/postgresqlhsc/resource-manager/readme.md index 4a28bcc8cde4..182c224d55d5 100644 --- a/specification/postgresqlhsc/resource-manager/readme.md +++ b/specification/postgresqlhsc/resource-manager/readme.md @@ -49,13 +49,32 @@ This is not used by Autorest itself. ```yaml $(swagger-to-sdk) swagger-to-sdk: + - repo: azure-sdk-for-net - repo: azure-sdk-for-python - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-js + - repo: azure-sdk-for-node - repo: azure-sdk-for-ruby after_scripts: - bundle install && rake arm:regen_all_profiles['azure_mgmt_postgresqlhsc'] + - repo: azure-resource-manager-schemas + after_scripts: + - node sdkauto_afterscript.js postgresqlhsc/resource-manager +``` + +### C# + +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + namespace: Microsoft.Azure.Management.PostgreSQL + output-folder: $(csharp-sdks-folder)/postgresqlhsc/Microsoft.Azure.Management.PostgreSQL/src/postgresqlhsc/Generated + clear-output-folder: true ``` ## Go @@ -66,6 +85,10 @@ See configuration in [readme.go.md](./readme.go.md) See configuration in [readme.python.md](./readme.python.md) +## Java + +See configuration in [readme.java.md](./readme.java.md) + ## Ruby See configuration in [readme.ruby.md](./readme.ruby.md) @@ -77,3 +100,7 @@ See configuration in [readme.typescript.md](./readme.typescript.md) ## CSharp See configuration in [readme.csharp.md](./readme.csharp.md) + +## AzureResourceSchema + +See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md) diff --git a/specification/postgresqlhsc/resource-manager/readme.nodejs.md b/specification/postgresqlhsc/resource-manager/readme.nodejs.md new file mode 100644 index 000000000000..ecc10b28a8b9 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/readme.nodejs.md @@ -0,0 +1,14 @@ +## Node.js + +These settings apply only when `--nodejs` is specified on the command line. +Please also specify `--node-sdks-folder=`. + +``` yaml $(nodejs) +nodejs: + azure-arm: true + package-name: azure-arm-postgresqlhsc + output-folder: $(node-sdks-folder)/lib/services/postgresqlhscManagement + generate-license-txt: true + generate-package-json: true + generate-readme-md: false +``` From 38ad37d2e4e84398f43658e1423b979223584ea5 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 18:28:54 +0300 Subject: [PATCH 28/65] Add resourceProviderType to server group --- .../examples/ServerGroupGet.json | 1 + .../2020-10-05-privatepreview/postgresqlhsc.json | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index a5c7c6e27fbc..c7b45d510213 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -24,6 +24,7 @@ "isMx": true, "isZfs": false, "state": "Ready", + "resourceProviderType": "Meru", "vnetInjArgs": { "delegatedSubnetName": "test-subnet", "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index b3ff082d4598..1f710da2c40c 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1301,6 +1301,18 @@ "modelAsString": true } }, + "resourceProviderType": { + "type": "string", + "description": "The resource provider type of server group.", + "enum": [ + "Meru", + "Marlin" + ], + "x-ms-enum": { + "name": "ResourceProviderType", + "modelAsString": true + } + }, "vnetInjArgs": { "properties": { "delegatedVnetID": { From 4d3093628ea0dea02109859daf4add3e7004987f Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 18:32:11 +0300 Subject: [PATCH 29/65] Add sourceLocation to server group PITR --- .../examples/ServerGroupCreatePITR.json | 1 + .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json index 0d50571d03dc..710e694545ea 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json @@ -9,6 +9,7 @@ "properties": { "createMode": "PointInTimeRestore", "pointInTimeUTC": "2017-12-14T00:00:37.467Z", + "sourceLocation": "eastus", "sourceSubscriptionId": "dddddddd-dddd-dddd-dddd-dddddddddddd", "sourceResourceGroupName": "SourceGroup", "sourceServerGroupName": "pgtests-source-server-group", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 1f710da2c40c..a06cf9954984 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1602,6 +1602,10 @@ "type": "string", "description": "The source server group name to restore from." }, + "sourceLocation": { + "type": "string", + "description": "The source server group location to restore from." + }, "pointInTimeUTC": { "type": "string", "format": "date-time", From bb2b0478fa02157d186a7311aaab0e5242897ad0 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 18:35:07 +0300 Subject: [PATCH 30/65] Change backup retention minutes to days --- .../examples/ServerGroupCreate.json | 2 +- .../examples/ServerGroupUpdatePatch.json | 2 +- .../examples/ServerGroupUpdatePut.json | 2 +- .../2020-10-05-privatepreview/postgresqlhsc.json | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index 5dd0dd9320e9..7224341c203b 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -10,7 +10,7 @@ "createMode": "Create", "administratorLogin": "cloudsa", "administratorLoginPassword": "password", - "backupRetentionMinutes": 50400, + "backupRetentionDays": 35, "vnetInjArgs": { "delegatedSubnetName": "test-subnet", "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json index 002c5ce348c6..ad604b667503 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json @@ -10,7 +10,7 @@ "createMode": "Update", "version": "12", "administratorLoginPassword": "secret", - "backupRetentionMinutes": 100800, + "backupRetentionDays": 30, "serverRoleGroups": [ { "name": "", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json index 12ead03e956f..485e093f8850 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json @@ -10,7 +10,7 @@ "createMode": "Update", "version": "12", "administratorLoginPassword": "secret", - "backupRetentionMinutes": 100800, + "backupRetentionDays": 30, "serverRoleGroups": [ { "name": "", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index a06cf9954984..d7a7d2424354 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1265,9 +1265,9 @@ "type": "string", "description": "The administrator's login name of servers in server group. Can only be specified when the server is being created (and is required for creation)." }, - "backupRetentionMinutes": { + "backupRetentionDays": { "type": "integer", - "description": "The backup retention minutes for server group." + "description": "The backup retention days for server group." }, "version": { "$ref": "#/definitions/ServerVersion", @@ -1500,9 +1500,9 @@ "format": "password", "description": "The password of the administrator login." }, - "backupRetentionMinutes": { + "backupRetentionDays": { "type": "integer", - "description": "Backup retention minutes for the server group." + "description": "Backup retention days for the server group." }, "isMx": { "type": "boolean", @@ -1544,7 +1544,7 @@ "required": [ "administratorLogin", "administratorLoginPassword", - "backupRetentionMinutes", + "backupRetentionDays", "version", "serverRoleGroups" ] @@ -1563,9 +1563,9 @@ "format": "password", "description": "The password of the administrator login." }, - "backupRetentionMinutes": { + "backupRetentionDays": { "type": "integer", - "description": "Backup retention minutes for the server group." + "description": "Backup retention days for the server group." }, "version": { "$ref": "#/definitions/ServerVersion", From 577bb8209abe638d274f1e830e60790465a67610 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 21:31:27 +0300 Subject: [PATCH 31/65] Fix linter errors --- .../examples/RoleCreate.json | 18 +- .../examples/ServerGroupCreate.json | 2 +- .../examples/ServerGroupUpdatePatch.json | 1 - .../postgresqlhsc.json | 359 +++++++++--------- 4 files changed, 186 insertions(+), 194 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json index 6ddaeab8b7e8..9c5beda8dd71 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json @@ -12,8 +12,22 @@ } }, "responses": { - "201": {}, - "200": {}, + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/roles/role1", + "name": "role1", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/roles", + "properties": {} + } + }, + "201": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/roles/role1", + "name": "role1", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/roles", + "properties": {} + } + }, "202": {} } } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index 7224341c203b..649a42cf3f35 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -7,7 +7,7 @@ "parameters": { "location": "westus", "properties": { - "createMode": "Create", + "createMode": "Default", "administratorLogin": "cloudsa", "administratorLoginPassword": "password", "backupRetentionDays": 35, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json index ad604b667503..e1234f5d0eef 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json @@ -5,7 +5,6 @@ "serverGroupName": "hsctestsg", "api-version": "2020-10-05-privatepreview", "parameters": { - "location": "westus", "properties": { "createMode": "Update", "version": "12", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index d7a7d2424354..f197a6bc5ea9 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -71,7 +71,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ServerGroupForPut" + "$ref": "#/definitions/ServerGroup" }, "description": "The required parameters for creating or updating a server group." } @@ -283,6 +283,9 @@ "$ref": "#/definitions/CloudError" } } + }, + "x-ms-pageable": { + "nextLinkName": null } } }, @@ -373,6 +376,9 @@ "$ref": "#/definitions/CloudError" } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, @@ -802,17 +808,23 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/RoleForCreate" + "$ref": "#/definitions/Role" }, "description": "The required parameters for creating or updating a role." } ], "responses": { "200": { - "description": "OK" + "description": "OK", + "schema": { + "$ref": "#/definitions/Role" + } }, "201": { - "description": "Created" + "description": "Created", + "schema": { + "$ref": "#/definitions/Role" + } }, "202": { "description": "Accepted" @@ -1113,6 +1125,9 @@ "$ref": "#/definitions/OperationListResult" } } + }, + "x-ms-pageable": { + "nextLinkName": null } } } @@ -1147,6 +1162,58 @@ "modelAsString": true } }, + "VnetInjArgs": { + "type": "object", + "description": "The vnet injection arguments for server group.", + "properties": { + "delegatedVnetID": { + "type": "string", + "description": "delegated vNet ID" + }, + "delegatedSubnetName": { + "type": "string", + "description": "delegated subnet name" + }, + "delegatedVnetName": { + "type": "string", + "description": "delegated vNet name" + } + } + }, + "ServerState": { + "type": "string", + "description": "A state of a server group/server that is visible to user.", + "enum": [ + "Ready", + "Dropping", + "Disabled", + "Starting", + "Stopping", + "Stopped", + "Updating" + ], + "x-ms-enum": { + "name": "ServerState", + "modelAsString": true + } + }, + "ServerHaState": { + "type": "string", + "description": "A state of a server role group/server that is visible to user for HA feature.", + "enum": [ + "NotEnabled", + "CreatingStandby", + "ReplicatingData", + "FailingOver", + "Healthy", + "RemovingStandby", + "NotSync" + ], + "x-ms-enum": { + "name": "ServerHaState", + "modelAsString": true + } + }, "ServerRole": { "type": "string", "description": "The role of a server.", @@ -1230,21 +1297,8 @@ "description": "The number of servers in the server role group." }, "haState": { - "type": "string", - "description": "A state of a server role group that is visible to user for HA feature.", - "enum": [ - "NotEnabled", - "CreatingStandby", - "ReplicatingData", - "FailingOver", - "Healthy", - "RemovingStandby", - "NotSync" - ], - "x-ms-enum": { - "name": "ServerRoleGroupHAState", - "modelAsString": true - } + "$ref": "#/definitions/ServerHaState", + "description": "A state of a server role group that is visible to user for HA feature." }, "serverNames": { "type": "array", @@ -1258,98 +1312,6 @@ } } }, - "ServerGroupProperties": { - "description": "The properties of a server group.", - "properties": { - "administratorLogin": { - "type": "string", - "description": "The administrator's login name of servers in server group. Can only be specified when the server is being created (and is required for creation)." - }, - "backupRetentionDays": { - "type": "integer", - "description": "The backup retention days for server group." - }, - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "The version of servers." - }, - "citusVersion": { - "$ref": "#/definitions/CitusVersion", - "description": "The citus version of servers." - }, - "isMx": { - "type": "boolean", - "description": "If zfs is enabled or not for the server group." - }, - "isZfs": { - "type": "boolean", - "description": "If zfs is enabled or not for the server group." - }, - "state": { - "type": "string", - "description": "A state of a server group that is visible to user.", - "enum": [ - "Ready", - "Dropping", - "Starting", - "Stopping", - "Stopped", - "Updating" - ], - "x-ms-enum": { - "name": "ServerGroupState", - "modelAsString": true - } - }, - "resourceProviderType": { - "type": "string", - "description": "The resource provider type of server group.", - "enum": [ - "Meru", - "Marlin" - ], - "x-ms-enum": { - "name": "ResourceProviderType", - "modelAsString": true - } - }, - "vnetInjArgs": { - "properties": { - "delegatedVnetID": { - "type": "string", - "description": "delegated vNet ID" - }, - "delegatedSubnetName": { - "type": "string", - "description": "delegated subnet name" - }, - "delegatedVnetName": { - "type": "string", - "description": "delegated vNet name" - } - } - }, - "serverRoleGroups": { - "$ref": "#/definitions/ServerRoleGroupList", - "description": "The list of server role groups." - } - } - }, - "ServerGroup": { - "description": "Represents a server group.", - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" - } - ], - "properties": { - "properties": { - "$ref": "#/definitions/ServerGroupProperties", - "description": "The properties of a server group.", - "x-ms-client-flatten": true - } - } - }, "ServerGroupServerProperties": { "description": "The properties of a server in server group.", "allOf": [ @@ -1363,37 +1325,12 @@ "description": "The role of server in the server group." }, "state": { - "type": "string", - "description": "A state of a server that is visible to user.", - "enum": [ - "Ready", - "Dropping", - "Disabled", - "Starting", - "Stopping", - "Stopped", - "Updating" - ], - "x-ms-enum": { - "name": "ServerState", - "modelAsString": true - } + "$ref": "#/definitions/ServerState", + "description": "A state of a server that is visible to user." }, "haState": { - "type": "string", - "description": "A state of a server that is visible to user for HA feature.", - "enum": [ - "NotEnabled", - "CreatingStandby", - "ReplicatingData", - "FailingOver", - "Healthy", - "RemovingStandby" - ], - "x-ms-enum": { - "name": "ServerHAState", - "modelAsString": true - } + "$ref": "#/definitions/ServerHaState", + "description": "A state of a server group that is visible to user for HA feature." }, "administratorLogin": { "type": "string", @@ -1433,20 +1370,27 @@ } }, "ServerGroupForPatch": { - "description": "Parameters allowed to update for a server group.", - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" - } - ], + "description": "Represents a server group for update.", "properties": { + "location": { + "type": "string", + "description": "The location the resource resides in." + }, "properties": { "$ref": "#/definitions/ServerGroupPropertiesForUpdate", - "description": "Properties of the server group update." + "x-ms-client-flatten": true, + "description": "Properties of the server group." + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Application-specific metadata in the form of key-value pairs." } } }, - "ServerGroupForPut": { + "ServerGroup": { "description": "Represents a server group for create.", "allOf": [ { @@ -1455,17 +1399,63 @@ ], "properties": { "properties": { - "$ref": "#/definitions/ServerGroupPropertiesForPut", + "$ref": "#/definitions/ServerGroupProperties", + "x-ms-client-flatten": true, "description": "Properties of the server group create." } } }, - "ServerGroupPropertiesForPut": { + "ServerGroupProperties": { "discriminator": "createMode", - "required": [ - "createMode" - ], "properties": { + "administratorLogin": { + "type": "string", + "description": "The administrator's login name of servers in server group. Can only be specified when the server is being created (and is required for creation)." + }, + "backupRetentionDays": { + "type": "integer", + "description": "The backup retention days for server group." + }, + "version": { + "$ref": "#/definitions/ServerVersion", + "description": "The version of servers." + }, + "citusVersion": { + "$ref": "#/definitions/CitusVersion", + "description": "The citus version of servers." + }, + "isMx": { + "type": "boolean", + "description": "If zfs is enabled or not for the server group." + }, + "isZfs": { + "type": "boolean", + "description": "If zfs is enabled or not for the server group." + }, + "state": { + "$ref": "#/definitions/ServerState", + "description": "A state of a server group that is visible to user." + }, + "resourceProviderType": { + "type": "string", + "description": "The resource provider type of server group.", + "enum": [ + "Meru", + "Marlin" + ], + "x-ms-enum": { + "name": "ResourceProviderType", + "modelAsString": true + } + }, + "vnetInjArgs": { + "$ref": "#/definitions/VnetInjArgs", + "description": "The vnet injection arguments for server group." + }, + "serverRoleGroups": { + "$ref": "#/definitions/ServerRoleGroupList", + "description": "The list of server role groups." + }, "createMode": { "type": "string", "description": "The mode to create a new server group.", @@ -1483,11 +1473,11 @@ "description": "The properties used to create a new server group." }, "ServerGroupPropertiesForDefault": { - "x-ms-discriminator-value": "Create", + "x-ms-discriminator-value": "Default", "description": "The properties used to create a new server group.", "allOf": [ { - "$ref": "#/definitions/ServerGroupPropertiesForPut" + "$ref": "#/definitions/ServerGroupProperties" } ], "properties": { @@ -1497,7 +1487,12 @@ }, "administratorLoginPassword": { "type": "string", + "x-ms-secret": true, "format": "password", + "x-ms-mutability": [ + "create", + "update" + ], "description": "The password of the administrator login." }, "backupRetentionDays": { @@ -1521,20 +1516,8 @@ "description": "The citus version of a server." }, "vnetInjArgs": { - "properties": { - "delegatedVnetID": { - "type": "string", - "description": "delegated vNet ID" - }, - "delegatedSubnetName": { - "type": "string", - "description": "delegated subnet name" - }, - "delegatedVnetName": { - "type": "string", - "description": "delegated vNet name" - } - } + "$ref": "#/definitions/VnetInjArgs", + "description": "The vnet injection arguments for server group." }, "serverRoleGroups": { "$ref": "#/definitions/ServerRoleGroupList", @@ -1554,13 +1537,18 @@ "description": "The properties used to update a server group.", "allOf": [ { - "$ref": "#/definitions/ServerGroupPropertiesForPut" + "$ref": "#/definitions/ServerGroupProperties" } ], "properties": { "administratorLoginPassword": { "type": "string", "format": "password", + "x-ms-secret": true, + "x-ms-mutability": [ + "create", + "update" + ], "description": "The password of the administrator login." }, "backupRetentionDays": { @@ -1586,7 +1574,7 @@ "description": "The properties used to create a new server group by restoring from a backup.", "allOf": [ { - "$ref": "#/definitions/ServerGroupPropertiesForPut" + "$ref": "#/definitions/ServerGroupProperties" } ], "properties": { @@ -1817,11 +1805,16 @@ } } }, - "RolePropertiesForCreate": { + "RoleProperties": { "properties": { "password": { "type": "string", + "x-ms-secret": true, "format": "password", + "x-ms-mutability": [ + "create", + "update" + ], "description": "The password of the server group role." } }, @@ -1830,27 +1823,12 @@ ], "description": "The properties of a server group role." }, - "RoleForCreate": { - "properties": { - "properties": { - "$ref": "#/definitions/RolePropertiesForCreate", - "x-ms-client-flatten": true, - "description": "The properties of a role for create." - } - }, - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" - } - ], - "description": "Represents a server group role for create." - }, "Role": { "properties": { "properties": { - "properties": {}, + "$ref": "#/definitions/RoleProperties", "x-ms-client-flatten": true, - "description": "The properties of a role for create." + "description": "The properties of a role." } }, "allOf": [ @@ -1985,7 +1963,8 @@ "description": "An error response from the Batch service.", "properties": { "error": { - "$ref": "#/definitions/CloudErrorBody" + "$ref": "#/definitions/CloudErrorBody", + "description": "The error." } } }, From c142044713a8e916014d43dc716cc15ee59718ba Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 21:36:38 +0300 Subject: [PATCH 32/65] Add EarliestRestoreTime to server group --- .../2020-10-05-privatepreview/examples/ServerGroupGet.json | 1 + .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index c7b45d510213..25649fc43d34 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -24,6 +24,7 @@ "isMx": true, "isZfs": false, "state": "Ready", + "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", "vnetInjArgs": { "delegatedSubnetName": "test-subnet", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index f197a6bc5ea9..74fea116a47f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1436,6 +1436,12 @@ "$ref": "#/definitions/ServerState", "description": "A state of a server group that is visible to user." }, + "earliestRestoreTime": { + "type": "string", + "format": "date-time", + "description": "The earliest restore point time (ISO8601 format) for server group.", + "readOnly": true + }, "resourceProviderType": { "type": "string", "description": "The resource provider type of server group.", From 0b59e56361b0fc555c51fb7083ec034761845635 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 21:38:55 +0300 Subject: [PATCH 33/65] Fix semantic --- .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 74fea116a47f..f773fce3da0f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1407,6 +1407,9 @@ }, "ServerGroupProperties": { "discriminator": "createMode", + "required": [ + "createMode" + ], "properties": { "administratorLogin": { "type": "string", From 1c3faefd9e58709cbe2348847c6fd40590cb4c0f Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 21:42:50 +0300 Subject: [PATCH 34/65] Add Meru to custom words --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index f43fddc46306..9599ac7eb4b5 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -964,6 +964,7 @@ Mbps MCAS MDATP mediaservices +Meru Mesos messagingplan Metada From 31ce425c2e1261f4db3cc4aa64bdc88a10b117af Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 21:45:10 +0300 Subject: [PATCH 35/65] Proviver name to pascal case --- .../postgresqlhsc.json | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index f773fce3da0f..cd268686c9c2 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -34,7 +34,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}": { "put": { "description": "Creates a new server group with servers.", "tags": [ @@ -244,7 +244,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/servers": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/servers": { "get": { "description": "Lists servers of a server group.", "tags": [ @@ -289,7 +289,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/servers/{serverName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/servers/{serverName}": { "get": { "description": "Gets information about a server in server group.", "tags": [ @@ -334,7 +334,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/servers/{serverName}/configurations": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/servers/{serverName}/configurations": { "get": { "description": "List all the configurations of a server in server group.", "tags": [ @@ -382,7 +382,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/configurations": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/configurations": { "put": { "description": "Updates configurations of a server group", "tags": [ @@ -477,7 +477,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/configurations/{configurationName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/configurations/{configurationName}": { "put": { "description": "Updates single configuration of servers in a server group", "tags": [ @@ -578,7 +578,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/firewallRules/{firewallRuleName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/firewallRules/{firewallRuleName}": { "put": { "description": "Creates a new firewall rule or updates an existing firewall rule.", "tags": [ @@ -729,7 +729,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/firewallRules": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/firewallRules": { "get": { "description": "List all the firewall rules in a given server group.", "tags": [ @@ -774,7 +774,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/roles/{roleName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/roles/{roleName}": { "put": { "tags": [ "Roles" @@ -882,7 +882,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/roles": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/roles": { "get": { "tags": [ "Roles" @@ -927,7 +927,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/restart": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/restart": { "post": { "description": "Restarts the server group.", "tags": [ @@ -970,7 +970,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/start": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/start": { "post": { "description": "Starts the server group.", "tags": [ @@ -1013,7 +1013,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{serverGroupName}/stop": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/stop": { "post": { "description": "Stops the server group.", "tags": [ @@ -1056,7 +1056,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.DBforPostgreSQL/checkNameAvailability": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForPostgreSql/checkNameAvailability": { "post": { "description": "Check the availability of name for resource", "tags": [ @@ -1101,7 +1101,7 @@ } } }, - "/providers/Microsoft.DBforPostgreSQL/operations": { + "/providers/Microsoft.DBForPostgreSql/operations": { "get": { "description": "Lists all of the available REST API operations.", "tags": [ From 69773d8f026cb6e6948d928b9d59c2891d21861a Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 21:47:39 +0300 Subject: [PATCH 36/65] Add format for integers --- .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index cd268686c9c2..08ac30502993 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1243,12 +1243,12 @@ }, "storageQuotaInMb": { "type": "integer", - "format": "int32", + "format": "int64", "description": "The storage of a server in MB (max: 2097152 = 2TiB)." }, "vCores": { "type": "integer", - "format": "int32", + "format": "int64", "description": "The vCores count of a server (max: 64)." }, "standbyCount": { @@ -1417,6 +1417,7 @@ }, "backupRetentionDays": { "type": "integer", + "format": "int32", "description": "The backup retention days for server group." }, "version": { @@ -1506,6 +1507,7 @@ }, "backupRetentionDays": { "type": "integer", + "format": "int32", "description": "Backup retention days for the server group." }, "isMx": { @@ -1562,6 +1564,7 @@ }, "backupRetentionDays": { "type": "integer", + "format": "int32", "description": "Backup retention days for the server group." }, "version": { From bf8aaf85225d3a4d05fff8e87922ee28d7fa9fba Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 20 Nov 2020 21:51:51 +0300 Subject: [PATCH 37/65] Add 204 to delete --- .../examples/FirewallRuleDelete.json | 3 ++- .../examples/RoleDelete.json | 3 ++- .../examples/ServerGroupDelete.json | 3 ++- .../2020-10-05-privatepreview/postgresqlhsc.json | 15 +++++++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json index 1f7a4666f071..e0a6a1ea64cb 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleDelete.json @@ -8,6 +8,7 @@ }, "responses": { "200": {}, - "202": {} + "202": {}, + "204": {} } } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json index 582e1ca1e1ef..00c8976be9b6 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleDelete.json @@ -8,6 +8,7 @@ }, "responses": { "200": {}, - "202": {} + "202": {}, + "204": {} } } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json index f156dc6a7dd2..6f3ac1d856d9 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupDelete.json @@ -7,6 +7,7 @@ }, "responses": { "200": {}, - "202": {} + "202": {}, + "204": {} } } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 08ac30502993..8f8535835dd0 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -173,6 +173,9 @@ "202": { "description": "Accepted" }, + "204": { + "description": "NoContent" + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -677,6 +680,9 @@ "202": { "description": "Accepted" }, + "204": { + "description": "NoContent" + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -873,6 +879,9 @@ "202": { "description": "Accepted" }, + "204": { + "description": "NoContent" + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -1124,6 +1133,12 @@ "schema": { "$ref": "#/definitions/OperationListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-pageable": { From 20e0f7371ed2819c057efeefc96fdcc0953023fa Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Tue, 24 Nov 2020 17:15:39 +0300 Subject: [PATCH 38/65] Add server group list endpoints --- .../examples/ServerGroupList.json | 178 +++++++++++++++++ .../ServerGroupListByResourceGroup.json | 179 ++++++++++++++++++ .../postgresqlhsc.json | 98 ++++++++++ 3 files changed, 455 insertions(+) create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json new file mode 100644 index 000000000000..888366429185 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json @@ -0,0 +1,178 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "api-version": "2020-10-05-privatepreview" + }, + "responses": { + "200": { + "body": { + "nextLink": "https://management.azure.com/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff//providers/Microsoft.DBforPostgreSQL/serverGroupsv2?api-version=2020-10-05-privatepreview&$top=3&$skiptoken=skiptoken", + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg1", + "name": "hsctestsg1", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "tags": { + "additionalProp1": "string" + }, + "location": "eastus", + "properties": { + "administratorLogin": "citus", + "version": "12", + "citusVersion": "9.5", + "isMx": true, + "isZfs": false, + "state": "Ready", + "earliestRestoreTime": "2020-09-14T00:00:37.467Z", + "resourceProviderType": "Meru", + "vnetInjArgs": { + "delegatedSubnetName": "test-subnet", + "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", + "delegatedVnetName": "test-vnet" + }, + "serverRoleGroups": [ + { + "name": "", + "role": "Coordinator", + "serverCount": 1, + "serverEdition": "MemoryOptimized", + "storageQuotaInMb": 10000, + "vCores": 4, + "standbyCount": 1, + "isPublicIpRequested": true, + "serverNames": [ + "hsctestsg1-c" + ], + "haState": "Healthy" + }, + { + "name": "", + "role": "Worker", + "serverCount": 3, + "serverEdition": "GeneralPurpose", + "storageQuotaInMb": 10000, + "vCores": 8, + "standbyCount": 0, + "isPublicIpRequested": false, + "serverNames": [ + "hsctestsg1-w0", + "hsctestsg1-w1", + "hsctestsg1-w2" + ], + "haState": "NotEnabled" + } + ] + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg2", + "name": "hsctestsg2", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "tags": { + "additionalProp2": "string" + }, + "location": "eastus", + "properties": { + "administratorLogin": "citus", + "version": "12", + "citusVersion": "9.5", + "isMx": true, + "isZfs": false, + "state": "Ready", + "earliestRestoreTime": "2020-09-14T00:00:37.467Z", + "resourceProviderType": "Meru", + "serverRoleGroups": [ + { + "name": "", + "role": "Coordinator", + "serverCount": 1, + "serverEdition": "MemoryOptimized", + "storageQuotaInMb": 10000, + "vCores": 8, + "standbyCount": 1, + "isPublicIpRequested": true, + "serverNames": [ + "hsctestsg2-c" + ], + "haState": "Healthy" + }, + { + "name": "", + "role": "Worker", + "serverCount": 2, + "serverEdition": "GeneralPurpose", + "storageQuotaInMb": 10000, + "vCores": 4, + "standbyCount": 0, + "isPublicIpRequested": false, + "serverNames": [ + "hsctestsg2-w0", + "hsctestsg2-w1", + "hsctestsg2-w2" + ], + "haState": "NotEnabled" + } + ] + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg3", + "name": "hsctestsg3", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "tags": { + "additionalProp3": "string" + }, + "location": "eastus", + "properties": { + "administratorLogin": "citus", + "version": "12", + "citusVersion": "9.5", + "isMx": true, + "isZfs": false, + "state": "Ready", + "earliestRestoreTime": "2020-09-14T00:00:37.467Z", + "resourceProviderType": "Meru", + "vnetInjArgs": { + "delegatedSubnetName": "test-subnet", + "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", + "delegatedVnetName": "test-vnet" + }, + "serverRoleGroups": [ + { + "name": "", + "role": "Coordinator", + "serverCount": 1, + "serverEdition": "MemoryOptimized", + "storageQuotaInMb": 10000, + "vCores": 4, + "standbyCount": 1, + "isPublicIpRequested": true, + "serverNames": [ + "hsctestsg3-c" + ], + "haState": "Healthy" + }, + { + "name": "", + "role": "Worker", + "serverCount": 3, + "serverEdition": "GeneralPurpose", + "storageQuotaInMb": 10000, + "vCores": 8, + "standbyCount": 0, + "isPublicIpRequested": false, + "serverNames": [ + "hsctestsg3-w0", + "hsctestsg3-w1", + "hsctestsg3-w2" + ], + "haState": "NotEnabled" + } + ] + } + } + ] + } + } + } +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json new file mode 100644 index 000000000000..e8c14c3abb6c --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json @@ -0,0 +1,179 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "api-version": "2020-10-05-privatepreview" + }, + "responses": { + "200": { + "body": { + "nextLink": "https://management.azure.com/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff//resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2?api-version=2020-10-05-privatepreview&$top=3&$skiptoken=skiptoken", + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg1", + "name": "hsctestsg1", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "tags": { + "additionalProp1": "string" + }, + "location": "eastus", + "properties": { + "administratorLogin": "citus", + "version": "12", + "citusVersion": "9.5", + "isMx": true, + "isZfs": false, + "state": "Ready", + "earliestRestoreTime": "2020-09-14T00:00:37.467Z", + "resourceProviderType": "Meru", + "vnetInjArgs": { + "delegatedSubnetName": "test-subnet", + "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", + "delegatedVnetName": "test-vnet" + }, + "serverRoleGroups": [ + { + "name": "", + "role": "Coordinator", + "serverCount": 1, + "serverEdition": "MemoryOptimized", + "storageQuotaInMb": 10000, + "vCores": 4, + "standbyCount": 1, + "isPublicIpRequested": true, + "serverNames": [ + "hsctestsg1-c" + ], + "haState": "Healthy" + }, + { + "name": "", + "role": "Worker", + "serverCount": 3, + "serverEdition": "GeneralPurpose", + "storageQuotaInMb": 10000, + "vCores": 8, + "standbyCount": 0, + "isPublicIpRequested": false, + "serverNames": [ + "hsctestsg1-w0", + "hsctestsg1-w1", + "hsctestsg1-w2" + ], + "haState": "NotEnabled" + } + ] + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg2", + "name": "hsctestsg2", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "tags": { + "additionalProp2": "string" + }, + "location": "eastus", + "properties": { + "administratorLogin": "citus", + "version": "12", + "citusVersion": "9.5", + "isMx": true, + "isZfs": false, + "state": "Ready", + "earliestRestoreTime": "2020-09-14T00:00:37.467Z", + "resourceProviderType": "Meru", + "serverRoleGroups": [ + { + "name": "", + "role": "Coordinator", + "serverCount": 1, + "serverEdition": "MemoryOptimized", + "storageQuotaInMb": 10000, + "vCores": 8, + "standbyCount": 1, + "isPublicIpRequested": true, + "serverNames": [ + "hsctestsg2-c" + ], + "haState": "Healthy" + }, + { + "name": "", + "role": "Worker", + "serverCount": 2, + "serverEdition": "GeneralPurpose", + "storageQuotaInMb": 10000, + "vCores": 4, + "standbyCount": 0, + "isPublicIpRequested": false, + "serverNames": [ + "hsctestsg2-w0", + "hsctestsg2-w1", + "hsctestsg2-w2" + ], + "haState": "NotEnabled" + } + ] + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg3", + "name": "hsctestsg3", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "tags": { + "additionalProp3": "string" + }, + "location": "eastus", + "properties": { + "administratorLogin": "citus", + "version": "12", + "citusVersion": "9.5", + "isMx": true, + "isZfs": false, + "state": "Ready", + "earliestRestoreTime": "2020-09-14T00:00:37.467Z", + "resourceProviderType": "Meru", + "vnetInjArgs": { + "delegatedSubnetName": "test-subnet", + "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", + "delegatedVnetName": "test-vnet" + }, + "serverRoleGroups": [ + { + "name": "", + "role": "Coordinator", + "serverCount": 1, + "serverEdition": "MemoryOptimized", + "storageQuotaInMb": 10000, + "vCores": 4, + "standbyCount": 1, + "isPublicIpRequested": true, + "serverNames": [ + "hsctestsg3-c" + ], + "haState": "Healthy" + }, + { + "name": "", + "role": "Worker", + "serverCount": 3, + "serverEdition": "GeneralPurpose", + "storageQuotaInMb": 10000, + "vCores": 8, + "standbyCount": 0, + "isPublicIpRequested": false, + "serverNames": [ + "hsctestsg3-w0", + "hsctestsg3-w1", + "hsctestsg3-w2" + ], + "haState": "NotEnabled" + } + ] + } + } + ] + } + } + } +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 8f8535835dd0..9c8bd4c20f2f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -34,6 +34,87 @@ } }, "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForPostgreSql/serverGroupsv2": { + "get": { + "tags": [ + "ServerGroups" + ], + "operationId": "ServerGroups_List", + "x-ms-examples": { + "List all the server groups": { + "$ref": "./examples/ServerGroupList.json" + } + }, + "description": "List all the server groups in a given subscription.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerGroupList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2": { + "get": { + "tags": [ + "ServerGroups" + ], + "operationId": "ServerGroups_ListByResourceGroup", + "x-ms-examples": { + "List the server groups by resource group": { + "$ref": "./examples/ServerGroupListByResourceGroup.json" + } + }, + "description": "List all the server groups in a given resource group.", + "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" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerGroupList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}": { "put": { "description": "Creates a new server group with servers.", @@ -1420,6 +1501,23 @@ } } }, + "ServerGroupList": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ServerGroup" + }, + "description": "The list of server groups" + }, + "nextLink": { + "description": "The link used to get the next page of operations.", + "type": "string" + } + }, + "description": "A list of server groups." + }, "ServerGroupProperties": { "discriminator": "createMode", "required": [ From c481b54e73c12a740746242a72ce58c08bed1960 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Tue, 24 Nov 2020 17:22:27 +0300 Subject: [PATCH 39/65] Fix listing operations --- .../postgresqlhsc.json | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 9c8bd4c20f2f..9ab0fd7d24a7 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -2005,16 +2005,21 @@ "properties": { "name": { "type": "string", - "description": "The name of the operation being performed on this particular object.", - "readOnly": true + "readOnly": true, + "description": "The name of the operation being performed on this particular object." }, "display": { "$ref": "#/definitions/OperationDisplay", - "description": "The localized display information for this particular operation or action.", - "readOnly": true + "readOnly": true, + "description": "The localized display information for this particular operation or action." + }, + "isDataAction": { + "description": "Indicates whether the operation is a data action", + "type": "boolean" }, "origin": { "type": "string", + "readOnly": true, "description": "The intended executor of the operation.", "enum": [ "NotSpecified", @@ -2024,29 +2029,34 @@ "x-ms-enum": { "name": "OperationOrigin", "modelAsString": true - }, - "readOnly": true + } }, "properties": { "type": "object", - "description": "Additional descriptions for the operation.", "additionalProperties": { "type": "object" }, "readOnly": true, - "x-ms-client-flatten": false + "x-ms-client-flatten": false, + "description": "Additional descriptions for the operation." } } }, "OperationListResult": { "description": "A list of resource provider operations.", + "type": "object", "properties": { "value": { + "description": "Collection of available operation details", + "uniqueItems": false, "type": "array", - "description": "The list of resource provider operations.", "items": { "$ref": "#/definitions/Operation" } + }, + "nextLink": { + "description": "URL client should use to fetch the next page (per server side paging).\r\nIt's null for now, added for future use.", + "type": "string" } } }, From 1771bd37fba591f458caa4538180c7ac60deed21 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Tue, 24 Nov 2020 17:52:30 +0300 Subject: [PATCH 40/65] Change servers operation id --- .../examples/CheckNameAvailability.json | 3 ++- ...rverGroupGetServer.json => ServerGet.json} | 0 ...vers.json => ServerListByServerGroup.json} | 0 .../postgresqlhsc.json | 20 +++++++++++-------- 4 files changed, 14 insertions(+), 9 deletions(-) rename specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/{ServerGroupGetServer.json => ServerGet.json} (100%) rename specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/{ServerGroupListServers.json => ServerListByServerGroup.json} (100%) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json index dfb8c68438eb..4fe17d1c1617 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/CheckNameAvailability.json @@ -12,7 +12,8 @@ "body": { "nameAvailable": true, "message": "", - "reason": "" + "name": "name1", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2" } } } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json similarity index 100% rename from specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGetServer.json rename to specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json similarity index 100% rename from specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListServers.json rename to specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 9ab0fd7d24a7..cbfa51e8d3cc 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -332,12 +332,12 @@ "get": { "description": "Lists servers of a server group.", "tags": [ - "ServerGroups" + "Servers" ], - "operationId": "ServerGroups_ListServers", + "operationId": "Servers_ListByServerGroup", "x-ms-examples": { "List servers of the server group": { - "$ref": "./examples/ServerGroupListServers.json" + "$ref": "./examples/ServerListByServerGroup.json" } }, "parameters": [ @@ -377,12 +377,12 @@ "get": { "description": "Gets information about a server in server group.", "tags": [ - "ServerGroups" + "Servers" ], - "operationId": "ServerGroups_GetServer", + "operationId": "Servers_Get", "x-ms-examples": { "Get the server of server group": { - "$ref": "./examples/ServerGroupGetServer.json" + "$ref": "./examples/ServerGet.json" } }, "parameters": [ @@ -2087,9 +2087,13 @@ "type": "boolean", "description": "Indicates whether the resource name is available." }, - "reason": { + "name": { + "type": "string", + "description": "name of the PostgreSQL server." + }, + "type": { "type": "string", - "description": "Reason for name being unavailable." + "description": "type of the server" } } }, From a5ffc2706c81ce6fa0edd1931d9d3f6f21a6a749 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Tue, 24 Nov 2020 18:06:00 +0300 Subject: [PATCH 41/65] Remove haState from server role group --- .../examples/ServerGroupGet.json | 6 ++---- .../examples/ServerGroupList.json | 18 ++++++------------ .../ServerGroupListByResourceGroup.json | 18 ++++++------------ .../postgresqlhsc.json | 4 ---- 4 files changed, 14 insertions(+), 32 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index 25649fc43d34..1ef41764c588 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -43,8 +43,7 @@ "isPublicIpRequested": true, "serverNames": [ "hsctestsg1-c" - ], - "haState": "Healthy" + ] }, { "name": "", @@ -59,8 +58,7 @@ "hsctestsg1-w0", "hsctestsg1-w1", "hsctestsg1-w2" - ], - "haState": "NotEnabled" + ] } ] } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json index 888366429185..c88481caf4ab 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json @@ -42,8 +42,7 @@ "isPublicIpRequested": true, "serverNames": [ "hsctestsg1-c" - ], - "haState": "Healthy" + ] }, { "name": "", @@ -58,8 +57,7 @@ "hsctestsg1-w0", "hsctestsg1-w1", "hsctestsg1-w2" - ], - "haState": "NotEnabled" + ] } ] } @@ -93,8 +91,7 @@ "isPublicIpRequested": true, "serverNames": [ "hsctestsg2-c" - ], - "haState": "Healthy" + ] }, { "name": "", @@ -109,8 +106,7 @@ "hsctestsg2-w0", "hsctestsg2-w1", "hsctestsg2-w2" - ], - "haState": "NotEnabled" + ] } ] } @@ -149,8 +145,7 @@ "isPublicIpRequested": true, "serverNames": [ "hsctestsg3-c" - ], - "haState": "Healthy" + ] }, { "name": "", @@ -165,8 +160,7 @@ "hsctestsg3-w0", "hsctestsg3-w1", "hsctestsg3-w2" - ], - "haState": "NotEnabled" + ] } ] } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json index e8c14c3abb6c..2194766b8e28 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json @@ -43,8 +43,7 @@ "isPublicIpRequested": true, "serverNames": [ "hsctestsg1-c" - ], - "haState": "Healthy" + ] }, { "name": "", @@ -59,8 +58,7 @@ "hsctestsg1-w0", "hsctestsg1-w1", "hsctestsg1-w2" - ], - "haState": "NotEnabled" + ] } ] } @@ -94,8 +92,7 @@ "isPublicIpRequested": true, "serverNames": [ "hsctestsg2-c" - ], - "haState": "Healthy" + ] }, { "name": "", @@ -110,8 +107,7 @@ "hsctestsg2-w0", "hsctestsg2-w1", "hsctestsg2-w2" - ], - "haState": "NotEnabled" + ] } ] } @@ -150,8 +146,7 @@ "isPublicIpRequested": true, "serverNames": [ "hsctestsg3-c" - ], - "haState": "Healthy" + ] }, { "name": "", @@ -166,8 +161,7 @@ "hsctestsg3-w0", "hsctestsg3-w1", "hsctestsg3-w2" - ], - "haState": "NotEnabled" + ] } ] } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index cbfa51e8d3cc..9d593f717dff 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1392,10 +1392,6 @@ "format": "int32", "description": "The number of servers in the server role group." }, - "haState": { - "$ref": "#/definitions/ServerHaState", - "description": "A state of a server role group that is visible to user for HA feature." - }, "serverNames": { "type": "array", "description": "The list of server names in the server role group.", From df3a697aa06a5877335f804607123d363bfe7907 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Wed, 25 Nov 2020 15:03:18 +0300 Subject: [PATCH 42/65] Add missing state to ServerState --- .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 9d593f717dff..554ab7cff642 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1286,7 +1286,8 @@ "Starting", "Stopping", "Stopped", - "Updating" + "Updating", + "Provisioning" ], "x-ms-enum": { "name": "ServerState", From 12486ee2112cd83896c215f4619adb530a39cfe0 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 4 Dec 2020 02:09:36 +0300 Subject: [PATCH 43/65] Refactor configuration API --- .../examples/ConfigurationBatchUpdate.json | 88 ---------- .../examples/ConfigurationGet.json | 32 ++-- .../ConfigurationListByServerGroup.json | 118 +++++++++----- .../examples/ConfigurationUpdate.json | 30 +--- .../postgresqlhsc.json | 154 ++++++++---------- 5 files changed, 162 insertions(+), 260 deletions(-) delete mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json deleted file mode 100644 index 1508f4d6cf39..000000000000 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationBatchUpdate.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "parameters": { - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "resourceGroupName": "TestResourceGroup", - "serverGroupName": "hsctestsg", - "api-version": "2020-10-05-privatepreview", - "parameters": { - "properties": { - "serverRoleGroupConfigurations": [ - { - "role": "Coordinator", - "configurations": [ - { - "name": "array_nulls", - "value": "on" - }, - { - "name": "backslash_quote", - "value": "safe_encoding" - }, - { - "name": "bytea_output", - "value": "hex" - } - ] - }, - { - "role": "Worker", - "configurations": [ - { - "name": "check_function_bodies", - "value": "on" - }, - { - "name": "client_encoding", - "value": "sql_ascii" - } - ] - } - ] - } - } - }, - "responses": { - "200": { - "body": { - "properties": { - "serverRoleGroupConfigurations": [ - { - "role": "Coordinator", - "configurations": [ - { - "name": "array_nulls", - "value": "on" - }, - { - "name": "backslash_quote", - "value": "safe_encoding" - }, - { - "name": "bytea_output", - "value": "hex" - } - ] - }, - { - "role": "Worker", - "configurations": [ - { - "name": "check_function_bodies", - "value": "on" - }, - { - "name": "client_encoding", - "value": "sql_ascii" - } - ] - } - ] - }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations", - "name": "hsctestsg-config", - "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations" - } - }, - "202": {} - } -} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json index 3b3965f938c2..e60070ccff00 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json @@ -10,35 +10,23 @@ "200": { "body": { "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/array_nulls", - "name": "hsctestsgconfigs", + "name": "array_nulls", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", "properties": { - "serverRoleGroupConfigurations": [ + "description": "Enable input of NULL elements in arrays.", + "defaultValue": "on", + "dataType": "Boolean", + "allowedValues": "on,off", + "serverRoleGroupConfigurationValues": [ { "role": "Coordinator", - "configurations": [ - { - "value": "on", - "description": "Enable input of NULL elements in arrays.", - "defaultValue": "on", - "dataType": "Boolean", - "allowedValues": "on,off", - "source": "system-default" - } - ] + "value": "on", + "source": "system-default" }, { "role": "Worker", - "configurations": [ - { - "value": "on", - "description": "Enable input of NULL elements in arrays.", - "defaultValue": "on", - "dataType": "Boolean", - "allowedValues": "on,off", - "source": "system-default" - } - ] + "value": "off", + "source": "user-override" } ] } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json index ba4edd33f7d0..5dffadc2d0de 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json @@ -8,68 +8,100 @@ "responses": { "200": { "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations", - "name": "hsctestsgconfigs", - "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", - "properties": { - "serverRoleGroupConfigurations": [ - { - "role": "Coordinator", - "configurations": [ + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/array_nulls", + "name": "array_nulls", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", + "properties": { + "description": "Enable input of NULL elements in arrays.", + "defaultValue": "on", + "dataType": "Boolean", + "allowedValues": "on,off", + "serverRoleGroupConfigurationValues": [ { - "name": "array_nulls", + "role": "Coordinator", "value": "on", - "description": "Enable input of NULL elements in arrays.", - "defaultValue": "on", - "dataType": "Boolean", - "allowedValues": "on,off", "source": "system-default" }, { - "name": "backslash_quote", - "value": "safe_encoding", - "description": "Sets whether \"\\'\" is allowed in string literals.", - "defaultValue": "safe_encoding", - "dataType": "Enumeration", - "allowedValues": "safe_encoding,on,off", - "source": "system-default" + "role": "Worker", + "value": "off", + "source": "user-override" + } + ] + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/backslash_quote", + "name": "backslash_quote", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", + "properties": { + "description": "Sets whether \"\\'\" is allowed in string literals.", + "defaultValue": "safe_encoding", + "dataType": "Enumeration", + "allowedValues": "safe_encoding,on,off", + "serverRoleGroupConfigurationValues": [ + { + "role": "Coordinator", + "value": "off", + "source": "user-override" }, { - "name": "bytea_output", - "value": "hex", - "description": "Sets the output format for bytea.", - "defaultValue": "hex", - "dataType": "Enumeration", - "allowedValues": "escape,hex", + "role": "Worker", + "value": "safe_encoding", "source": "system-default" } ] - }, - { - "role": "Worker", - "configurations": [ + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/check_function_bodies", + "name": "check_function_bodies", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", + "properties": { + "description": "Check function bodies during CREATE FUNCTION.", + "defaultValue": "on", + "dataType": "Boolean", + "allowedValues": "on,off", + "serverRoleGroupConfigurationValues": [ { - "name": "check_function_bodies", + "role": "Coordinator", "value": "on", - "description": "Check function bodies during CREATE FUNCTION.", - "defaultValue": "on", - "dataType": "Boolean", - "allowedValues": "on,off", "source": "system-default" }, { - "name": "client_encoding", - "value": "sql_ascii", - "description": "Sets the client's character set encoding.", - "defaultValue": "sql_ascii", - "dataType": "Enumeration", - "allowedValues": "BIG5,EUC_CN,EUC_JP,EUC_JIS_2004,EUC_KR,EUC_TW,GB18030,GBK,ISO_8859_5,ISO_8859_6,ISO_8859_7,ISO_8859_8,JOHAB,KOI8R,KOI8U,LATIN1,LATIN2,LATIN3,LATIN4,LATIN5,LATIN6,LATIN7,LATIN8,LATIN9,LATIN10,MULE_INTERNAL,SJIS,SHIFT_JIS_2004,SQL_ASCII,UHC,UTF8,WIN866,WIN874,WIN1250,WIN1251,WIN1252,WIN1253,WIN1254,WIN1255,WIN1256,WIN1257,WIN1258", + "role": "Worker", + "value": "on", "source": "system-default" } ] } - ] - } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/client_encoding", + "name": "client_encoding", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", + "properties": { + "description": "Sets the client's character set encoding.", + "defaultValue": "sql_ascii", + "dataType": "Enumeration", + "allowedValues": "BIG5,EUC_CN,EUC_JP,EUC_JIS_2004,EUC_KR,EUC_TW,GB18030,GBK,ISO_8859_5,ISO_8859_6,ISO_8859_7,ISO_8859_8,JOHAB,KOI8R,KOI8U,LATIN1,LATIN2,LATIN3,LATIN4,LATIN5,LATIN6,LATIN7,LATIN8,LATIN9,LATIN10,MULE_INTERNAL,SJIS,SHIFT_JIS_2004,SQL_ASCII,UHC,UTF8,WIN866,WIN874,WIN1250,WIN1251,WIN1252,WIN1253,WIN1254,WIN1255,WIN1256,WIN1257,WIN1258", + "serverRoleGroupConfigurationValues": [ + { + "role": "Coordinator", + "value": "ISO_8859_7", + "source": "user-override" + }, + { + "role": "Worker", + "value": "ISO_8859_7", + "source": "user-override" + } + ] + } + } + ] } } } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json index c79356f90ac7..05598a5509ba 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json @@ -7,22 +7,14 @@ "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { - "serverRoleGroupConfigurations": [ + "serverRoleGroupConfigurationValues": [ { "role": "Coordinator", - "configurations": [ - { - "value": "on" - } - ] + "value": "on" }, { "role": "Worker", - "configurations": [ - { - "value": "off" - } - ] + "value": "off" } ] } @@ -32,27 +24,19 @@ "200": { "body": { "properties": { - "serverRoleGroupConfigurations": [ + "serverRoleGroupConfigurationValues": [ { "role": "Coordinator", - "configurations": [ - { - "value": "on" - } - ] + "value": "on" }, { "role": "Worker", - "configurations": [ - { - "value": "off" - } - ] + "value": "off" } ] }, "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/array_nulls", - "name": "hsctestsg-array_nulls", + "name": "array_nulls", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations" } }, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 554ab7cff642..5ba10ce12800 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -451,7 +451,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ConfigurationList" + "$ref": "#/definitions/ServerConfigurationListResult" } }, "default": { @@ -467,59 +467,6 @@ } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/configurations": { - "put": { - "description": "Updates configurations of a server group", - "tags": [ - "Configurations" - ], - "operationId": "Configurations_BatchUpdate", - "x-ms-long-running-operation": true, - "x-ms-examples": { - "Update configurations of the server group": { - "$ref": "./examples/ConfigurationBatchUpdate.json" - } - }, - "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/ServerGroupNameParameter" - }, - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/ServerGroupConfiguration" - }, - "description": "The required parameters for updating a server group configurations." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ServerGroupConfiguration" - } - }, - "202": { - "description": "Accepted" - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - } - }, "get": { "description": "List all the configurations of a server group.", "tags": [ @@ -549,7 +496,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerGroupConfiguration" + "$ref": "#/definitions/ServerGroupConfigurationListResult" } }, "default": { @@ -558,12 +505,15 @@ "$ref": "#/definitions/CloudError" } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/configurations/{configurationName}": { "put": { - "description": "Updates single configuration of servers in a server group", + "description": "Updates configuration of server role groups in a server group", "tags": [ "Configurations" ], @@ -1755,52 +1705,88 @@ "ServerGroupConfigurationProperties": { "description": "The properties of server group configuration.", "properties": { - "serverRoleGroupConfigurations": { + "description": { + "type": "string", + "description": "Description of the configuration.", + "readOnly": true + }, + "defaultValue": { + "type": "string", + "description": "Default value of the configuration.", + "readOnly": true + }, + "dataType": { + "type": "string", + "description": "Data type of the configuration.", + "enum": [ + "Boolean", + "Numeric", + "Integer", + "Enumeration" + ], + "x-ms-enum": { + "name": "ConfigurationDataType", + "modelAsString": true + }, + "readOnly": true + }, + "allowedValues": { + "type": "string", + "description": "Allowed values of the configuration.", + "readOnly": true + }, + "serverRoleGroupConfigurationValues": { "type": "array", - "description": "The list of server role group configurations.", + "description": "The list of server role group configuration values.", "items": { - "$ref": "#/definitions/ServerRoleGroupConfiguration" + "$ref": "#/definitions/ServerRoleGroupConfigurationValue" }, "uniqueItems": true } - } + }, + "required": [ + "serverRoleGroupConfigurationValues" + ] }, - "ServerRoleGroupConfiguration": { - "description": "Represents server role group configurations.", + "ServerRoleGroupConfigurationValue": { + "description": "Represents server role group configuration value.", "properties": { "role": { "$ref": "#/definitions/ServerRole", "description": "The role of servers in the server role group." }, - "configurations": { - "type": "array", - "description": "The list of configurations.", - "items": { - "$ref": "#/definitions/ConfigurationPropertiesWithName" - }, - "uniqueItems": true + "value": { + "type": "string", + "description": "Value of the configuration." + }, + "source": { + "type": "string", + "description": "Source of the configuration." } }, "required": [ "role", - "configurations" + "value" ] }, - "ConfigurationPropertiesWithName": { - "description": "The properties of a configuration with name.", - "allOf": [ - { - "$ref": "#/definitions/ConfigurationProperties" - } - ], + "ServerGroupConfigurationListResult": { + "description": "A list of server group configurations.", "properties": { - "name": { + "value": { + "type": "array", + "description": "The list of server group configurations.", + "items": { + "$ref": "#/definitions/ServerGroupConfiguration" + } + }, + "nextLink": { "type": "string", - "description": "Name of the configuration." + "description": "Link to retrieve next page of results.", + "readOnly": true } } }, - "ConfigurationProperties": { + "ServerConfigurationProperties": { "description": "The properties of a configuration.", "properties": { "value": { @@ -1846,7 +1832,7 @@ "value" ] }, - "Configuration": { + "ServerConfiguration": { "description": "Represents a configuration.", "allOf": [ { @@ -1855,20 +1841,20 @@ ], "properties": { "properties": { - "$ref": "#/definitions/ConfigurationProperties", + "$ref": "#/definitions/ServerConfigurationProperties", "description": "The properties of a configuration.", "x-ms-client-flatten": true } } }, - "ConfigurationList": { + "ServerConfigurationListResult": { "description": "A list of server configurations.", "properties": { "value": { "type": "array", "description": "The list of server configurations.", "items": { - "$ref": "#/definitions/Configuration" + "$ref": "#/definitions/ServerConfiguration" } }, "nextLink": { From c4d8c9c2f1164a60e5f277b296737754bff75da8 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 4 Dec 2020 14:19:36 +0300 Subject: [PATCH 44/65] Add missing readOnly properties --- .../postgresqlhsc.json | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 5ba10ce12800..1f17215c9247 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1242,7 +1242,8 @@ "x-ms-enum": { "name": "ServerState", "modelAsString": true - } + }, + "readOnly": true }, "ServerHaState": { "type": "string", @@ -1259,7 +1260,8 @@ "x-ms-enum": { "name": "ServerHaState", "modelAsString": true - } + }, + "readOnly": true }, "ServerRole": { "type": "string", @@ -1460,7 +1462,8 @@ }, "nextLink": { "description": "The link used to get the next page of operations.", - "type": "string" + "type": "string", + "readOnly": true } }, "description": "A list of server groups." @@ -1761,7 +1764,8 @@ }, "source": { "type": "string", - "description": "Source of the configuration." + "description": "Source of the configuration.", + "readOnly": true } }, "required": [ @@ -1795,7 +1799,8 @@ }, "source": { "type": "string", - "description": "Source of the configuration." + "description": "Source of the configuration.", + "readOnly": true }, "description": { "type": "string", @@ -2039,7 +2044,8 @@ }, "nextLink": { "description": "URL client should use to fetch the next page (per server side paging).\r\nIt's null for now, added for future use.", - "type": "string" + "type": "string", + "readOnly": true } } }, From a0088a1b7e3a3efe3965ba36c7d0251b6ce84251 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Fri, 4 Dec 2020 15:03:37 +0300 Subject: [PATCH 45/65] Move ServerGroupConfig.defaultValue to ServerRoleGroupConfig --- .../examples/ConfigurationGet.json | 3 ++- .../ConfigurationListByServerGroup.json | 26 +++++++++++-------- .../postgresqlhsc.json | 12 ++++----- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json index e60070ccff00..0049c364389f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json @@ -14,18 +14,19 @@ "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", "properties": { "description": "Enable input of NULL elements in arrays.", - "defaultValue": "on", "dataType": "Boolean", "allowedValues": "on,off", "serverRoleGroupConfigurationValues": [ { "role": "Coordinator", "value": "on", + "defaultValue": "on", "source": "system-default" }, { "role": "Worker", "value": "off", + "defaultValue": "on", "source": "user-override" } ] diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json index 5dffadc2d0de..0c682fe51689 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json @@ -15,18 +15,19 @@ "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", "properties": { "description": "Enable input of NULL elements in arrays.", - "defaultValue": "on", "dataType": "Boolean", "allowedValues": "on,off", "serverRoleGroupConfigurationValues": [ { "role": "Coordinator", "value": "on", + "defaultValue": "on", "source": "system-default" }, { "role": "Worker", "value": "off", + "defaultValue": "on", "source": "user-override" } ] @@ -38,41 +39,43 @@ "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", "properties": { "description": "Sets whether \"\\'\" is allowed in string literals.", - "defaultValue": "safe_encoding", "dataType": "Enumeration", "allowedValues": "safe_encoding,on,off", "serverRoleGroupConfigurationValues": [ { "role": "Coordinator", "value": "off", + "defaultValue": "safe_encoding", "source": "user-override" }, { "role": "Worker", "value": "safe_encoding", + "defaultValue": "safe_encoding", "source": "system-default" } ] } }, { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/check_function_bodies", - "name": "check_function_bodies", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/work_mem", + "name": "work_mem", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", "properties": { - "description": "Check function bodies during CREATE FUNCTION.", - "defaultValue": "on", - "dataType": "Boolean", - "allowedValues": "on,off", + "description": "Sets the amount of memory to be used by internal sort operations and hash tables before writing to temporary disk files.", + "dataType": "Integer", + "allowedValues": "4096-2097151", "serverRoleGroupConfigurationValues": [ { "role": "Coordinator", - "value": "on", + "value": "158720", + "defaultValue": "158720", "source": "system-default" }, { "role": "Worker", - "value": "on", + "value": "115712", + "defaultValue": "115712", "source": "system-default" } ] @@ -84,18 +87,19 @@ "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", "properties": { "description": "Sets the client's character set encoding.", - "defaultValue": "sql_ascii", "dataType": "Enumeration", "allowedValues": "BIG5,EUC_CN,EUC_JP,EUC_JIS_2004,EUC_KR,EUC_TW,GB18030,GBK,ISO_8859_5,ISO_8859_6,ISO_8859_7,ISO_8859_8,JOHAB,KOI8R,KOI8U,LATIN1,LATIN2,LATIN3,LATIN4,LATIN5,LATIN6,LATIN7,LATIN8,LATIN9,LATIN10,MULE_INTERNAL,SJIS,SHIFT_JIS_2004,SQL_ASCII,UHC,UTF8,WIN866,WIN874,WIN1250,WIN1251,WIN1252,WIN1253,WIN1254,WIN1255,WIN1256,WIN1257,WIN1258", "serverRoleGroupConfigurationValues": [ { "role": "Coordinator", "value": "ISO_8859_7", + "defaultValue": "sql_ascii", "source": "user-override" }, { "role": "Worker", "value": "ISO_8859_7", + "defaultValue": "sql_ascii", "source": "user-override" } ] diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 1f17215c9247..b29aa4280307 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -512,7 +512,7 @@ } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/serverGroupsv2/{serverGroupName}/configurations/{configurationName}": { - "put": { + "patch": { "description": "Updates configuration of server role groups in a server group", "tags": [ "Configurations" @@ -1713,11 +1713,6 @@ "description": "Description of the configuration.", "readOnly": true }, - "defaultValue": { - "type": "string", - "description": "Default value of the configuration.", - "readOnly": true - }, "dataType": { "type": "string", "description": "Data type of the configuration.", @@ -1762,6 +1757,11 @@ "type": "string", "description": "Value of the configuration." }, + "defaultValue": { + "type": "string", + "description": "Default value of the configuration.", + "readOnly": true + }, "source": { "type": "string", "description": "Source of the configuration.", From 0809423c955d57b7b3aaba7364bb2678d1f89fb1 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Mon, 7 Dec 2020 15:07:44 +0300 Subject: [PATCH 46/65] Rename serverRoleGroupConfigurationValues to serverRoleGroupConfigurations --- .../examples/ConfigurationGet.json | 2 +- .../ConfigurationListByServerGroup.json | 8 ++++---- .../examples/ConfigurationUpdate.json | 4 ++-- .../postgresqlhsc.json | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json index 0049c364389f..e34b610c701c 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json @@ -16,7 +16,7 @@ "description": "Enable input of NULL elements in arrays.", "dataType": "Boolean", "allowedValues": "on,off", - "serverRoleGroupConfigurationValues": [ + "serverRoleGroupConfigurations": [ { "role": "Coordinator", "value": "on", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json index 0c682fe51689..c223f6072ff5 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json @@ -17,7 +17,7 @@ "description": "Enable input of NULL elements in arrays.", "dataType": "Boolean", "allowedValues": "on,off", - "serverRoleGroupConfigurationValues": [ + "serverRoleGroupConfigurations": [ { "role": "Coordinator", "value": "on", @@ -41,7 +41,7 @@ "description": "Sets whether \"\\'\" is allowed in string literals.", "dataType": "Enumeration", "allowedValues": "safe_encoding,on,off", - "serverRoleGroupConfigurationValues": [ + "serverRoleGroupConfigurations": [ { "role": "Coordinator", "value": "off", @@ -65,7 +65,7 @@ "description": "Sets the amount of memory to be used by internal sort operations and hash tables before writing to temporary disk files.", "dataType": "Integer", "allowedValues": "4096-2097151", - "serverRoleGroupConfigurationValues": [ + "serverRoleGroupConfigurations": [ { "role": "Coordinator", "value": "158720", @@ -89,7 +89,7 @@ "description": "Sets the client's character set encoding.", "dataType": "Enumeration", "allowedValues": "BIG5,EUC_CN,EUC_JP,EUC_JIS_2004,EUC_KR,EUC_TW,GB18030,GBK,ISO_8859_5,ISO_8859_6,ISO_8859_7,ISO_8859_8,JOHAB,KOI8R,KOI8U,LATIN1,LATIN2,LATIN3,LATIN4,LATIN5,LATIN6,LATIN7,LATIN8,LATIN9,LATIN10,MULE_INTERNAL,SJIS,SHIFT_JIS_2004,SQL_ASCII,UHC,UTF8,WIN866,WIN874,WIN1250,WIN1251,WIN1252,WIN1253,WIN1254,WIN1255,WIN1256,WIN1257,WIN1258", - "serverRoleGroupConfigurationValues": [ + "serverRoleGroupConfigurations": [ { "role": "Coordinator", "value": "ISO_8859_7", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json index 05598a5509ba..bf35404c11de 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json @@ -7,7 +7,7 @@ "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { - "serverRoleGroupConfigurationValues": [ + "serverRoleGroupConfigurations": [ { "role": "Coordinator", "value": "on" @@ -24,7 +24,7 @@ "200": { "body": { "properties": { - "serverRoleGroupConfigurationValues": [ + "serverRoleGroupConfigurations": [ { "role": "Coordinator", "value": "on" diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index b29aa4280307..4c5046d01b8d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -58,7 +58,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerGroupList" + "$ref": "#/definitions/ServerGroupListResult" } }, "default": { @@ -100,7 +100,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerGroupList" + "$ref": "#/definitions/ServerGroupListResult" } }, "default": { @@ -358,7 +358,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerGroupServerList" + "$ref": "#/definitions/ServerGroupServerListResult" } }, "default": { @@ -1402,7 +1402,7 @@ } } }, - "ServerGroupServerList": { + "ServerGroupServerListResult": { "description": "A list of servers in a server group.", "properties": { "value": { @@ -1450,7 +1450,7 @@ } } }, - "ServerGroupList": { + "ServerGroupListResult": { "type": "object", "properties": { "value": { @@ -1733,20 +1733,20 @@ "description": "Allowed values of the configuration.", "readOnly": true }, - "serverRoleGroupConfigurationValues": { + "serverRoleGroupConfigurations": { "type": "array", "description": "The list of server role group configuration values.", "items": { - "$ref": "#/definitions/ServerRoleGroupConfigurationValue" + "$ref": "#/definitions/ServerRoleGroupConfiguration" }, "uniqueItems": true } }, "required": [ - "serverRoleGroupConfigurationValues" + "serverRoleGroupConfigurations" ] }, - "ServerRoleGroupConfigurationValue": { + "ServerRoleGroupConfiguration": { "description": "Represents server role group configuration value.", "properties": { "role": { From d959e9d917a423362bfa173fe026a13d8a5889bc Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Mon, 7 Dec 2020 15:15:21 +0300 Subject: [PATCH 47/65] Rename java namespace --- specification/postgresqlhsc/resource-manager/readme.java.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/postgresqlhsc/resource-manager/readme.java.md b/specification/postgresqlhsc/resource-manager/readme.java.md index d0311f82cd29..385f5789d20d 100644 --- a/specification/postgresqlhsc/resource-manager/readme.java.md +++ b/specification/postgresqlhsc/resource-manager/readme.java.md @@ -26,7 +26,7 @@ Please also specify `--azure-libraries-for-java-folder= Date: Mon, 7 Dec 2020 15:40:59 +0300 Subject: [PATCH 48/65] Add systemData to all resources --- .../examples/ConfigurationGet.json | 8 ++++ .../examples/ConfigurationListByServer.json | 48 ++++++++++++++----- .../ConfigurationListByServerGroup.json | 32 +++++++++++++ .../examples/ConfigurationUpdate.json | 16 +++++-- .../examples/FirewallRuleCreate.json | 16 +++++++ .../examples/FirewallRuleGet.json | 8 ++++ .../FirewallRuleListByServerGroup.json | 16 +++++++ .../examples/RoleCreate.json | 16 +++++++ .../examples/RoleListByServerGroup.json | 16 +++++++ .../examples/ServerGet.json | 8 ++++ .../examples/ServerGroupAddNode.json | 8 ++++ .../examples/ServerGroupCreate.json | 16 +++++++ .../examples/ServerGroupCreatePITR.json | 16 +++++++ .../examples/ServerGroupGet.json | 8 ++++ .../examples/ServerGroupList.json | 24 ++++++++++ .../ServerGroupListByResourceGroup.json | 24 ++++++++++ .../examples/ServerGroupScaleCompute.json | 8 ++++ .../examples/ServerGroupScaleStorage.json | 8 ++++ .../examples/ServerGroupUpdatePatch.json | 8 ++++ .../examples/ServerGroupUpdatePut.json | 16 +++++++ .../examples/ServerListByServerGroup.json | 24 ++++++++++ .../postgresqlhsc.json | 24 ++++++++++ 22 files changed, 352 insertions(+), 16 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json index e34b610c701c..c0abc3e3fedd 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationGet.json @@ -12,6 +12,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/array_nulls", "name": "array_nulls", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "description": "Enable input of NULL elements in arrays.", "dataType": "Boolean", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json index 849308f478fa..c05f4bc2c80a 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServer.json @@ -11,6 +11,17 @@ "body": { "value": [ { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/servers/testserver/configurations/application_name", + "name": "application_name", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers/configurations", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "value": "", "description": "Sets the application name to be reported in statistics and logs.", @@ -18,12 +29,20 @@ "dataType": "String", "allowedValues": "[A-Za-z0-9._-]*", "source": "system-default" - }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/servers/testserver/configurations/application_name", - "name": "application_name", - "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers/configurations" + } }, { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/servers/testserver/configurations/array_nulls", + "name": "array_nulls", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers/configurations", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "value": "on", "description": "Enables input of NULL elements in arrays.", @@ -31,12 +50,20 @@ "dataType": "Boolean", "allowedValues": "on,off", "source": "system-default" - }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/servers/testserver/configurations/array_nulls", - "name": "array_nulls", - "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers/configurations" + } }, { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/servers/testserver/configurations/autovacuum", + "name": "autovacuum", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers/configurations", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "value": "on", "description": "Starts the autovacuum subprocess.", @@ -44,10 +71,7 @@ "dataType": "Boolean", "allowedValues": "on,off", "source": "system-default" - }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/servers/testserver/configurations/autovacuum", - "name": "autovacuum", - "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers/configurations" + } } ] } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json index c223f6072ff5..598f41849cf8 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationListByServerGroup.json @@ -13,6 +13,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/array_nulls", "name": "array_nulls", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "description": "Enable input of NULL elements in arrays.", "dataType": "Boolean", @@ -37,6 +45,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/backslash_quote", "name": "backslash_quote", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "description": "Sets whether \"\\'\" is allowed in string literals.", "dataType": "Enumeration", @@ -61,6 +77,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/work_mem", "name": "work_mem", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "description": "Sets the amount of memory to be used by internal sort operations and hash tables before writing to temporary disk files.", "dataType": "Integer", @@ -85,6 +109,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/client_encoding", "name": "client_encoding", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "description": "Sets the client's character set encoding.", "dataType": "Enumeration", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json index bf35404c11de..f206a02d5d9c 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ConfigurationUpdate.json @@ -23,6 +23,17 @@ "responses": { "200": { "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/array_nulls", + "name": "array_nulls", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "serverRoleGroupConfigurations": [ { @@ -34,10 +45,7 @@ "value": "off" } ] - }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg/configurations/array_nulls", - "name": "array_nulls", - "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/configurations" + } } }, "202": {} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json index f9a2f4b74449..e7e6f44dc26a 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleCreate.json @@ -18,6 +18,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/firewallRules/rule1", "name": "rule1", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "startIpAddress": "0.0.0.0", "endIpAddress": "255.255.255.255" @@ -29,6 +37,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/firewallRules/rule1", "name": "rule1", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "startIpAddress": "0.0.0.0", "endIpAddress": "255.255.255.255" diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json index 6246f172eed8..03d9d1ea6db3 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleGet.json @@ -12,6 +12,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/firewallRules/rule1", "name": "rule1", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "startIpAddress": "0.0.0.0", "endIpAddress": "255.255.255.255" diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json index e91e259fa3aa..25d59179ee70 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/FirewallRuleListByServerGroup.json @@ -13,6 +13,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/firewallRules/rule1", "name": "rule1", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "startIpAddress": "0.0.0.0", "endIpAddress": "255.255.255.255" @@ -22,6 +30,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/firewallRules/rule2", "name": "rule2", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/firewallRules", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "startIpAddress": "1.0.0.0", "endIpAddress": "255.0.0.0" diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json index 9c5beda8dd71..4eeb3d7b8af1 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleCreate.json @@ -17,6 +17,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/roles/role1", "name": "role1", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/roles", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {} } }, @@ -25,6 +33,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/roles/role1", "name": "role1", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/roles", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {} } }, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json index 4de69f5bd888..3f1dab1c35f9 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/RoleListByServerGroup.json @@ -13,12 +13,28 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/roles/role1", "name": "role1", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/roles", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {} }, { "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/pgtestsvc4/roles/role2", "name": "role2", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/roles", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {} } ] diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json index b2c8096684ee..04cfae5e3b08 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json @@ -12,6 +12,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg1/servers/hsctestsg1-c", "name": "hsctestsg1-c", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "administratorLogin": "string", "version": "12", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json index 5f9581ed0ea8..c604175610a6 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json @@ -24,6 +24,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {}, "location": "westus2" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index 649a42cf3f35..7d69a23aa23c 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -52,6 +52,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {}, "location": "westus2" } @@ -61,6 +69,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {}, "location": "westus2" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json index 710e694545ea..fe8dd3db7ca7 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json @@ -24,6 +24,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {}, "location": "westus2" } @@ -33,6 +41,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {}, "location": "westus2" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index 1ef41764c588..e8b147792217 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -17,6 +17,14 @@ "additionalProp3": "string" }, "location": "eastus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "administratorLogin": "citus", "version": "12", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json index c88481caf4ab..f2ce7c271733 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json @@ -16,6 +16,14 @@ "additionalProp1": "string" }, "location": "eastus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "administratorLogin": "citus", "version": "12", @@ -70,6 +78,14 @@ "additionalProp2": "string" }, "location": "eastus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "administratorLogin": "citus", "version": "12", @@ -119,6 +135,14 @@ "additionalProp3": "string" }, "location": "eastus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "administratorLogin": "citus", "version": "12", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json index 2194766b8e28..341f1bfaf77e 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json @@ -17,6 +17,14 @@ "additionalProp1": "string" }, "location": "eastus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "administratorLogin": "citus", "version": "12", @@ -71,6 +79,14 @@ "additionalProp2": "string" }, "location": "eastus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "administratorLogin": "citus", "version": "12", @@ -120,6 +136,14 @@ "additionalProp3": "string" }, "location": "eastus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "administratorLogin": "citus", "version": "12", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json index a24f0752d7e6..ca233ae425d1 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json @@ -24,6 +24,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {}, "location": "westus2" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json index 8743d60d2c69..7bd0e56c29ec 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json @@ -24,6 +24,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {}, "location": "westus2" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json index e1234f5d0eef..247586ad2d85 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json @@ -42,6 +42,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {}, "location": "westus2" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json index 485e093f8850..5ee60da4c7f4 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json @@ -43,6 +43,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {}, "location": "westus2" } @@ -52,6 +60,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", "name": "hsctestsg", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": {}, "location": "westus2" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json index a2081ef30473..b20daa93246e 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json @@ -13,6 +13,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg1/servers/hsctestsg1-c", "name": "hsctestsg1-c", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "administratorLogin": "string", "version": "12", @@ -30,6 +38,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg1/servers/hsctestsg1-w0", "name": "hsctestsg1-w0", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "administratorLogin": "string", "version": "12", @@ -47,6 +63,14 @@ "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg1/servers/hsctestsg1-w1", "name": "hsctestsg1-w1", "type": "Microsoft.DBforPostgreSQL/serverGroupsv2/servers", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, "properties": { "administratorLogin": "string", "version": "12", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 4c5046d01b8d..f0c16901b44e 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1395,6 +1395,10 @@ } ], "properties": { + "systemData": { + "description": "The system metadata relating to this resource", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" + }, "properties": { "$ref": "#/definitions/ServerGroupServerProperties", "description": "The properties of a server in a server group.", @@ -1443,6 +1447,10 @@ } ], "properties": { + "systemData": { + "description": "The system metadata relating to this resource", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" + }, "properties": { "$ref": "#/definitions/ServerGroupProperties", "x-ms-client-flatten": true, @@ -1698,6 +1706,10 @@ } ], "properties": { + "systemData": { + "description": "The system metadata relating to this resource", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" + }, "properties": { "$ref": "#/definitions/ServerGroupConfigurationProperties", "description": "The properties of server group configuration.", @@ -1845,6 +1857,10 @@ } ], "properties": { + "systemData": { + "description": "The system metadata relating to this resource", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" + }, "properties": { "$ref": "#/definitions/ServerConfigurationProperties", "description": "The properties of a configuration.", @@ -1896,6 +1912,10 @@ } ], "properties": { + "systemData": { + "description": "The system metadata relating to this resource", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" + }, "properties": { "$ref": "#/definitions/FirewallRuleProperties", "x-ms-client-flatten": true, @@ -1938,6 +1958,10 @@ }, "Role": { "properties": { + "systemData": { + "description": "The system metadata relating to this resource", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" + }, "properties": { "$ref": "#/definitions/RoleProperties", "x-ms-client-flatten": true, From 3881d62bae2532b0ab806e45840402b90840e3d7 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Mon, 7 Dec 2020 16:08:14 +0300 Subject: [PATCH 49/65] Fix CheckNameAvailability warning --- .../postgresqlhsc.json | 20 +++++++++++++------ .../resource-manager/readme.java.md | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index f0c16901b44e..dc2d76fc1c6c 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -130,7 +130,7 @@ "Create a new server group as a point in time restore": { "$ref": "./examples/ServerGroupCreatePITR.json" }, - "Update the server group": { + "Update the server group with PUT": { "$ref": "./examples/ServerGroupUpdatePut.json" } }, @@ -273,7 +273,7 @@ "operationId": "ServerGroups_Update", "x-ms-long-running-operation": true, "x-ms-examples": { - "Update the server group": { + "Update the server group with PATCH": { "$ref": "./examples/ServerGroupUpdatePatch.json" }, "Scale compute": { @@ -1100,9 +1100,9 @@ "post": { "description": "Check the availability of name for resource", "tags": [ - "CheckNameAvailability" + "ServerGroups" ], - "operationId": "CheckNameAvailability_Execute", + "operationId": "ServerGroups_CheckNameAvailability", "x-ms-examples": { "Check name availability": { "$ref": "./examples/CheckNameAvailability.json" @@ -2082,11 +2082,19 @@ }, "type": { "type": "string", - "description": "Resource type used for verification." + "enum": [ + "Microsoft.DBforPostgreSQL/serverGroupsv2" + ], + "description": "Resource type used for verification.", + "x-ms-enum": { + "name": "CheckNameAvailabilityResourceType", + "modelAsString": false + } } }, "required": [ - "name" + "name", + "type" ] }, "NameAvailability": { diff --git a/specification/postgresqlhsc/resource-manager/readme.java.md b/specification/postgresqlhsc/resource-manager/readme.java.md index 385f5789d20d..d0311f82cd29 100644 --- a/specification/postgresqlhsc/resource-manager/readme.java.md +++ b/specification/postgresqlhsc/resource-manager/readme.java.md @@ -26,7 +26,7 @@ Please also specify `--azure-libraries-for-java-folder= Date: Mon, 7 Dec 2020 16:18:25 +0300 Subject: [PATCH 50/65] Run prettier --- .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index dc2d76fc1c6c..1369993ca46d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -2089,7 +2089,7 @@ "x-ms-enum": { "name": "CheckNameAvailabilityResourceType", "modelAsString": false - } + } } }, "required": [ From 790df580af2f8ea4c918fcf2703f3e488e23d453 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Mon, 7 Dec 2020 17:00:19 +0300 Subject: [PATCH 51/65] Add "fullyQualifiedDomainName" to server --- .../examples/ServerGroupGet.json | 20 +++++-- .../examples/ServerGroupList.json | 56 +++++++++++++++---- .../ServerGroupListByResourceGroup.json | 56 +++++++++++++++---- .../examples/ServerListByServerGroup.json | 3 + .../postgresqlhsc.json | 25 ++++++++- 5 files changed, 130 insertions(+), 30 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index e8b147792217..30093db01a74 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -50,7 +50,10 @@ "standbyCount": 1, "isPublicIpRequested": true, "serverNames": [ - "hsctestsg1-c" + { + "name": "hsctestsg1-c", + "fullyQualifiedDomainName": "hsctestsg1-c.postgres.database.azure.com" + } ] }, { @@ -63,9 +66,18 @@ "standbyCount": 0, "isPublicIpRequested": false, "serverNames": [ - "hsctestsg1-w0", - "hsctestsg1-w1", - "hsctestsg1-w2" + { + "name": "hsctestsg1-w0", + "fullyQualifiedDomainName": "hsctestsg1-w0.postgres.database.azure.com" + }, + { + "name": "hsctestsg1-w1", + "fullyQualifiedDomainName": "hsctestsg1-w1.postgres.database.azure.com" + }, + { + "name": "hsctestsg1-w2", + "fullyQualifiedDomainName": "hsctestsg1-w2.postgres.database.azure.com" + } ] } ] diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json index f2ce7c271733..d12976377545 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json @@ -49,7 +49,10 @@ "standbyCount": 1, "isPublicIpRequested": true, "serverNames": [ - "hsctestsg1-c" + { + "name": "hsctestsg1-c", + "fullyQualifiedDomainName": "hsctestsg1-c.postgres.database.azure.com" + } ] }, { @@ -62,9 +65,18 @@ "standbyCount": 0, "isPublicIpRequested": false, "serverNames": [ - "hsctestsg1-w0", - "hsctestsg1-w1", - "hsctestsg1-w2" + { + "name": "hsctestsg1-w0", + "fullyQualifiedDomainName": "hsctestsg1-w0.postgres.database.azure.com" + }, + { + "name": "hsctestsg1-w1", + "fullyQualifiedDomainName": "hsctestsg1-w1.postgres.database.azure.com" + }, + { + "name": "hsctestsg1-w2", + "fullyQualifiedDomainName": "hsctestsg1-w2.postgres.database.azure.com" + } ] } ] @@ -106,7 +118,10 @@ "standbyCount": 1, "isPublicIpRequested": true, "serverNames": [ - "hsctestsg2-c" + { + "name": "hsctestsg2-c", + "fullyQualifiedDomainName": "hsctestsg2-c.postgres.database.azure.com" + } ] }, { @@ -119,9 +134,14 @@ "standbyCount": 0, "isPublicIpRequested": false, "serverNames": [ - "hsctestsg2-w0", - "hsctestsg2-w1", - "hsctestsg2-w2" + { + "name": "hsctestsg2-w0", + "fullyQualifiedDomainName": "hsctestsg2-w0.postgres.database.azure.com" + }, + { + "name": "hsctestsg2-w1", + "fullyQualifiedDomainName": "hsctestsg2-w1.postgres.database.azure.com" + } ] } ] @@ -168,7 +188,10 @@ "standbyCount": 1, "isPublicIpRequested": true, "serverNames": [ - "hsctestsg3-c" + { + "name": "hsctestsg3-c", + "fullyQualifiedDomainName": "hsctestsg3-c.postgres.database.azure.com" + } ] }, { @@ -181,9 +204,18 @@ "standbyCount": 0, "isPublicIpRequested": false, "serverNames": [ - "hsctestsg3-w0", - "hsctestsg3-w1", - "hsctestsg3-w2" + { + "name": "hsctestsg3-w0", + "fullyQualifiedDomainName": "hsctestsg3-w0.postgres.database.azure.com" + }, + { + "name": "hsctestsg3-w1", + "fullyQualifiedDomainName": "hsctestsg3-w1.postgres.database.azure.com" + }, + { + "name": "hsctestsg3-w2", + "fullyQualifiedDomainName": "hsctestsg3-w2.postgres.database.azure.com" + } ] } ] diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json index 341f1bfaf77e..3fe514ef80d8 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json @@ -50,7 +50,10 @@ "standbyCount": 1, "isPublicIpRequested": true, "serverNames": [ - "hsctestsg1-c" + { + "name": "hsctestsg1-c", + "fullyQualifiedDomainName": "hsctestsg1-c.postgres.database.azure.com" + } ] }, { @@ -63,9 +66,18 @@ "standbyCount": 0, "isPublicIpRequested": false, "serverNames": [ - "hsctestsg1-w0", - "hsctestsg1-w1", - "hsctestsg1-w2" + { + "name": "hsctestsg1-w0", + "fullyQualifiedDomainName": "hsctestsg1-w0.postgres.database.azure.com" + }, + { + "name": "hsctestsg1-w1", + "fullyQualifiedDomainName": "hsctestsg1-w1.postgres.database.azure.com" + }, + { + "name": "hsctestsg1-w2", + "fullyQualifiedDomainName": "hsctestsg1-w2.postgres.database.azure.com" + } ] } ] @@ -107,7 +119,10 @@ "standbyCount": 1, "isPublicIpRequested": true, "serverNames": [ - "hsctestsg2-c" + { + "name": "hsctestsg2-c", + "fullyQualifiedDomainName": "hsctestsg2-c.postgres.database.azure.com" + } ] }, { @@ -120,9 +135,14 @@ "standbyCount": 0, "isPublicIpRequested": false, "serverNames": [ - "hsctestsg2-w0", - "hsctestsg2-w1", - "hsctestsg2-w2" + { + "name": "hsctestsg2-w0", + "fullyQualifiedDomainName": "hsctestsg2-w0.postgres.database.azure.com" + }, + { + "name": "hsctestsg2-w1", + "fullyQualifiedDomainName": "hsctestsg2-w1.postgres.database.azure.com" + } ] } ] @@ -169,7 +189,10 @@ "standbyCount": 1, "isPublicIpRequested": true, "serverNames": [ - "hsctestsg3-c" + { + "name": "hsctestsg3-c", + "fullyQualifiedDomainName": "hsctestsg3-c.postgres.database.azure.com" + } ] }, { @@ -182,9 +205,18 @@ "standbyCount": 0, "isPublicIpRequested": false, "serverNames": [ - "hsctestsg3-w0", - "hsctestsg3-w1", - "hsctestsg3-w2" + { + "name": "hsctestsg3-w0", + "fullyQualifiedDomainName": "hsctestsg3-w0.postgres.database.azure.com" + }, + { + "name": "hsctestsg3-w1", + "fullyQualifiedDomainName": "hsctestsg3-w1.postgres.database.azure.com" + }, + { + "name": "hsctestsg3-w2", + "fullyQualifiedDomainName": "hsctestsg3-w2.postgres.database.azure.com" + } ] } ] diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json index b20daa93246e..927f3a27fbf8 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json @@ -22,6 +22,7 @@ "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" }, "properties": { + "fullyQualifiedDomainName": "hsctestsg1-c.postgres.database.azure.com", "administratorLogin": "string", "version": "12", "role": "Coordinator", @@ -47,6 +48,7 @@ "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" }, "properties": { + "fullyQualifiedDomainName": "hsctestsg1-w0.postgres.database.azure.com", "administratorLogin": "string", "version": "12", "role": "Worker", @@ -72,6 +74,7 @@ "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" }, "properties": { + "fullyQualifiedDomainName": "hsctestsg1-w1.postgres.database.azure.com", "administratorLogin": "string", "version": "12", "role": "Worker", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 1369993ca46d..e48ee9dc2f1f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1275,6 +1275,11 @@ "modelAsString": true } }, + "FullyQualifiedDomainName": { + "type": "string", + "description": "The fully qualified domain name of a server.", + "readOnly": true + }, "ServerProperties": { "description": "The properties of a server.", "properties": { @@ -1349,14 +1354,26 @@ "type": "array", "description": "The list of server names in the server role group.", "items": { - "type": "string" + "$ref": "#/definitions/ServerNameItem" }, "readOnly": true, - "minItems": 1, "uniqueItems": true } } }, + "ServerNameItem": { + "description": "The name object for a server.", + "properties": { + "name": { + "type": "string", + "description": "The name of a server." + }, + "fullyQualifiedDomainName": { + "$ref": "#/definitions/FullyQualifiedDomainName", + "description": "The fully qualified domain name of a server." + } + } + }, "ServerGroupServerProperties": { "description": "The properties of a server in server group.", "allOf": [ @@ -1365,6 +1382,10 @@ } ], "properties": { + "fullyQualifiedDomainName": { + "$ref": "#/definitions/FullyQualifiedDomainName", + "description": "The fully qualified domain name of a server." + }, "role": { "$ref": "#/definitions/ServerRole", "description": "The role of server in the server group." From ccd798e15bbaf8d7472c16ba9f4ea84f96b576b7 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Tue, 8 Dec 2020 16:19:26 +0300 Subject: [PATCH 52/65] Remove update from createMode --- .../examples/ServerGroupAddNode.json | 1 - .../examples/ServerGroupScaleCompute.json | 1 - .../examples/ServerGroupScaleStorage.json | 1 - ...pdatePatch.json => ServerGroupUpdate.json} | 1 - .../examples/ServerGroupUpdatePut.json | 77 ---------------- .../postgresqlhsc.json | 92 +++++++++---------- .../resource-manager/readme.cli.md | 1 - 7 files changed, 45 insertions(+), 129 deletions(-) rename specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/{ServerGroupUpdatePatch.json => ServerGroupUpdate.json} (98%) delete mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json index c604175610a6..4a44d0a9dff3 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupAddNode.json @@ -7,7 +7,6 @@ "parameters": { "location": "westus", "properties": { - "createMode": "Update", "serverRoleGroups": [ { "name": "", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json index ca233ae425d1..1b6308aeae07 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleCompute.json @@ -7,7 +7,6 @@ "parameters": { "location": "westus", "properties": { - "createMode": "Update", "serverRoleGroups": [ { "name": "", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json index 7bd0e56c29ec..d57f10c2e040 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupScaleStorage.json @@ -7,7 +7,6 @@ "parameters": { "location": "westus", "properties": { - "createMode": "Update", "serverRoleGroups": [ { "name": "", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdate.json similarity index 98% rename from specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json rename to specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdate.json index 247586ad2d85..510e0345e192 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePatch.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdate.json @@ -6,7 +6,6 @@ "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { - "createMode": "Update", "version": "12", "administratorLoginPassword": "secret", "backupRetentionDays": 30, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json deleted file mode 100644 index 5ee60da4c7f4..000000000000 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdatePut.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parameters": { - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "resourceGroupName": "TestGroup", - "serverGroupName": "hsctestsg", - "api-version": "2020-10-05-privatepreview", - "parameters": { - "location": "westus", - "properties": { - "createMode": "Update", - "version": "12", - "administratorLoginPassword": "secret", - "backupRetentionDays": 30, - "serverRoleGroups": [ - { - "name": "", - "role": "Coordinator", - "serverCount": 1, - "serverEdition": "GeneralPurpose", - "vCores": 4, - "storageQuotaInMb": 524288, - "standbyCount": 1 - }, - { - "name": "", - "role": "Worker", - "serverCount": 3, - "serverEdition": "MemoryOptimized", - "vCores": 4, - "storageQuotaInMb": 524288, - "standbyCount": 0 - } - ] - }, - "tags": { - "ElasticServer": "1" - } - } - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", - "name": "hsctestsg", - "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - }, - "properties": {}, - "location": "westus2" - } - }, - "201": { - "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", - "name": "hsctestsg", - "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - }, - "properties": {}, - "location": "westus2" - } - }, - "202": {} - } -} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index e48ee9dc2f1f..6ee59ab65451 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -129,9 +129,6 @@ }, "Create a new server group as a point in time restore": { "$ref": "./examples/ServerGroupCreatePITR.json" - }, - "Update the server group with PUT": { - "$ref": "./examples/ServerGroupUpdatePut.json" } }, "parameters": [ @@ -273,8 +270,8 @@ "operationId": "ServerGroups_Update", "x-ms-long-running-operation": true, "x-ms-examples": { - "Update the server group with PATCH": { - "$ref": "./examples/ServerGroupUpdatePatch.json" + "Update the server group": { + "$ref": "./examples/ServerGroupUpdate.json" }, "Scale compute": { "$ref": "./examples/ServerGroupScaleCompute.json" @@ -304,7 +301,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ServerGroupForPatch" + "$ref": "#/definitions/ServerGroupForUpdate" }, "description": "The parameters for updating a server group." } @@ -1439,7 +1436,7 @@ } } }, - "ServerGroupForPatch": { + "ServerGroupForUpdate": { "description": "Represents a server group for update.", "properties": { "location": { @@ -1460,6 +1457,46 @@ } } }, + "ServerGroupPropertiesForUpdate": { + "description": "The properties used to update a server group.", + "properties": { + "administratorLogin": { + "type": "string", + "description": "The administrator's login name of servers in server group. Can only be specified when the server is being created (and is required for creation)." + }, + "administratorLoginPassword": { + "type": "string", + "format": "password", + "x-ms-secret": true, + "x-ms-mutability": [ + "create", + "update" + ], + "description": "The password of the administrator login." + }, + "backupRetentionDays": { + "type": "integer", + "format": "int32", + "description": "Backup retention days for the server group." + }, + "version": { + "$ref": "#/definitions/ServerVersion", + "description": "The version of a server." + }, + "citusVersion": { + "$ref": "#/definitions/CitusVersion", + "description": "The citus version of a server." + }, + "serverRoleGroups": { + "$ref": "#/definitions/ServerRoleGroupList", + "description": "The list of server role groups." + }, + "vnetInjArgs": { + "$ref": "#/definitions/VnetInjArgs", + "description": "The vnet injection arguments for server group." + } + } + }, "ServerGroup": { "description": "Represents a server group for create.", "allOf": [ @@ -1474,7 +1511,7 @@ }, "properties": { "$ref": "#/definitions/ServerGroupProperties", - "x-ms-client-flatten": true, + "x-ms-client-flatten": false, "description": "Properties of the server group create." } } @@ -1563,7 +1600,6 @@ "description": "The mode to create a new server group.", "enum": [ "Default", - "Update", "PointInTimeRestore" ], "x-ms-enum": { @@ -1635,44 +1671,6 @@ "serverRoleGroups" ] }, - "ServerGroupPropertiesForUpdate": { - "x-ms-discriminator-value": "Update", - "description": "The properties used to update a server group.", - "allOf": [ - { - "$ref": "#/definitions/ServerGroupProperties" - } - ], - "properties": { - "administratorLoginPassword": { - "type": "string", - "format": "password", - "x-ms-secret": true, - "x-ms-mutability": [ - "create", - "update" - ], - "description": "The password of the administrator login." - }, - "backupRetentionDays": { - "type": "integer", - "format": "int32", - "description": "Backup retention days for the server group." - }, - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "The version of a server." - }, - "citusVersion": { - "$ref": "#/definitions/CitusVersion", - "description": "The citus version of a server." - }, - "serverRoleGroups": { - "$ref": "#/definitions/ServerRoleGroupList", - "description": "The list of server role groups." - } - } - }, "ServerGroupPropertiesForRestore": { "x-ms-discriminator-value": "PointInTimeRestore", "description": "The properties used to create a new server group by restoring from a backup.", diff --git a/specification/postgresqlhsc/resource-manager/readme.cli.md b/specification/postgresqlhsc/resource-manager/readme.cli.md index dd6730a33b97..cb05cb4ba5cc 100644 --- a/specification/postgresqlhsc/resource-manager/readme.cli.md +++ b/specification/postgresqlhsc/resource-manager/readme.cli.md @@ -13,7 +13,6 @@ cli: - name: Update the server group - name: Get the server group - name: Delete the server group - - name: Update the server group - name: Scale compute - name: Scale storage - name: Add new worker nodes From be62866e55d0b04da9b794f82684e984a503b03d Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Wed, 9 Dec 2020 10:59:32 +0300 Subject: [PATCH 53/65] Remove createMode discriminator --- .../examples/ServerGroupCreate.json | 1 - .../postgresqlhsc.json | 245 ++++++------------ 2 files changed, 78 insertions(+), 168 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index 7d69a23aa23c..0693f0e0b55f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -7,7 +7,6 @@ "parameters": { "location": "westus", "properties": { - "createMode": "Default", "administratorLogin": "cloudsa", "administratorLoginPassword": "password", "backupRetentionDays": 35, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 6ee59ab65451..1312f5c18f0b 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1444,7 +1444,7 @@ "description": "The location the resource resides in." }, "properties": { - "$ref": "#/definitions/ServerGroupPropertiesForUpdate", + "$ref": "#/definitions/ServerGroupProperties", "x-ms-client-flatten": true, "description": "Properties of the server group." }, @@ -1457,45 +1457,23 @@ } } }, - "ServerGroupPropertiesForUpdate": { - "description": "The properties used to update a server group.", + "ServerGroupListResult": { + "type": "object", "properties": { - "administratorLogin": { - "type": "string", - "description": "The administrator's login name of servers in server group. Can only be specified when the server is being created (and is required for creation)." + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ServerGroup" + }, + "description": "The list of server groups" }, - "administratorLoginPassword": { + "nextLink": { + "description": "The link used to get the next page of operations.", "type": "string", - "format": "password", - "x-ms-secret": true, - "x-ms-mutability": [ - "create", - "update" - ], - "description": "The password of the administrator login." - }, - "backupRetentionDays": { - "type": "integer", - "format": "int32", - "description": "Backup retention days for the server group." - }, - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "The version of a server." - }, - "citusVersion": { - "$ref": "#/definitions/CitusVersion", - "description": "The citus version of a server." - }, - "serverRoleGroups": { - "$ref": "#/definitions/ServerRoleGroupList", - "description": "The list of server role groups." - }, - "vnetInjArgs": { - "$ref": "#/definitions/VnetInjArgs", - "description": "The vnet injection arguments for server group." + "readOnly": true } - } + }, + "description": "A list of server groups." }, "ServerGroup": { "description": "Represents a server group for create.", @@ -1511,38 +1489,46 @@ }, "properties": { "$ref": "#/definitions/ServerGroupProperties", - "x-ms-client-flatten": false, + "x-ms-client-flatten": true, "description": "Properties of the server group create." } } }, - "ServerGroupListResult": { - "type": "object", + "ServerGroupProperties": { + "description": "The properties used to create a new server group.", "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/ServerGroup" + "createMode": { + "type": "string", + "description": "The mode to create a new server group.", + "enum": [ + "Default", + "PointInTimeRestore" + ], + "x-ms-enum": { + "name": "CreateMode", + "modelAsString": true }, - "description": "The list of server groups" + "x-ms-mutability": [ + "create" + ] }, - "nextLink": { - "description": "The link used to get the next page of operations.", - "type": "string", - "readOnly": true - } - }, - "description": "A list of server groups." - }, - "ServerGroupProperties": { - "discriminator": "createMode", - "required": [ - "createMode" - ], - "properties": { "administratorLogin": { "type": "string", - "description": "The administrator's login name of servers in server group. Can only be specified when the server is being created (and is required for creation)." + "description": "The administrator's login name of servers in server group. Can only be specified when the server is being created (and is required for creation).", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "administratorLoginPassword": { + "type": "string", + "x-ms-secret": true, + "format": "password", + "x-ms-mutability": [ + "create", + "update" + ], + "description": "The password of the administrator login." }, "backupRetentionDays": { "type": "integer", @@ -1559,11 +1545,19 @@ }, "isMx": { "type": "boolean", - "description": "If zfs is enabled or not for the server group." + "description": "If zfs is enabled or not for the server group.", + "x-ms-mutability": [ + "create", + "read" + ] }, "isZfs": { "type": "boolean", - "description": "If zfs is enabled or not for the server group." + "description": "If zfs is enabled or not for the server group.", + "x-ms-mutability": [ + "create", + "read" + ] }, "state": { "$ref": "#/definitions/ServerState", @@ -1585,137 +1579,54 @@ "x-ms-enum": { "name": "ResourceProviderType", "modelAsString": true - } - }, - "vnetInjArgs": { - "$ref": "#/definitions/VnetInjArgs", - "description": "The vnet injection arguments for server group." + }, + "readOnly": true }, "serverRoleGroups": { "$ref": "#/definitions/ServerRoleGroupList", "description": "The list of server role groups." }, - "createMode": { - "type": "string", - "description": "The mode to create a new server group.", - "enum": [ - "Default", - "PointInTimeRestore" - ], - "x-ms-enum": { - "name": "CreateMode", - "modelAsString": true - } - } - }, - "description": "The properties used to create a new server group." - }, - "ServerGroupPropertiesForDefault": { - "x-ms-discriminator-value": "Default", - "description": "The properties used to create a new server group.", - "allOf": [ - { - "$ref": "#/definitions/ServerGroupProperties" - } - ], - "properties": { - "administratorLogin": { - "type": "string", - "description": "The administrator's login name of servers in server group. Can only be specified when the server is being created (and is required for creation)." - }, - "administratorLoginPassword": { - "type": "string", - "x-ms-secret": true, - "format": "password", - "x-ms-mutability": [ - "create", - "update" - ], - "description": "The password of the administrator login." - }, - "backupRetentionDays": { - "type": "integer", - "format": "int32", - "description": "Backup retention days for the server group." - }, - "isMx": { - "type": "boolean", - "description": "If zfs is enabled or not for the server group." - }, - "isZfs": { - "type": "boolean", - "description": "If zfs is enabled or not for the server group." - }, - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "The version of a server." - }, - "citusVersion": { - "$ref": "#/definitions/CitusVersion", - "description": "The citus version of a server." - }, "vnetInjArgs": { "$ref": "#/definitions/VnetInjArgs", "description": "The vnet injection arguments for server group." }, - "serverRoleGroups": { - "$ref": "#/definitions/ServerRoleGroupList", - "description": "The list of server role groups." - } - }, - "required": [ - "administratorLogin", - "administratorLoginPassword", - "backupRetentionDays", - "version", - "serverRoleGroups" - ] - }, - "ServerGroupPropertiesForRestore": { - "x-ms-discriminator-value": "PointInTimeRestore", - "description": "The properties used to create a new server group by restoring from a backup.", - "allOf": [ - { - "$ref": "#/definitions/ServerGroupProperties" - } - ], - "properties": { "sourceSubscriptionId": { "type": "string", - "description": "The source subscription id to restore from." + "description": "The source subscription id to restore from. It's required when 'createMode' is 'PointInTimeRestore'", + "x-ms-mutability": [ + "create" + ] }, "sourceResourceGroupName": { "type": "string", - "description": "The source resource group name to restore from." + "description": "The source resource group name to restore from. It's required when 'createMode' is 'PointInTimeRestore'", + "x-ms-mutability": [ + "create" + ] }, "sourceServerGroupName": { "type": "string", - "description": "The source server group name to restore from." + "description": "The source server group name to restore from. It's required when 'createMode' is 'PointInTimeRestore'", + "x-ms-mutability": [ + "create" + ] }, "sourceLocation": { "type": "string", - "description": "The source server group location to restore from." + "description": "The source server group location to restore from. It's required when 'createMode' is 'PointInTimeRestore'", + "x-ms-mutability": [ + "create" + ] }, "pointInTimeUTC": { "type": "string", "format": "date-time", - "description": "Restore point creation time (ISO8601 format), specifying the time to restore from." - }, - "isMx": { - "type": "boolean", - "description": "If zfs is enabled or not for the server group." - }, - "isZfs": { - "type": "boolean", - "description": "If zfs is enabled or not for the server group." + "description": "Restore point creation time (ISO8601 format), specifying the time to restore from. It's required when 'createMode' is 'PointInTimeRestore'", + "x-ms-mutability": [ + "create" + ] } - }, - "required": [ - "sourceSubscriptionId", - "sourceResourceGroupName", - "sourceServerGroupName", - "pointInTimeUTC" - ] + } }, "ServerGroupConfiguration": { "description": "Represents the configuration list of server role groups in a server group.", From 340bd46c617b2285b66ab366d941834c9d1c3a83 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Wed, 9 Dec 2020 11:03:59 +0300 Subject: [PATCH 54/65] Update ServerGet example --- .../2020-10-05-privatepreview/examples/ServerGet.json | 3 ++- .../examples/ServerListByServerGroup.json | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json index 04cfae5e3b08..cff9fd09cecd 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json @@ -21,7 +21,8 @@ "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" }, "properties": { - "administratorLogin": "string", + "fullyQualifiedDomainName": "hsctestsg1-c.postgres.database.azure.com", + "administratorLogin": "citus", "version": "12", "role": "Coordinator", "serverEdition": "MemoryOptimized", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json index 927f3a27fbf8..5af3555beb82 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json @@ -23,7 +23,7 @@ }, "properties": { "fullyQualifiedDomainName": "hsctestsg1-c.postgres.database.azure.com", - "administratorLogin": "string", + "administratorLogin": "citus", "version": "12", "role": "Coordinator", "serverEdition": "MemoryOptimized", @@ -49,7 +49,7 @@ }, "properties": { "fullyQualifiedDomainName": "hsctestsg1-w0.postgres.database.azure.com", - "administratorLogin": "string", + "administratorLogin": "citus", "version": "12", "role": "Worker", "serverEdition": "MemoryOptimized", @@ -75,7 +75,7 @@ }, "properties": { "fullyQualifiedDomainName": "hsctestsg1-w1.postgres.database.azure.com", - "administratorLogin": "string", + "administratorLogin": "citus", "version": "12", "role": "Worker", "serverEdition": "MemoryOptimized", From 02eaa9a6ff8baa01ed8a4fb1c7b1609158c2ff30 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Wed, 9 Dec 2020 11:08:42 +0300 Subject: [PATCH 55/65] Add citusVersion to ServerGroupServer --- .../preview/2020-10-05-privatepreview/examples/ServerGet.json | 1 + .../examples/ServerListByServerGroup.json | 3 +++ .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json index cff9fd09cecd..c8a844a22c49 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json @@ -24,6 +24,7 @@ "fullyQualifiedDomainName": "hsctestsg1-c.postgres.database.azure.com", "administratorLogin": "citus", "version": "12", + "citusVersion": "9.5", "role": "Coordinator", "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json index 5af3555beb82..ee1754a8df26 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json @@ -25,6 +25,7 @@ "fullyQualifiedDomainName": "hsctestsg1-c.postgres.database.azure.com", "administratorLogin": "citus", "version": "12", + "citusVersion": "9.5", "role": "Coordinator", "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, @@ -51,6 +52,7 @@ "fullyQualifiedDomainName": "hsctestsg1-w0.postgres.database.azure.com", "administratorLogin": "citus", "version": "12", + "citusVersion": "9.5", "role": "Worker", "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, @@ -77,6 +79,7 @@ "fullyQualifiedDomainName": "hsctestsg1-w1.postgres.database.azure.com", "administratorLogin": "citus", "version": "12", + "citusVersion": "9.5", "role": "Worker", "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 1312f5c18f0b..9e8052d1c125 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1402,6 +1402,10 @@ "version": { "$ref": "#/definitions/ServerVersion", "description": "The version of a server." + }, + "citusVersion": { + "$ref": "#/definitions/CitusVersion", + "description": "The citus version of servers." } } }, From 21e0adadc0955ae6b3fee1f5dafc3b7cd25bc60d Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Wed, 9 Dec 2020 11:13:57 +0300 Subject: [PATCH 56/65] Update descriptions for zfs and mx --- .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 9e8052d1c125..ddc59b43334c 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1549,7 +1549,7 @@ }, "isMx": { "type": "boolean", - "description": "If zfs is enabled or not for the server group.", + "description": "If Citus MX is enabled or not for the server group.", "x-ms-mutability": [ "create", "read" @@ -1557,7 +1557,7 @@ }, "isZfs": { "type": "boolean", - "description": "If zfs is enabled or not for the server group.", + "description": "If ZFS compression is enabled or not for the server group.", "x-ms-mutability": [ "create", "read" From c480d24bdecd4d21777485a6cafe54e6312d6c56 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Wed, 9 Dec 2020 11:49:03 +0300 Subject: [PATCH 57/65] Separate server group update properties --- .../postgresqlhsc.json | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index ddc59b43334c..c2f35839dd40 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1448,7 +1448,7 @@ "description": "The location the resource resides in." }, "properties": { - "$ref": "#/definitions/ServerGroupProperties", + "$ref": "#/definitions/ServerGroupPropertiesForUpdate", "x-ms-client-flatten": true, "description": "Properties of the server group." }, @@ -1461,6 +1461,38 @@ } } }, + "ServerGroupPropertiesForUpdate": { + "description": "The properties used to update a server group.", + "properties": { + "administratorLoginPassword": { + "type": "string", + "x-ms-secret": true, + "format": "password", + "x-ms-mutability": [ + "create", + "update" + ], + "description": "The password of the administrator login." + }, + "backupRetentionDays": { + "type": "integer", + "format": "int32", + "description": "The backup retention days for server group." + }, + "version": { + "$ref": "#/definitions/ServerVersion", + "description": "The version of servers." + }, + "citusVersion": { + "$ref": "#/definitions/CitusVersion", + "description": "The citus version of servers." + }, + "serverRoleGroups": { + "$ref": "#/definitions/ServerRoleGroupList", + "description": "The list of server role groups." + } + } + }, "ServerGroupListResult": { "type": "object", "properties": { From d3feec9ce04fa10cf88c6cf0176877f8223cfa70 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Wed, 9 Dec 2020 12:21:23 +0300 Subject: [PATCH 58/65] Add MMW to server group --- .../examples/ServerGroupGet.json | 6 +++ .../ServerGroupUpdateMaintenanceWindow.json | 38 +++++++++++++++++++ .../postgresqlhsc.json | 36 ++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdateMaintenanceWindow.json diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index 30093db01a74..c2723ca4e937 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -39,6 +39,12 @@ "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", "delegatedVnetName": "test-vnet" }, + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + }, "serverRoleGroups": [ { "name": "", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdateMaintenanceWindow.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdateMaintenanceWindow.json new file mode 100644 index 000000000000..b576fe4b4bd3 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdateMaintenanceWindow.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverGroupName": "hsctestsg", + "api-version": "2020-10-05-privatepreview", + "parameters": { + "properties": { + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 8, + "startMinute": 0, + "customWindow": "Enabled" + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg", + "name": "hsctestsg", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + }, + "properties": {}, + "location": "westus2" + } + }, + "202": {} + } +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index c2f35839dd40..ebb1d9d16628 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -281,6 +281,9 @@ }, "Add new worker nodes": { "$ref": "./examples/ServerGroupAddNode.json" + }, + "Update customer maintenance window": { + "$ref": "./examples/ServerGroupUpdateMaintenanceWindow.json" } }, "parameters": [ @@ -1490,6 +1493,10 @@ "serverRoleGroups": { "$ref": "#/definitions/ServerRoleGroupList", "description": "The list of server role groups." + }, + "maintenanceWindow": { + "$ref": "#/definitions/MaintenanceWindow", + "description": "Maintenance window of a server group." } } }, @@ -1622,6 +1629,10 @@ "$ref": "#/definitions/ServerRoleGroupList", "description": "The list of server role groups." }, + "maintenanceWindow": { + "$ref": "#/definitions/MaintenanceWindow", + "description": "Maintenance window of a server group." + }, "vnetInjArgs": { "$ref": "#/definitions/VnetInjArgs", "description": "The vnet injection arguments for server group." @@ -1664,6 +1675,31 @@ } } }, + "MaintenanceWindow": { + "type": "object", + "description": "Maintenance window of a server group.", + "properties": { + "customWindow": { + "type": "string", + "description": "indicates whether custom window is enabled or disabled" + }, + "startHour": { + "type": "integer", + "format": "int32", + "description": "start hour for maintenance window" + }, + "startMinute": { + "type": "integer", + "format": "int32", + "description": "start minute for maintenance window" + }, + "dayOfWeek": { + "type": "integer", + "format": "int32", + "description": "day of week for maintenance window" + } + } + }, "ServerGroupConfiguration": { "description": "Represents the configuration list of server role groups in a server group.", "allOf": [ From a17a05e9e1c8b83068308be63e226a68db22c721 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Wed, 9 Dec 2020 14:39:20 +0300 Subject: [PATCH 59/65] Update sdk READMEs for namespaces --- .../resource-manager/readme.az.md | 2 - .../resource-manager/readme.cli.md | 1 + .../resource-manager/readme.csharp.md | 5 +- .../resource-manager/readme.go.md | 2 +- .../resource-manager/readme.java.md | 2 +- .../postgresqlhsc/resource-manager/readme.md | 21 +++------ .../resource-manager/readme.python.md | 47 +++++++++++++++---- .../resource-manager/readme.ruby.md | 6 +-- 8 files changed, 54 insertions(+), 32 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/readme.az.md b/specification/postgresqlhsc/resource-manager/readme.az.md index c0d84f0e1d75..3f2a25ab92e2 100644 --- a/specification/postgresqlhsc/resource-manager/readme.az.md +++ b/specification/postgresqlhsc/resource-manager/readme.az.md @@ -9,6 +9,4 @@ az: package-name: azure-mgmt-postgresqlhsc az-output-folder: $(azure-cli-extension-folder)/src/postgresqlhsc python-sdk-output-folder: "$(az-output-folder)/azext_postgresqlhsc/vendored_sdks/postgresqlhsc" -# add additinal configuration here specific for Azure CLI -# refer to the faq.md for more details ``` \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/readme.cli.md b/specification/postgresqlhsc/resource-manager/readme.cli.md index cb05cb4ba5cc..cbcc3187142b 100644 --- a/specification/postgresqlhsc/resource-manager/readme.cli.md +++ b/specification/postgresqlhsc/resource-manager/readme.cli.md @@ -16,6 +16,7 @@ cli: - name: Scale compute - name: Scale storage - name: Add new worker nodes + - name: Update customer maintenance window - name: List servers of the server group - name: Get the server of server group - name: List configurations of the server that in the server group diff --git a/specification/postgresqlhsc/resource-manager/readme.csharp.md b/specification/postgresqlhsc/resource-manager/readme.csharp.md index 8f007dcb8894..c5e4b8d1948b 100644 --- a/specification/postgresqlhsc/resource-manager/readme.csharp.md +++ b/specification/postgresqlhsc/resource-manager/readme.csharp.md @@ -9,7 +9,6 @@ csharp: license-header: MICROSOFT_MIT_NO_VERSION payload-flattening-threshold: 1 clear-output-folder: true - client-side-validation: false - namespace: Microsoft.DBforPostgreSQL - output-folder: $(csharp-sdks-folder)/postgresqlhsc/management/Microsoft.DBforPostgreSQL/GeneratedProtocol + namespace: Microsoft.DBforPostgreSQLHSC + output-folder: $(csharp-sdks-folder)/postgresqlhsc/management/Microsoft.DBforPostgreSQLHSC/GeneratedProtocol ``` diff --git a/specification/postgresqlhsc/resource-manager/readme.go.md b/specification/postgresqlhsc/resource-manager/readme.go.md index cdac0abc5180..9fc6abf4a296 100644 --- a/specification/postgresqlhsc/resource-manager/readme.go.md +++ b/specification/postgresqlhsc/resource-manager/readme.go.md @@ -5,6 +5,7 @@ These settings apply only when `--go` is specified on the command line. ``` yaml $(go) go: license-header: MICROSOFT_APACHE_NO_VERSION + namespace: postgresqlhsc clear-output-folder: true ``` @@ -21,6 +22,5 @@ These settings apply only when `--tag=package-2020-10-05-privatepreview --go` is Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2020-10-05-privatepreview' && $(go) -namespace: postgresqlhsc output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-10-05-privatepreview/$(namespace) ``` \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/readme.java.md b/specification/postgresqlhsc/resource-manager/readme.java.md index d0311f82cd29..385f5789d20d 100644 --- a/specification/postgresqlhsc/resource-manager/readme.java.md +++ b/specification/postgresqlhsc/resource-manager/readme.java.md @@ -26,7 +26,7 @@ Please also specify `--azure-libraries-for-java-folder= see https://aka.ms/autorest -This is the AutoRest configuration file for postgresqlhsc. +This is the AutoRest configuration file for PostgreSQL Hyperscale. ## Getting Started @@ -22,9 +22,10 @@ For other options on installation see [Installing AutoRest](https://aka.ms/autor ### Basic Information -These are the global settings for the postgresqlhsc. +These are the global settings for the PostgreSQL Hyperscale API. ```yaml +title: Microsoft PostgreSQL Hyperscale openapi-type: arm tag: package-2020-10-05-privatepreview ``` @@ -51,6 +52,7 @@ This is not used by Autorest itself. swagger-to-sdk: - repo: azure-sdk-for-net - repo: azure-sdk-for-python + - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-js @@ -58,24 +60,15 @@ swagger-to-sdk: - repo: azure-sdk-for-ruby after_scripts: - bundle install && rake arm:regen_all_profiles['azure_mgmt_postgresqlhsc'] + - repo: azure-cli-extensions - repo: azure-resource-manager-schemas after_scripts: - node sdkauto_afterscript.js postgresqlhsc/resource-manager ``` -### C# +## C# -These settings apply only when `--csharp` is specified on the command line. -Please also specify `--csharp-sdks-folder=`. - -``` yaml $(csharp) -csharp: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - namespace: Microsoft.Azure.Management.PostgreSQL - output-folder: $(csharp-sdks-folder)/postgresqlhsc/Microsoft.Azure.Management.PostgreSQL/src/postgresqlhsc/Generated - clear-output-folder: true -``` +See configuration in [readme.csharp.md](./readme.csharp.md) ## Go diff --git a/specification/postgresqlhsc/resource-manager/readme.python.md b/specification/postgresqlhsc/resource-manager/readme.python.md index edfb2657133a..17fb9703ec17 100644 --- a/specification/postgresqlhsc/resource-manager/readme.python.md +++ b/specification/postgresqlhsc/resource-manager/readme.python.md @@ -2,20 +2,51 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. +Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -```yaml $(python) +``` yaml !$(track2) python: azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION payload-flattening-threshold: 2 - namespace: Microsoft.DBforPostgreSQL - package-name: postgresqlhsc - package-version: 2020-10-05-privatepreview + package-name: azure-mgmt-rdbms clear-output-folder: true + no-namespace-folders: true ``` -```yaml $(python) -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/azure-mgmt/postgresqlhsc +These settings apply only when `--track2` is specified on the command line. + +``` yaml $(track2) +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +package-name: azure-mgmt-rdbms +no-namespace-folders: true +``` + +### Python multi-api + +Generate all API versions currently shipped for this package + +```yaml !$(track2) +batch: + - tag: package-2020-10-05-privatepreview ``` + +```yaml $(track2) +clear-output-folder: true +batch: + - tag: package-2020-10-05-privatepreview +``` + +### Tag: package-2020-10-05-privatepreview and python + +These settings apply only when `--tag=package-2020-10-05-privatepreview --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-10-05-privatepreview' && $(python) +namespace: azure.mgmt.rdbms.postgresqlhsc +output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresqlhsc +python: + namespace: azure.mgmt.rdbms.postgresqlhsc + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresqlhsc +``` \ No newline at end of file diff --git a/specification/postgresqlhsc/resource-manager/readme.ruby.md b/specification/postgresqlhsc/resource-manager/readme.ruby.md index 46a479bcb414..e2b0df6e4488 100644 --- a/specification/postgresqlhsc/resource-manager/readme.ruby.md +++ b/specification/postgresqlhsc/resource-manager/readme.ruby.md @@ -14,6 +14,6 @@ These settings apply only when `--tag=package-2020-10-05-privatepreview --ruby` Please also specify `--ruby-sdks-folder=`. ```yaml $(tag) == 'package-2020-10-05-privatepreview' && $(ruby) -namespace: Microsoft.DBforPostgreSQL -output-folder: $(ruby-sdks-folder)/postgresqlhsc -``` +namespace: "Azure::PostgreSQLHSC::Mgmt::V2020_10_05_privatepreview" +output-folder: $(ruby-sdks-folder)/management/azure_mgmt_postgresqlhsc/lib +``` \ No newline at end of file From 7e4e4743268abf3c398b327646a9c5a971c1edd1 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Wed, 9 Dec 2020 15:12:13 +0300 Subject: [PATCH 60/65] Refactor booleans with "enable..." prefix --- .../examples/ServerGet.json | 4 +-- .../examples/ServerGroupCreate.json | 10 +++--- .../examples/ServerGroupCreatePITR.json | 4 +-- .../examples/ServerGroupGet.json | 12 +++---- .../examples/ServerGroupList.json | 36 +++++++++---------- .../ServerGroupListByResourceGroup.json | 36 +++++++++---------- .../examples/ServerGroupUpdate.json | 4 +-- .../examples/ServerListByServerGroup.json | 12 +++---- .../postgresqlhsc.json | 15 ++++---- 9 files changed, 65 insertions(+), 68 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json index c8a844a22c49..400b0796be44 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json @@ -29,8 +29,8 @@ "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, "vCores": 4, - "standbyCount": 1, - "isPublicIpRequested": true, + "enableHa": true, + "enablePublicIp": true, "state": "Ready", "haState": "Healthy" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index 0693f0e0b55f..fa45f99efc3d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -7,7 +7,7 @@ "parameters": { "location": "westus", "properties": { - "administratorLogin": "cloudsa", + "administratorLogin": "citus", "administratorLoginPassword": "password", "backupRetentionDays": 35, "vnetInjArgs": { @@ -15,8 +15,8 @@ "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", "delegatedVnetName": "test-vnet" }, - "isMx": true, - "isZfs": false, + "enableMx": true, + "enableZfs": false, "version": "12", "citusVersion": "9.5", "serverRoleGroups": [ @@ -27,7 +27,7 @@ "serverEdition": "GeneralPurpose", "vCores": 4, "storageQuotaInMb": 524288, - "standbyCount": 1 + "enableHa": true }, { "name": "", @@ -36,7 +36,7 @@ "serverEdition": "MemoryOptimized", "vCores": 4, "storageQuotaInMb": 524288, - "standbyCount": 0 + "enableHa": false } ] }, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json index fe8dd3db7ca7..4c5f783b395a 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreatePITR.json @@ -13,8 +13,8 @@ "sourceSubscriptionId": "dddddddd-dddd-dddd-dddd-dddddddddddd", "sourceResourceGroupName": "SourceGroup", "sourceServerGroupName": "pgtests-source-server-group", - "isMx": true, - "isZfs": false + "enableMx": true, + "enableZfs": false } } }, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index c2723ca4e937..9daa221dffe4 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -29,8 +29,8 @@ "administratorLogin": "citus", "version": "12", "citusVersion": "9.5", - "isMx": true, - "isZfs": false, + "enableMx": true, + "enableZfs": false, "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", @@ -53,8 +53,8 @@ "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, "vCores": 4, - "standbyCount": 1, - "isPublicIpRequested": true, + "enableHa": true, + "enablePublicIp": true, "serverNames": [ { "name": "hsctestsg1-c", @@ -69,8 +69,8 @@ "serverEdition": "GeneralPurpose", "storageQuotaInMb": 10000, "vCores": 8, - "standbyCount": 0, - "isPublicIpRequested": false, + "enableHa": false, + "enablePublicIp": false, "serverNames": [ { "name": "hsctestsg1-w0", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json index d12976377545..555f9e47dc7c 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json @@ -28,8 +28,8 @@ "administratorLogin": "citus", "version": "12", "citusVersion": "9.5", - "isMx": true, - "isZfs": false, + "enableMx": true, + "enableZfs": false, "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", @@ -46,8 +46,8 @@ "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, "vCores": 4, - "standbyCount": 1, - "isPublicIpRequested": true, + "enableHa": true, + "enablePublicIp": true, "serverNames": [ { "name": "hsctestsg1-c", @@ -62,8 +62,8 @@ "serverEdition": "GeneralPurpose", "storageQuotaInMb": 10000, "vCores": 8, - "standbyCount": 0, - "isPublicIpRequested": false, + "enableHa": false, + "enablePublicIp": false, "serverNames": [ { "name": "hsctestsg1-w0", @@ -102,8 +102,8 @@ "administratorLogin": "citus", "version": "12", "citusVersion": "9.5", - "isMx": true, - "isZfs": false, + "enableMx": true, + "enableZfs": false, "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", @@ -115,8 +115,8 @@ "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, "vCores": 8, - "standbyCount": 1, - "isPublicIpRequested": true, + "enableHa": true, + "enablePublicIp": true, "serverNames": [ { "name": "hsctestsg2-c", @@ -131,8 +131,8 @@ "serverEdition": "GeneralPurpose", "storageQuotaInMb": 10000, "vCores": 4, - "standbyCount": 0, - "isPublicIpRequested": false, + "enableHa": false, + "enablePublicIp": false, "serverNames": [ { "name": "hsctestsg2-w0", @@ -167,8 +167,8 @@ "administratorLogin": "citus", "version": "12", "citusVersion": "9.5", - "isMx": true, - "isZfs": false, + "enableMx": true, + "enableZfs": false, "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", @@ -185,8 +185,8 @@ "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, "vCores": 4, - "standbyCount": 1, - "isPublicIpRequested": true, + "enableHa": true, + "enablePublicIp": true, "serverNames": [ { "name": "hsctestsg3-c", @@ -201,8 +201,8 @@ "serverEdition": "GeneralPurpose", "storageQuotaInMb": 10000, "vCores": 8, - "standbyCount": 0, - "isPublicIpRequested": false, + "enableHa": false, + "enablePublicIp": false, "serverNames": [ { "name": "hsctestsg3-w0", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json index 3fe514ef80d8..5fcf292516af 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json @@ -29,8 +29,8 @@ "administratorLogin": "citus", "version": "12", "citusVersion": "9.5", - "isMx": true, - "isZfs": false, + "enableMx": true, + "enableZfs": false, "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", @@ -47,8 +47,8 @@ "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, "vCores": 4, - "standbyCount": 1, - "isPublicIpRequested": true, + "enableHa": true, + "enablePublicIp": true, "serverNames": [ { "name": "hsctestsg1-c", @@ -63,8 +63,8 @@ "serverEdition": "GeneralPurpose", "storageQuotaInMb": 10000, "vCores": 8, - "standbyCount": 0, - "isPublicIpRequested": false, + "enableHa": false, + "enablePublicIp": false, "serverNames": [ { "name": "hsctestsg1-w0", @@ -103,8 +103,8 @@ "administratorLogin": "citus", "version": "12", "citusVersion": "9.5", - "isMx": true, - "isZfs": false, + "enableMx": true, + "enableZfs": false, "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", @@ -116,8 +116,8 @@ "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, "vCores": 8, - "standbyCount": 1, - "isPublicIpRequested": true, + "enableHa": true, + "enablePublicIp": true, "serverNames": [ { "name": "hsctestsg2-c", @@ -132,8 +132,8 @@ "serverEdition": "GeneralPurpose", "storageQuotaInMb": 10000, "vCores": 4, - "standbyCount": 0, - "isPublicIpRequested": false, + "enableHa": false, + "enablePublicIp": false, "serverNames": [ { "name": "hsctestsg2-w0", @@ -168,8 +168,8 @@ "administratorLogin": "citus", "version": "12", "citusVersion": "9.5", - "isMx": true, - "isZfs": false, + "enableMx": true, + "enableZfs": false, "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", @@ -186,8 +186,8 @@ "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, "vCores": 4, - "standbyCount": 1, - "isPublicIpRequested": true, + "enableHa": true, + "enablePublicIp": true, "serverNames": [ { "name": "hsctestsg3-c", @@ -202,8 +202,8 @@ "serverEdition": "GeneralPurpose", "storageQuotaInMb": 10000, "vCores": 8, - "standbyCount": 0, - "isPublicIpRequested": false, + "enableHa": false, + "enablePublicIp": false, "serverNames": [ { "name": "hsctestsg3-w0", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdate.json index 510e0345e192..9858cfca76f0 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdate.json @@ -17,7 +17,7 @@ "serverEdition": "GeneralPurpose", "vCores": 8, "storageQuotaInMb": 1048576, - "standbyCount": 0 + "enableHa": false }, { "name": "", @@ -26,7 +26,7 @@ "serverEdition": "MemoryOptimized", "vCores": 4, "storageQuotaInMb": 524288, - "standbyCount": 1 + "enableHa": true } ] }, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json index ee1754a8df26..21ba9bac8059 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json @@ -30,8 +30,8 @@ "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, "vCores": 4, - "standbyCount": 1, - "isPublicIpRequested": true, + "enableHa": true, + "enablePublicIp": true, "state": "Ready", "haState": "Healthy" } @@ -57,8 +57,8 @@ "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, "vCores": 4, - "standbyCount": 0, - "isPublicIpRequested": false, + "enableHa": false, + "enablePublicIp": false, "state": "Ready", "haState": "NotEnabled" } @@ -84,8 +84,8 @@ "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, "vCores": 4, - "standbyCount": 0, - "isPublicIpRequested": false, + "enableHa": false, + "enablePublicIp": false, "state": "Ready", "haState": "NotEnabled" } diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index ebb1d9d16628..baca128e32f8 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1305,14 +1305,11 @@ "format": "int64", "description": "The vCores count of a server (max: 64)." }, - "standbyCount": { - "type": "integer", - "format": "int32", - "description": "The standby count of a server.", - "minimum": 0, - "maximum": 1 + "enableHa": { + "type": "boolean", + "description": "If high availability is enabled or not for the server." }, - "isPublicIpRequested": { + "enablePublicIp": { "type": "boolean", "description": "If public IP is requested or not for a server.", "readOnly": true @@ -1586,7 +1583,7 @@ "$ref": "#/definitions/CitusVersion", "description": "The citus version of servers." }, - "isMx": { + "enableMx": { "type": "boolean", "description": "If Citus MX is enabled or not for the server group.", "x-ms-mutability": [ @@ -1594,7 +1591,7 @@ "read" ] }, - "isZfs": { + "enableZfs": { "type": "boolean", "description": "If ZFS compression is enabled or not for the server group.", "x-ms-mutability": [ From e885345def1bc7cb91cd801be54892a073628163 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Wed, 9 Dec 2020 15:30:54 +0300 Subject: [PATCH 61/65] Rename version with postgresqlVersion --- .../examples/ServerGet.json | 2 +- .../examples/ServerGroupCreate.json | 2 +- .../examples/ServerGroupGet.json | 2 +- .../examples/ServerGroupList.json | 6 ++-- .../ServerGroupListByResourceGroup.json | 6 ++-- .../examples/ServerGroupUpdate.json | 2 +- .../examples/ServerListByServerGroup.json | 6 ++-- .../postgresqlhsc.json | 34 +++++++++---------- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json index 400b0796be44..7c5d1e7c2080 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json @@ -23,7 +23,7 @@ "properties": { "fullyQualifiedDomainName": "hsctestsg1-c.postgres.database.azure.com", "administratorLogin": "citus", - "version": "12", + "postgresqlVersion": "12", "citusVersion": "9.5", "role": "Coordinator", "serverEdition": "MemoryOptimized", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index fa45f99efc3d..54bd7f2c08f4 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -17,7 +17,7 @@ }, "enableMx": true, "enableZfs": false, - "version": "12", + "postgresqlVersion": "12", "citusVersion": "9.5", "serverRoleGroups": [ { diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index 9daa221dffe4..7830665df94b 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -27,7 +27,7 @@ }, "properties": { "administratorLogin": "citus", - "version": "12", + "postgresqlVersion": "12", "citusVersion": "9.5", "enableMx": true, "enableZfs": false, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json index 555f9e47dc7c..8bf0cb4e916c 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json @@ -26,7 +26,7 @@ }, "properties": { "administratorLogin": "citus", - "version": "12", + "postgresqlVersion": "12", "citusVersion": "9.5", "enableMx": true, "enableZfs": false, @@ -100,7 +100,7 @@ }, "properties": { "administratorLogin": "citus", - "version": "12", + "postgresqlVersion": "12", "citusVersion": "9.5", "enableMx": true, "enableZfs": false, @@ -165,7 +165,7 @@ }, "properties": { "administratorLogin": "citus", - "version": "12", + "postgresqlVersion": "12", "citusVersion": "9.5", "enableMx": true, "enableZfs": false, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json index 5fcf292516af..d3882b42aa0d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json @@ -27,7 +27,7 @@ }, "properties": { "administratorLogin": "citus", - "version": "12", + "postgresqlVersion": "12", "citusVersion": "9.5", "enableMx": true, "enableZfs": false, @@ -101,7 +101,7 @@ }, "properties": { "administratorLogin": "citus", - "version": "12", + "postgresqlVersion": "12", "citusVersion": "9.5", "enableMx": true, "enableZfs": false, @@ -166,7 +166,7 @@ }, "properties": { "administratorLogin": "citus", - "version": "12", + "postgresqlVersion": "12", "citusVersion": "9.5", "enableMx": true, "enableZfs": false, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdate.json index 9858cfca76f0..691b78bec5d9 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupUpdate.json @@ -6,7 +6,7 @@ "api-version": "2020-10-05-privatepreview", "parameters": { "properties": { - "version": "12", + "postgresqlVersion": "12", "administratorLoginPassword": "secret", "backupRetentionDays": 30, "serverRoleGroups": [ diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json index 21ba9bac8059..26e379600114 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json @@ -24,7 +24,7 @@ "properties": { "fullyQualifiedDomainName": "hsctestsg1-c.postgres.database.azure.com", "administratorLogin": "citus", - "version": "12", + "postgresqlVersion": "12", "citusVersion": "9.5", "role": "Coordinator", "serverEdition": "MemoryOptimized", @@ -51,7 +51,7 @@ "properties": { "fullyQualifiedDomainName": "hsctestsg1-w0.postgres.database.azure.com", "administratorLogin": "citus", - "version": "12", + "postgresqlVersion": "12", "citusVersion": "9.5", "role": "Worker", "serverEdition": "MemoryOptimized", @@ -78,7 +78,7 @@ "properties": { "fullyQualifiedDomainName": "hsctestsg1-w1.postgres.database.azure.com", "administratorLogin": "citus", - "version": "12", + "postgresqlVersion": "12", "citusVersion": "9.5", "role": "Worker", "serverEdition": "MemoryOptimized", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index baca128e32f8..814e6ed4e366 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1179,21 +1179,21 @@ } }, "definitions": { - "ServerVersion": { + "PostgreSQLVersion": { "type": "string", - "description": "The version of a server.", + "description": "The PostgreSQL version.", "enum": [ "11", "12" ], "x-ms-enum": { - "name": "ServerVersion", + "name": "PostgreSQLVersion", "modelAsString": true } }, "CitusVersion": { "type": "string", - "description": "The citus version of a server.", + "description": "The Citus version.", "enum": [ "8.3", "9.0", @@ -1204,7 +1204,7 @@ "9.5" ], "x-ms-enum": { - "name": "ServerCitusVersion", + "name": "CitusVersion", "modelAsString": true } }, @@ -1399,13 +1399,13 @@ "type": "string", "description": "The administrator's login name of a servers in server group." }, - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "The version of a server." + "postgresqlVersion": { + "$ref": "#/definitions/PostgreSQLVersion", + "description": "The PostgreSQL version of server." }, "citusVersion": { "$ref": "#/definitions/CitusVersion", - "description": "The citus version of servers." + "description": "The Citus version of server." } } }, @@ -1479,13 +1479,13 @@ "format": "int32", "description": "The backup retention days for server group." }, - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "The version of servers." + "postgresqlVersion": { + "$ref": "#/definitions/PostgreSQLVersion", + "description": "The PostgreSQL version of server group." }, "citusVersion": { "$ref": "#/definitions/CitusVersion", - "description": "The citus version of servers." + "description": "The Citus version of server group." }, "serverRoleGroups": { "$ref": "#/definitions/ServerRoleGroupList", @@ -1575,13 +1575,13 @@ "format": "int32", "description": "The backup retention days for server group." }, - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "The version of servers." + "postgresqlVersion": { + "$ref": "#/definitions/PostgreSQLVersion", + "description": "The PostgreSQL version of server group." }, "citusVersion": { "$ref": "#/definitions/CitusVersion", - "description": "The citus version of servers." + "description": "The Citus version of server group." }, "enableMx": { "type": "boolean", From b03603e4a574f2c913133d1bfc0a311a28cdf430 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Wed, 9 Dec 2020 15:41:14 +0300 Subject: [PATCH 62/65] Change vnetInjArgs to delegatedSubnetArguments --- .../examples/ServerGroupCreate.json | 6 ++-- .../examples/ServerGroupGet.json | 6 ++-- .../examples/ServerGroupList.json | 12 +++----- .../ServerGroupListByResourceGroup.json | 12 +++----- .../postgresqlhsc.json | 29 +++++-------------- 5 files changed, 20 insertions(+), 45 deletions(-) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index 54bd7f2c08f4..41ee0d19801e 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -10,10 +10,8 @@ "administratorLogin": "citus", "administratorLoginPassword": "password", "backupRetentionDays": 35, - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, "enableMx": true, "enableZfs": false, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index 7830665df94b..57fe5c50a23f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -34,10 +34,8 @@ "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, "maintenanceWindow": { "dayOfWeek": 0, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json index 8bf0cb4e916c..066c4f2100cb 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json @@ -33,10 +33,8 @@ "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, "serverRoleGroups": [ { @@ -172,10 +170,8 @@ "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, "serverRoleGroups": [ { diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json index d3882b42aa0d..620589950d24 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json @@ -34,10 +34,8 @@ "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, "serverRoleGroups": [ { @@ -173,10 +171,8 @@ "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, "serverRoleGroups": [ { diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 814e6ed4e366..ab988f59ec68 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1208,24 +1208,6 @@ "modelAsString": true } }, - "VnetInjArgs": { - "type": "object", - "description": "The vnet injection arguments for server group.", - "properties": { - "delegatedVnetID": { - "type": "string", - "description": "delegated vNet ID" - }, - "delegatedSubnetName": { - "type": "string", - "description": "delegated subnet name" - }, - "delegatedVnetName": { - "type": "string", - "description": "delegated vNet name" - } - } - }, "ServerState": { "type": "string", "description": "A state of a server group/server that is visible to user.", @@ -1630,9 +1612,14 @@ "$ref": "#/definitions/MaintenanceWindow", "description": "Maintenance window of a server group." }, - "vnetInjArgs": { - "$ref": "#/definitions/VnetInjArgs", - "description": "The vnet injection arguments for server group." + "delegatedSubnetArguments": { + "description": "The delegated subnet arguments for a server group.", + "properties": { + "subnetArmResourceId": { + "type": "string", + "description": "delegated subnet arm resource id." + } + } }, "sourceSubscriptionId": { "type": "string", From 9abf088c2517e5eff61f7c7800a49e43d5f76ab0 Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Wed, 9 Dec 2020 15:58:52 +0300 Subject: [PATCH 63/65] Add enableShardsOnCoordinator to server group --- .../preview/2020-10-05-privatepreview/postgresqlhsc.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index ab988f59ec68..2638b8ee00f8 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1469,6 +1469,10 @@ "$ref": "#/definitions/CitusVersion", "description": "The Citus version of server group." }, + "enableShardsOnCoordinator": { + "type": "boolean", + "description": "If shards on coordinator is enabled or not for the server group." + }, "serverRoleGroups": { "$ref": "#/definitions/ServerRoleGroupList", "description": "The list of server role groups." @@ -1581,6 +1585,10 @@ "read" ] }, + "enableShardsOnCoordinator": { + "type": "boolean", + "description": "If shards on coordinator is enabled or not for the server group." + }, "state": { "$ref": "#/definitions/ServerState", "description": "A state of a server group that is visible to user." From 8e8ebc159c8c25ac9ecde386770c5ec1439bf41d Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Thu, 10 Dec 2020 13:24:56 +0300 Subject: [PATCH 64/65] Add availability zone to server group and server group server --- .../examples/ServerGet.json | 2 ++ .../examples/ServerGroupCreate.json | 1 + .../examples/ServerGroupGet.json | 2 ++ .../examples/ServerGroupList.json | 6 +++++ .../ServerGroupListByResourceGroup.json | 6 +++++ .../examples/ServerListByServerGroup.json | 4 ++++ .../postgresqlhsc.json | 24 +++++++++++++++++++ 7 files changed, 45 insertions(+) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json index 7c5d1e7c2080..2ef5eea9c482 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGet.json @@ -25,6 +25,8 @@ "administratorLogin": "citus", "postgresqlVersion": "12", "citusVersion": "9.5", + "availabilityZone": "1", + "standbyAvailabilityZone": "2", "role": "Coordinator", "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index 41ee0d19801e..ba88eeec5f17 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -17,6 +17,7 @@ "enableZfs": false, "postgresqlVersion": "12", "citusVersion": "9.5", + "availabilityZone": "1", "serverRoleGroups": [ { "name": "", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json index 57fe5c50a23f..6610abb0f22f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json @@ -34,6 +34,8 @@ "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", + "availabilityZone": "1", + "standbyAvailabilityZone": "2", "delegatedSubnetArguments": { "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json index 066c4f2100cb..10a9e65f6d9d 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json @@ -33,6 +33,8 @@ "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", + "availabilityZone": "1", + "standbyAvailabilityZone": "2", "delegatedSubnetArguments": { "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, @@ -105,6 +107,8 @@ "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", + "availabilityZone": "1", + "standbyAvailabilityZone": "2", "serverRoleGroups": [ { "name": "", @@ -170,6 +174,8 @@ "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", + "availabilityZone": "1", + "standbyAvailabilityZone": "2", "delegatedSubnetArguments": { "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json index 620589950d24..52b61ab7b156 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json @@ -34,6 +34,8 @@ "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", + "availabilityZone": "1", + "standbyAvailabilityZone": "2", "delegatedSubnetArguments": { "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, @@ -106,6 +108,8 @@ "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", + "availabilityZone": "1", + "standbyAvailabilityZone": "2", "serverRoleGroups": [ { "name": "", @@ -171,6 +175,8 @@ "state": "Ready", "earliestRestoreTime": "2020-09-14T00:00:37.467Z", "resourceProviderType": "Meru", + "availabilityZone": "1", + "standbyAvailabilityZone": "2", "delegatedSubnetArguments": { "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json index 26e379600114..626b0169eaa7 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json @@ -26,6 +26,8 @@ "administratorLogin": "citus", "postgresqlVersion": "12", "citusVersion": "9.5", + "availabilityZone": "1", + "standbyAvailabilityZone": "2", "role": "Coordinator", "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, @@ -53,6 +55,7 @@ "administratorLogin": "citus", "postgresqlVersion": "12", "citusVersion": "9.5", + "availabilityZone": "1", "role": "Worker", "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, @@ -80,6 +83,7 @@ "administratorLogin": "citus", "postgresqlVersion": "12", "citusVersion": "9.5", + "availabilityZone": "1", "role": "Worker", "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json index 2638b8ee00f8..41aeaeeafc66 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json @@ -1388,6 +1388,14 @@ "citusVersion": { "$ref": "#/definitions/CitusVersion", "description": "The Citus version of server." + }, + "availabilityZone": { + "type": "string", + "description": "Availability Zone information of the server group." + }, + "standbyAvailabilityZone": { + "type": "string", + "description": "Standby Availability Zone information of the server group." } } }, @@ -1480,6 +1488,14 @@ "maintenanceWindow": { "$ref": "#/definitions/MaintenanceWindow", "description": "Maintenance window of a server group." + }, + "availabilityZone": { + "type": "string", + "description": "Availability Zone information of the server group." + }, + "standbyAvailabilityZone": { + "type": "string", + "description": "Standby Availability Zone information of the server group." } } }, @@ -1620,6 +1636,14 @@ "$ref": "#/definitions/MaintenanceWindow", "description": "Maintenance window of a server group." }, + "availabilityZone": { + "type": "string", + "description": "Availability Zone information of the server group." + }, + "standbyAvailabilityZone": { + "type": "string", + "description": "Standby Availability Zone information of the server group." + }, "delegatedSubnetArguments": { "description": "The delegated subnet arguments for a server group.", "properties": { From 2813ab030b76eb52366d15af4e3b1d13a63896ec Mon Sep 17 00:00:00 2001 From: Enes Cakir Date: Thu, 10 Dec 2020 14:00:39 +0300 Subject: [PATCH 65/65] Add standbyAvailabilityZone to examples --- .../2020-10-05-privatepreview/examples/ServerGroupCreate.json | 1 + .../examples/ServerListByServerGroup.json | 2 ++ 2 files changed, 3 insertions(+) diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json index ba88eeec5f17..4f6861b94d77 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json @@ -18,6 +18,7 @@ "postgresqlVersion": "12", "citusVersion": "9.5", "availabilityZone": "1", + "standbyAvailabilityZone": "2", "serverRoleGroups": [ { "name": "", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json index 626b0169eaa7..1ec9d60845ac 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerListByServerGroup.json @@ -56,6 +56,7 @@ "postgresqlVersion": "12", "citusVersion": "9.5", "availabilityZone": "1", + "standbyAvailabilityZone": "", "role": "Worker", "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000, @@ -84,6 +85,7 @@ "postgresqlVersion": "12", "citusVersion": "9.5", "availabilityZone": "1", + "standbyAvailabilityZone": "", "role": "Worker", "serverEdition": "MemoryOptimized", "storageQuotaInMb": 10000,