diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ConfigurationUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ConfigurationUpdate.json new file mode 100644 index 000000000000..7853c92ea534 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ConfigurationUpdate.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "serverName": "testserver", + "configurationName": "event_scheduler", + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "value": "on", + "source": "user-override" + } + } + }, + "responses": { + "200": { + "body": { + "properties": { + "value": "ON", + "description": "Indicates the status of the Event Scheduler.", + "defaultValue": "OFF", + "dataType": "Enumeration", + "allowedValues": "ON,OFF,DISABLED", + "source": "user-override" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/testserver/configurations/event_scheduler", + "name": "event_scheduler", + "type": "Microsoft.DBforPostgreSQL/flexibleServers/configurations" + } + }, + "202": {} + } +} diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreate.json index 3c3908a9039a..ebb30c443b02 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreate.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreate.json @@ -8,7 +8,6 @@ "location": "westus", "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -19,12 +18,14 @@ "vnetInjArgs": { "delegatedSubnetName": "test-subnet", "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "delegatedVnetName": "test-vnet", + "delegatedVnetResourceGroup": "test-vnet-rg" }, "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "tags": { "ElasticServer": "1" @@ -36,7 +37,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -56,7 +56,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { @@ -71,7 +72,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -91,7 +91,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreatePointInTimeRestore.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreatePointInTimeRestore.json index 37fbec167d04..a1218b930091 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreatePointInTimeRestore.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreatePointInTimeRestore.json @@ -18,7 +18,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -34,7 +33,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { @@ -49,7 +49,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -65,7 +64,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGet.json index fdb65ca0219c..90c6c3275d72 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGet.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGet.json @@ -10,7 +10,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -24,7 +23,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGetWithVnet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGetWithVnet.json index 639fb674d91a..bfb6f8603d5e 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGetWithVnet.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGetWithVnet.json @@ -10,7 +10,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -24,12 +23,14 @@ "vnetInjArgs": { "delegatedSubnetName": "test-subnet", "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "delegatedVnetName": "test-vnet", + "delegatedVnetResourceGroup": "test-vnet-rg" }, "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerList.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerList.json index c45b4e7331f2..494a116c5baa 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerList.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerList.json @@ -11,7 +11,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -25,7 +24,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { @@ -38,7 +38,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -52,7 +51,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "2" }, "location": "westus", "tags": { @@ -65,7 +65,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -79,7 +78,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "3" }, "location": "westus", "tags": { @@ -92,7 +92,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -106,7 +105,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerListByResourceGroup.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerListByResourceGroup.json index eb147eed2fbf..f2861579356f 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerListByResourceGroup.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerListByResourceGroup.json @@ -12,7 +12,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -26,7 +25,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "1" }, "location": "westus", "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc1", @@ -36,7 +36,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -50,7 +49,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "2" }, "location": "westus", "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/pgtestsvc2", @@ -60,7 +60,6 @@ { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -74,7 +73,8 @@ "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 - } + }, + "availabilityZone": "3" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdate.json index 9340c6e76e9b..9be524337d1a 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdate.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdate.json @@ -8,7 +8,6 @@ "location": "westus", "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -25,7 +24,6 @@ "body": { "sku": { "tier": "GeneralPurpose", - "capacity": 4, "name": "Standard_D4s_v3" }, "properties": { @@ -40,7 +38,8 @@ "storageMB": 524288, "backupRetentionDays": 20 }, - "vnetInjArgs": {} + "vnetInjArgs": {}, + "availabilityZone": "1" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 8d350737eb01..047b068c01e8 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json @@ -39,7 +39,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Create", + "operationId": "Servers_Create", "x-ms-examples": { "Create a new server": { "$ref": "./examples/ServerCreate.json" @@ -101,7 +101,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Update", + "operationId": "Servers_Update", "x-ms-examples": { "ServerUpdate": { "$ref": "./examples/ServerUpdate.json" @@ -154,7 +154,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Delete", + "operationId": "Servers_Delete", "x-ms-examples": { "ServerDelete": { "$ref": "./examples/ServerDelete.json" @@ -198,7 +198,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Get", + "operationId": "Servers_Get", "x-ms-examples": { "ServerGet": { "$ref": "./examples/ServerGet.json" @@ -243,7 +243,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_ListByResourceGroup", + "operationId": "Servers_ListByResourceGroup", "x-ms-examples": { "ServerListByResourceGroup": { "$ref": "./examples/ServerListByResourceGroup.json" @@ -285,7 +285,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_List", + "operationId": "Servers_List", "x-ms-examples": { "ServerList": { "$ref": "./examples/ServerList.json" @@ -324,7 +324,7 @@ "tags": [ "ServerRestart" ], - "operationId": "FlexibleServers_Restart", + "operationId": "Servers_Restart", "x-ms-examples": { "ServerRestart": { "$ref": "./examples/ServerRestart.json" @@ -367,7 +367,7 @@ "tags": [ "ServerStart" ], - "operationId": "FlexibleServers_Start", + "operationId": "Servers_Start", "x-ms-examples": { "ServerStart": { "$ref": "./examples/ServerStart.json" @@ -410,7 +410,7 @@ "tags": [ "ServerStop" ], - "operationId": "FlexibleServers_Stop", + "operationId": "Servers_Stop", "x-ms-examples": { "ServerStop": { "$ref": "./examples/ServerStop.json" @@ -453,7 +453,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_CreateOrUpdate", + "operationId": "FirewallRules_CreateOrUpdate", "x-ms-examples": { "FirewallRuleCreate": { "$ref": "./examples/FirewallRuleCreate.json" @@ -562,7 +562,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_Get", + "operationId": "FirewallRules_Get", "x-ms-examples": { "FirewallRuleList": { "$ref": "./examples/FirewallRuleGet.json" @@ -607,7 +607,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_ListByServer", + "operationId": "FirewallRules_ListByServer", "x-ms-examples": { "FirewallRuleList": { "$ref": "./examples/FirewallRuleListByServer.json" @@ -652,7 +652,7 @@ "tags": [ "Configurations" ], - "operationId": "FlexibleServersConfigurations_ListByServer", + "operationId": "Configurations_ListByServer", "x-ms-examples": { "ConfigurationList": { "$ref": "./examples/ConfigurationListByServer.json" @@ -697,7 +697,7 @@ "tags": [ "Configurations" ], - "operationId": "FlexibleServersConfigurations_Get", + "operationId": "Configurations_Get", "x-ms-examples": { "ConfigurationGet": { "$ref": "./examples/ConfigurationGet.json" @@ -735,6 +735,62 @@ } } } + }, + "patch": { + "tags": [ + "Configurations" + ], + "operationId": "Configurations_Update", + "x-ms-examples": { + "Update a user configuration": { + "$ref": "./examples/ConfigurationUpdate.json" + } + }, + "description": "Updates a configuration of a server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/ConfigurationNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Configuration" + }, + "description": "The required parameters for updating a server configuration." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Configuration" + } + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/maintenanceWindows/{maintenanceWindowName}": { @@ -742,7 +798,7 @@ "tags": [ "CustomerMaintenanceWindow" ], - "operationId": "FlexibleServersCustomerMaintenanceWindow_CreateOrUpdate", + "operationId": "CustomerMaintenanceWindow_CreateOrUpdate", "x-ms-examples": { "CustomerMaintenanceWindowCreate": { "$ref": "./examples/CustomerMaintenanceWindowCreate.json" @@ -804,7 +860,7 @@ "tags": [ "CustomerMaintenanceWindow" ], - "operationId": "FlexibleServersCustomerMaintenanceWindow_Delete", + "operationId": "CustomerMaintenanceWindow_Delete", "x-ms-examples": { "CustomerMaintenanceWindowDelete": { "$ref": "./examples/CustomerMaintenanceWindowDelete.json" @@ -851,7 +907,7 @@ "tags": [ "CustomerMaintenanceWindow" ], - "operationId": "FlexibleServersCustomerMaintenanceWindow_Get", + "operationId": "CustomerMaintenanceWindow_Get", "x-ms-examples": { "CustomerMaintenanceWindowGet": { "$ref": "./examples/CustomerMaintenanceWindowGet.json" @@ -896,13 +952,13 @@ "tags": [ "CustomerMaintenanceWindow" ], - "operationId": "FlexibleServersCustomerMaintenanceWindow_ListByServer", + "operationId": "CustomerMaintenanceWindow_ListByServer", "x-ms-examples": { "CustomerMaintenanceWindowList": { "$ref": "./examples/CustomerMaintenanceWindowListByServer.json" } }, - "description": "List all the Customer Maintenance Windows in a given PostgreSQL server.", + "description": "List all the Customer Maintenance Windows in a given PostgreSQL flexible server.", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -938,7 +994,7 @@ "tags": [ "CheckNameAvailability" ], - "operationId": "FlexibleServersCheckNameAvailability_Execute", + "operationId": "CheckNameAvailability_Execute", "x-ms-examples": { "NameAvailability": { "$ref": "./examples/CheckNameAvailability.json" @@ -1122,6 +1178,10 @@ "format": "date-time", "description": "Restore point creation time (ISO8601 format), specifying the time to restore from." }, + "availabilityZone": { + "type": "string", + "description": "availability Zone information of the server." + }, "vnetInjArgs": { "properties": { "delegatedVnetID": { @@ -1135,6 +1195,10 @@ "delegatedVnetName": { "type": "string", "description": "delegated vNet name" + }, + "delegatedVnetResourceGroup": { + "type": "string", + "description": "delegated vNet resource group name" } } }, @@ -1148,7 +1212,17 @@ "x-ms-enum": { "name": "CreateMode", "modelAsString": true - } + }, + "x-ms-mutability": [ + "create" + ] + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Application-specific metadata in the form of key-value pairs." } }, "description": "The properties of a server." @@ -1183,10 +1257,6 @@ "format": "password", "description": "The password of the administrator login." }, - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "PostgreSQL Server version." - }, "vCores": { "type": "integer", "format": "int32", @@ -1200,10 +1270,6 @@ "type": "integer", "format": "int32", "description": "stand by count value can be either 0 or 1" - }, - "serverEdition": { - "type": "string", - "description": "server edition default to general purpose" } } }, @@ -1240,7 +1306,7 @@ "items": { "$ref": "#/definitions/Server" }, - "description": "The list of servers" + "description": "The list of flexible servers" }, "nextLink": { "description": "The link used to get the next page of operations.", @@ -1282,12 +1348,6 @@ "name": "SkuTier", "modelAsString": true } - }, - "capacity": { - "type": "integer", - "format": "int32", - "minimum": 0, - "description": "The scale up/out capacity, representing server's compute units." } }, "description": "Sku information related properties of a server."