diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CapabilitiesByLocationList.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CapabilitiesByLocationList.json new file mode 100644 index 000000000000..0aa0dadf3265 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CapabilitiesByLocationList.json @@ -0,0 +1,180 @@ +{ + "parameters": { + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "locationName": "WestUS" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "zone": "none", + "supportedFlexibleServerEditions": [ + { + "name": "Burstable", + "supportedStorageEditions": [ + { + "name": "ManagedDisk", + "supportedStorageMB": [ + { + "name": "32768", + "supportedIops": 120, + "storageSizeMB": 32768 + }, + { + "name": "65536", + "supportedIops": 240, + "storageSizeMB": 65536 + }, + { + "name": "131072", + "supportedIops": 500, + "storageSizeMB": 131072 + } + ] + } + ], + "supportedServerVersions": [ + { + "name": "12", + "supportedVcores": [ + { + "name": "Standard_B1s", + "vCores": 1, + "supportedIops": 320, + "supportedMemoryPerVcoreMB": 1024 + }, + { + "name": "Standard_B1ms", + "vCores": 1, + "supportedIops": 640, + "supportedMemoryPerVcoreMB": 2048 + }, + { + "name": "Standard_B2s", + "vCores": 2, + "supportedIops": 1280, + "supportedMemoryPerVcoreMB": 2048 + } + ] + } + ] + } + ] + }, + { + "zone": "1", + "supportedFlexibleServerEditions": [ + { + "name": "Burstable", + "supportedStorageEditions": [ + { + "name": "ManagedDisk", + "supportedStorageMB": [ + { + "name": "32768", + "supportedIops": 120, + "storageSizeMB": 32768 + }, + { + "name": "65536", + "supportedIops": 240, + "storageSizeMB": 65536 + }, + { + "name": "131072", + "supportedIops": 500, + "storageSizeMB": 131072 + } + ] + } + ], + "supportedServerVersions": [ + { + "name": "12", + "supportedVcores": [ + { + "name": "Standard_B1s", + "vCores": 1, + "supportedIops": 320, + "supportedMemoryPerVcoreMB": 1024 + }, + { + "name": "Standard_B1ms", + "vCores": 1, + "supportedIops": 640, + "supportedMemoryPerVcoreMB": 2048 + }, + { + "name": "Standard_B2s", + "vCores": 2, + "supportedIops": 1280, + "supportedMemoryPerVcoreMB": 2048 + } + ] + } + ] + } + ] + }, + { + "zone": "2", + "supportedFlexibleServerEditions": [ + { + "name": "Burstable", + "supportedStorageEditions": [ + { + "name": "ManagedDisk", + "supportedStorageMB": [ + { + "name": "32768", + "supportedIops": 120, + "storageSizeMB": 32768 + }, + { + "name": "65536", + "supportedIops": 240, + "storageSizeMB": 65536 + }, + { + "name": "131072", + "supportedIops": 500, + "storageSizeMB": 131072 + } + ] + } + ], + "supportedServerVersions": [ + { + "name": "12", + "supportedVcores": [ + { + "name": "Standard_B1s", + "vCores": 1, + "supportedIops": 320, + "supportedMemoryPerVcoreMB": 1024 + }, + { + "name": "Standard_B1ms", + "vCores": 1, + "supportedIops": 640, + "supportedMemoryPerVcoreMB": 2048 + }, + { + "name": "Standard_B2s", + "vCores": 2, + "supportedIops": 1280, + "supportedMemoryPerVcoreMB": 2048 + } + ] + } + ] + } + ] + } + ] + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CheckVirtualNetworkSubnetUsage.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CheckVirtualNetworkSubnetUsage.json new file mode 100644 index 000000000000..2b82b6978e3a --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CheckVirtualNetworkSubnetUsage.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "locationName": "WestUS", + "parameters": { + "virtualNetworkArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/testvnet" + } + }, + "responses": { + "200": { + "body": { + "delegatedSubnetsUsage": [ + { + "subnetName": "test-subnet-1", + "usage": 2 + }, + { + "subnetName": "test-subnet-2", + "usage": 3 + } + ] + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowCreate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowCreate.json deleted file mode 100644 index 89163e0da956..000000000000 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowCreate.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "parameters": { - "maintenanceWindowName": "customerMaintenanceWindow", - "serverName": "testserver", - "resourceGroupName": "testrg", - "api-version": "2020-07-01-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "parameters": { - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - } - } - }, - "responses": { - "201": { - "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/testserver/maintenanceWindows/customerMaintenanceWindow", - "name": "customerMaintenanceWindow", - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - }, - "type": "Microsoft.DBforPostgreSQL/flexibleServers/maintenanceWindows" - } - }, - "200": { - "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/testserver/maintenanceWindows/customerMaintenanceWindow", - "name": "customerMaintenanceWindow", - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - }, - "type": "Microsoft.DBforPostgreSQL/flexibleServers/maintenanceWindows" - } - }, - "202": {} - } -} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowDelete.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowDelete.json deleted file mode 100644 index 02d91e35a6fc..000000000000 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "maintenanceWindowName": "customerMaintenanceWindow", - "serverName": "testserver", - "resourceGroupName": "TestGroup", - "api-version": "2020-07-01-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" - }, - "responses": { - "200": {}, - "202": {}, - "204": {} - } -} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowGet.json deleted file mode 100644 index ba086b9877e5..000000000000 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowGet.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parameters": { - "maintenanceWindowName": "customerMaintenanceWindow", - "serverName": "testserver", - "resourceGroupName": "testrg", - "api-version": "2020-07-01-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/testserver/maintenanceWindows/customerMaintenanceWindow", - "name": "customerMaintenanceWindow", - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - }, - "type": "Microsoft.DBforMySQL/flexibleServers/maintenanceWindows" - } - } - } -} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json index 26101224c4d2..e3d00e2641c6 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json @@ -28,7 +28,19 @@ "primaryServerId": "", "replicaCapacity": 5, "publicNetworkAccess": "Enabled", - "standbyCount": 0 + "haEnabled": "Enabled", + "haState": "Healthy", + "availabilityZone": "1", + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + }, + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" + } }, "location": "westus", "tags": { diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json index a2fc5d608772..cef210adedba 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json @@ -27,11 +27,9 @@ "primaryServerId": "", "replicaCapacity": 5, "publicNetworkAccess": "Enabled", - "standbyCount": 0, - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "haEnabled": "Disabled", + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" } }, "location": "westus", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdate.json index c042adec2a3d..5ce35b2dce59 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdate.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdate.json @@ -29,7 +29,18 @@ "sslEnforcement": "Disabled", "publicNetworkAccess": "Disabled", "state": "Ready", - "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com" + "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com", + "haEnabled": "Enabled", + "haState": "Healthy", + "availabilityZone": "1", + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + }, + "delegatedSubnetArguments": {} }, "location": "westus", "tags": { diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json new file mode 100644 index 000000000000..3ee6ab2d831d --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "serverName": "mysqltestsvc4", + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "maintenanceWindow": { + "customWindow": "Enabled", + "dayOfWeek": 0, + "startHour": 8, + "startMinute": 0 + } + } + } + }, + "responses": { + "200": { + "body": { + "sku": { + "name": "Standard_D12_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "backupRetentionDays": 7 + }, + "version": "5.7", + "sslEnforcement": "Disabled", + "publicNetworkAccess": "Disabled", + "state": "Ready", + "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com", + "haEnabled": "Disabled", + "haState": "NotEnabled", + "availabilityZone": "1", + "standByAvailabilityZone": null, + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 8, + "startMinute": 0, + "customWindow": "Enabled" + }, + "delegatedSubnetArguments": {} + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltestsvc4", + "name": "mysqltestsvc4", + "type": "Microsoft.DBforMySQL/flexibleServers" + } + }, + "202": {} + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json index 52e7d53cd3da..58e33652de5b 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json @@ -108,6 +108,9 @@ "x-ms-examples": { "Update a server": { "$ref": "./examples/ServerUpdate.json" + }, + "Update server customer maintenance window": { + "$ref": "./examples/ServerUpdateWithCustomerMaintenanceWindow.json" } }, "description": "Updates an existing server. The request body can contain one to many of the properties present in the normal server definition.", @@ -1040,127 +1043,18 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/maintenanceWindows/{maintenanceWindowName}": { - "put": { - "tags": [ - "MaintenanceWindows" - ], - "operationId": "MaintenanceWindows_CreateOrUpdate", - "x-ms-examples": { - "Create a maintenance window": { - "$ref": "./examples/MaintenanceWindowCreate.json" - } - }, - "description": "Creates a new maintenance window.", - "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/MaintenanceWindowNameParameter" - }, - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/MaintenanceWindow" - }, - "description": "The required parameters for creating or updating a customer maintenance window." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/MaintenanceWindow" - } - }, - "201": { - "description": "Created", - "schema": { - "$ref": "#/definitions/MaintenanceWindow" - } - }, - "202": { - "description": "Accepted" - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-long-running-operation": true - }, - "delete": { - "tags": [ - "MaintenanceWindows" - ], - "operationId": "MaintenanceWindows_Delete", - "x-ms-examples": { - "Delete a maintenance window": { - "$ref": "./examples/MaintenanceWindowDelete.json" - } - }, - "description": "Deletes a maintenance window.", - "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/MaintenanceWindowNameParameter" - } - ], - "responses": { - "200": { - "description": "OK" - }, - "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}/providers/Microsoft.DBForMySql/locations/{locationName}/capabilities": { "get": { "tags": [ - "MaintenanceWindows" + "LocationBasedCapabilities" ], - "operationId": "MaintenanceWindows_Get", + "operationId": "LocationBasedCapabilities_List", "x-ms-examples": { - "Get a maintenance window": { - "$ref": "./examples/MaintenanceWindowGet.json" + "CapabilitiesList": { + "$ref": "./examples/CapabilitiesByLocationList.json" } }, - "description": "Get the maintenance windows of a given server.", + "description": "Get capabilities at specified location in a given subscription.", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -1169,20 +1063,14 @@ "$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/MaintenanceWindowNameParameter" + "$ref": "#/parameters/LocationNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/MaintenanceWindow" + "$ref": "#/definitions/CapabilitiesListResult" } }, "default": { @@ -1191,21 +1079,24 @@ "$ref": "#/definitions/CloudError" } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/maintenanceWindows": { - "get": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForMySql/locations/{locationName}/checkVirtualNetworkSubnetUsage": { + "post": { "tags": [ - "MaintenanceWindows" + "CheckVirtualNetworkSubnetUsage" ], - "operationId": "MaintenanceWindows_ListByServer", + "operationId": "CheckVirtualNetworkSubnetUsage", "x-ms-examples": { - "List maintenance windows for a server": { - "$ref": "./examples/MaintenanceWindowsListByServer.json" + "CapabilitiesList": { + "$ref": "./examples/CheckVirtualNetworkSubnetUsage.json" } }, - "description": "List all the maintenance windows in a given server.", + "description": "Get virtual network subnet usage for a given vNet resource id.", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -1214,17 +1105,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "#/parameters/LocationNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/VirtualNetworkSubnetUsageParameter" + }, + "description": "The required parameters for creating or updating a server." } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/MaintenanceWindowListResult" + "$ref": "#/definitions/VirtualNetworkSubnetUsageResult" } }, "default": { @@ -1233,9 +1130,6 @@ "$ref": "#/definitions/CloudError" } } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" } } }, @@ -1244,7 +1138,7 @@ "tags": [ "CheckNameAvailability" ], - "operationId": "CheckNameAvailability_Execute", + "operationId": "CheckNameAvailability", "x-ms-examples": { "Check name availability": { "$ref": "./examples/CheckNameAvailability.json" @@ -1366,22 +1260,51 @@ "modelAsString": true } }, - "VnetInjArgs": { + "HaEnabled": { + "type": "string", + "description": "Whether or not HA is enabled for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "HaEnabledEnum", + "modelAsString": true + } + }, + "DelegatedSubnetArguments": { "properties": { - "delegatedVnetID": { + "subnetArmResourceId": { "type": "string", - "description": "delegated vNet ID" - }, - "delegatedSubnetName": { + "description": "delegated subnet arm resource id." + } + }, + "description": "Delegated subnet arguments of a server" + }, + "MaintenanceWindow": { + "type": "object", + "description": "Maintenance window of a server.", + "properties": { + "customWindow": { "type": "string", - "description": "delegated subnet name" + "description": "indicates whether custom window is enabled or disabled" }, - "delegatedVnetName": { - "type": "string", - "description": "delegated vNet name" + "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" } - }, - "description": "Vnet properties of a server" + } }, "StorageProfile": { "properties": { @@ -1435,6 +1358,10 @@ } } }, + "required": [ + "name", + "tier" + ], "description": "Billing information related properties of a server." }, "ServerProperties": { @@ -1507,10 +1434,9 @@ "modelAsString": true } }, - "standbyCount": { - "type": "integer", - "format": "int32", - "description": "stand by count value can be either 0 or 1" + "haEnabled": { + "$ref": "#/definitions/HaEnabled", + "description": "Enable HA or not for a server." }, "fullyQualifiedDomainName": { "type": "string", @@ -1545,6 +1471,10 @@ "$ref": "#/definitions/PublicNetworkAccess", "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'" }, + "maintenanceWindow": { + "$ref": "#/definitions/MaintenanceWindow", + "description": "Maintenance window of a server." + }, "sourceServerId": { "type": "string", "description": "The source MySQL server name to restore from.", @@ -1560,9 +1490,23 @@ "create" ] }, - "vnetInjArgs": { - "$ref": "#/definitions/VnetInjArgs", - "description": "Vnet arguments." + "availabilityZone": { + "type": "string", + "description": "availability Zone information of the server." + }, + "standByAvailabilityZone": { + "type": "string", + "description": "availability Zone information of the server.", + "readOnly": true + }, + "byokEnforcement": { + "type": "string", + "description": "Status showing whether the data encryption is enabled with customer-managed keys.", + "readOnly": true + }, + "delegatedSubnetArguments": { + "$ref": "#/definitions/DelegatedSubnetArguments", + "description": "Delegated subnet arguments." }, "createMode": { "type": "string", @@ -1629,19 +1573,22 @@ "$ref": "#/definitions/SslEnforcement", "description": "Enable ssl enforcement or not when connect to server." }, - "vnetInjArgs": { - "$ref": "#/definitions/VnetInjArgs", - "description": "Vnet arguments." + "delegatedSubnetArguments": { + "$ref": "#/definitions/DelegatedSubnetArguments", + "description": "Delegated subnet arguments." }, - "standbyCount": { - "type": "integer", - "format": "int32", - "description": "stand by count value can be either 0 or 1" + "haEnabled": { + "$ref": "#/definitions/HaEnabled", + "description": "Enable HA or not for a server." }, "publicNetworkAccess": { "$ref": "#/definitions/PublicNetworkAccess", "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'" }, + "maintenanceWindow": { + "$ref": "#/definitions/MaintenanceWindow", + "description": "Maintenance window of a server." + }, "replicationRole": { "type": "string", "description": "The replication role of the server." @@ -1890,70 +1837,192 @@ }, "description": "A list of server configurations." }, - "MaintenanceWindowProperties": { + "VirtualNetworkSubnetUsageParameter": { + "type": "object", "properties": { - "dayOfWeek": { + "virtualNetworkArmResourceId": { + "type": "string", + "description": "Virtual network resource id." + } + }, + "description": "Virtual network subnet usage parameter" + }, + "DelegatedSubnetUsage": { + "type": "object", + "properties": { + "subnetName": { + "type": "string", + "readOnly": true, + "description": "name of the subnet" + }, + "usage": { "type": "integer", - "format": "int32", - "description": "The day of week of the maintenance window to start" + "format": "int64", + "readOnly": true, + "description": "Number of used delegated subnets" + } + }, + "description": "Delegated subnet usage data." + }, + "VirtualNetworkSubnetUsageResult": { + "type": "object", + "properties": { + "delegatedSubnetsUsage": { + "type": "array", + "items": { + "$ref": "#/definitions/DelegatedSubnetUsage" + }, + "readOnly": true + } + }, + "description": "Virtual network subnet usage data." + }, + "StorageMBCapability": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "storage MB name", + "readOnly": true }, - "durationInMinutes": { + "supportedIops": { "type": "integer", - "format": "int32", - "description": "The duration of the maintenance window to run." + "format": "int64", + "description": "supported IOPS", + "readOnly": true }, - "startHour": { + "storageSizeMB": { "type": "integer", - "format": "int32", - "description": "The starting hour of the maintenance window." + "format": "int64", + "description": "storage size in MB", + "readOnly": true + } + }, + "description": "storage size in MB capability" + }, + "VcoreCapability": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "vCore name", + "readOnly": true }, - "startMinute": { + "vCores": { "type": "integer", - "format": "int32", - "description": "The starting minutes of the maintenance window." + "format": "int64", + "description": "supported vCores", + "readOnly": true + }, + "supportedIops": { + "type": "integer", + "format": "int64", + "description": "supported IOPS", + "readOnly": true + }, + "supportedMemoryPerVcoreMB": { + "type": "integer", + "format": "int64", + "description": "supported memory per vCore in MB", + "readOnly": true } }, - "required": [ - "dayOfWeek", - "startHour", - "startMinute" - ], - "description": "The properties of a server maintenance window." + "description": "Vcores capability" }, - "MaintenanceWindow": { + "ServerVersionCapability": { + "type": "object", "properties": { - "properties": { - "$ref": "#/definitions/MaintenanceWindowProperties", - "x-ms-client-flatten": true, - "description": "The properties of a customer maintenance window." + "name": { + "type": "string", + "description": "server version", + "readOnly": true + }, + "supportedVcores": { + "type": "array", + "items": { + "$ref": "#/definitions/VcoreCapability" + }, + "readOnly": true } }, - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + "description": "Server version capabilities." + }, + "StorageEditionCapability": { + "properties": { + "name": { + "type": "string", + "description": "storage edition name", + "readOnly": true + }, + "supportedStorageMB": { + "type": "array", + "items": { + "$ref": "#/definitions/StorageMBCapability" + }, + "readOnly": true } - ], - "required": [ - "properties" - ], - "description": "Represents a server maintenance window." + }, + "description": "storage edition capability" + }, + "ServerEditionCapability": { + "properties": { + "name": { + "type": "string", + "description": "Server edition name", + "readOnly": true + }, + "supportedStorageEditions": { + "type": "array", + "items": { + "$ref": "#/definitions/StorageEditionCapability" + }, + "readOnly": true + }, + "supportedServerVersions": { + "type": "array", + "items": { + "$ref": "#/definitions/ServerVersionCapability" + }, + "readOnly": true + } + }, + "description": "Server edition capabilities." }, - "MaintenanceWindowListResult": { + "CapabilityProperties": { + "properties": { + "zone": { + "type": "string", + "description": "zone name", + "readOnly": true + }, + "supportedFlexibleServerEditions": { + "type": "array", + "items": { + "$ref": "#/definitions/ServerEditionCapability" + }, + "readOnly": true + } + }, + "description": "Location capabilities." + }, + "CapabilitiesListResult": { "type": "object", "properties": { "value": { + "description": "A list of supported capabilities.", "type": "array", "items": { - "$ref": "#/definitions/MaintenanceWindow" + "$ref": "#/definitions/CapabilityProperties" }, - "description": "The list of server maintenance window." + "readOnly": true }, "nextLink": { - "description": "The link used to get the next page of operations.", - "type": "string" + "description": "Link to retrieve next page of results.", + "type": "string", + "readOnly": true } }, - "description": "A list of maintenance windows for a MySQL server." + "description": "location capability" }, "OperationDisplay": { "properties": { @@ -2107,12 +2176,12 @@ "description": "The name of the server configuration.", "x-ms-parameter-location": "method" }, - "MaintenanceWindowNameParameter": { - "name": "maintenanceWindowName", + "LocationNameParameter": { + "name": "locationName", "in": "path", "required": true, "type": "string", - "description": "The name of the maintenance window.", + "description": "The name of the location.", "x-ms-parameter-location": "method" } } diff --git a/specification/mysql/resource-manager/readme.az.md b/specification/mysql/resource-manager/readme.az.md new file mode 100644 index 000000000000..e4e631ded08e --- /dev/null +++ b/specification/mysql/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: mysql + namespace: azure.mgmt.mysql + package-name: azure-mgmt-mysql +az-output-folder: $(azure-cli-extension-folder)/src/mysql +python-sdk-output-folder: "$(az-output-folder)/azext_mysql/vendored_sdks/mysql" +# 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/mysql/resource-manager/readme.csharp.md b/specification/mysql/resource-manager/readme.csharp.md new file mode 100644 index 000000000000..f36abfa36f3b --- /dev/null +++ b/specification/mysql/resource-manager/readme.csharp.md @@ -0,0 +1,103 @@ +### 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 + clear-output-folder: true +``` + +### C# multi-api + +Generate all API versions currently shipped for this package + +```yaml $(multiapi) +batch: + - tag: package-2020-01-01 + - tag: package-2018-06-01 + - tag: package-2017-12-01 + - tag: package-2020-07-01-privatepreview + - tag: package-2020-01-01-privatepreview + #- tag: package-2018-06-01-privatepreview # commenting this out as there is an issue with 'ProxyResources' + - tag: package-2017-12-01-preview +``` + +### Tag: package-2020-01-01 and C# + +These settings apply only when `--tag=package-2020-01-01 --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-01-01' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.MySQL + output-folder: $(csharp-sdks-folder)/mysql/$(namespace)/src/Generated +``` + +### Tag: package-2018-06-01 and C# + +These settings apply only when `--tag=package-2018-06-01 --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2018-06-01' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.MySQL + output-folder: $(csharp-sdks-folder)/mysql/$(namespace)/src/Generated +``` + +### Tag: package-2017-12-01 and C# + +These settings apply only when `--tag=package-2017-12-01 --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2017-12-01' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.MySQL + output-folder: $(csharp-sdks-folder)/mysql/$(namespace)/src/Generated +``` + +### Tag: package-2020-07-01-privatepreview and C# + +These settings apply only when `--tag=package-2020-07-01-privatepreview --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-07-01-privatepreview' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.MySQL.FlexibleServers + output-folder: $(csharp-sdks-folder)/mysql/$(namespace)/src/Generated +``` + +### Tag: package-2020-01-01-privatepreview and C# + +These settings apply only when `--tag=package-2020-01-01-privatepreview --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-01-01-privatepreview' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.MySQL + output-folder: $(csharp-sdks-folder)/mysql/$(namespace)/src/Generated +``` + +### Tag: package-2018-06-01-privatepreview and C# + +These settings apply only when `--tag=package-2018-06-01-privatepreview --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2018-06-01-privatepreview' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.MySQL + output-folder: $(csharp-sdks-folder)/mysql/$(namespace)/src/Generated +``` + +### Tag: package-2017-12-01-preview and C# + +These settings apply only when `--tag=package-2017-12-01-preview --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2017-12-01-preview' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.MySQL + output-folder: $(csharp-sdks-folder)/mysql/$(namespace)/src/Generated +``` \ No newline at end of file diff --git a/specification/mysql/resource-manager/readme.go.md b/specification/mysql/resource-manager/readme.go.md index 1ce4bf29f208..ceb49ca28d81 100644 --- a/specification/mysql/resource-manager/readme.go.md +++ b/specification/mysql/resource-manager/readme.go.md @@ -5,7 +5,6 @@ These settings apply only when `--go` is specified on the command line. ``` yaml $(go) go: license-header: MICROSOFT_APACHE_NO_VERSION - namespace: mysql clear-output-folder: true ``` @@ -13,17 +12,30 @@ go: ``` yaml $(go) && $(multiapi) batch: + - tag: package-2020-07-01-privatepreview - tag: package-2020-01-01 - tag: package-2017-12-01-preview - tag: package-2017-12-01 ``` +### Tag: package-2020-07-01-privatepreview and go + +These settings apply only when `--tag=package-2020-07-01-privatepreview --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-2020-07-01-privatepreview' && $(go) +rpname: mysql +namespace: mysqlflexibleservers +output-folder: $(go-sdk-folder)/services/preview/$(rpname)/mgmt/2020-07-01-preview/$(namespace) +``` + ### Tag: package-2020-01-01 and go These settings apply only when `--tag=package-2020-01-01 --go` is specified on the command line. Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2020-01-01' && $(go) +namespace: mysql output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2020-01-01/$(namespace) ``` @@ -33,6 +45,7 @@ These settings apply only when `--tag=package-2017-12-01-preview --go` is specif Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2017-12-01-preview' && $(go) +namespace: mysql output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-12-01-preview/$(namespace) ``` @@ -42,5 +55,6 @@ These settings apply only when `--tag=package-2017-12-01 --go` is specified on t Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2017-12-01' && $(go) +namespace: mysql output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-12-01/$(namespace) ``` \ No newline at end of file diff --git a/specification/mysql/resource-manager/readme.md b/specification/mysql/resource-manager/readme.md index 72098bc5cf51..e388def3c3e4 100644 --- a/specification/mysql/resource-manager/readme.md +++ b/specification/mysql/resource-manager/readme.md @@ -141,6 +141,8 @@ This is not used by Autorest itself. swagger-to-sdk: - repo: azure-sdk-for-net - repo: azure-sdk-for-python + after_scripts: + - python ./scripts/multiapi_init_gen.py azure-mgmt-rdbms - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-js @@ -153,45 +155,11 @@ swagger-to-sdk: ### 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.MySQL - output-folder: $(csharp-sdks-folder)/mysql/Microsoft.Azure.Management.MySQL/src/Generated - clear-output-folder: true -``` - +See configuration in [readme.csharp.md](./readme.csharp.md) ## Python -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) -python-mode: create -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - namespace: azure.mgmt.rdbms.mysql - package-name: azure-mgmt-rdbms - clear-output-folder: true -``` -``` yaml $(python) && $(python-mode) == 'update' -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mysql -``` -``` yaml $(python) && $(python-mode) == 'create' -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms -``` +See configuration in [readme.python.md](./readme.python.md) ## Go diff --git a/specification/mysql/resource-manager/readme.python.md b/specification/mysql/resource-manager/readme.python.md new file mode 100644 index 000000000000..d67eeda77452 --- /dev/null +++ b/specification/mysql/resource-manager/readme.python.md @@ -0,0 +1,134 @@ +## Python + +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 !$(track2) +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 2 + package-name: azure-mgmt-rdbms + clear-output-folder: true + no-namespace-folders: true +``` + +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 $(multiapi) && !$(track2) +batch: + - tag: package-2020-01-01 + - tag: package-2018-06-01 + - tag: package-2017-12-01 + - tag: package-2020-07-01-privatepreview + - tag: package-2020-01-01-privatepreview + - tag: package-2017-12-01-preview +``` + +```yaml $(multiapi) && $(track2) +clear-output-folder: true +batch: + - tag: package-2020-01-01 + - tag: package-2018-06-01 + - tag: package-2017-12-01 + - tag: package-2020-07-01-privatepreview + - tag: package-2020-01-01-privatepreview + - tag: package-2017-12-01-preview + - multiapiscript: true + +``` + +``` yaml $(multiapiscript) +output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/ +clear-output-folder: false +perform-load: false +``` + +### Tag: package-2020-01-01 and python + +These settings apply only when `--tag=package-2020-01-01 --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-01-01' && $(python) +python: + namespace: azure.mgmt.rdbms.mysql + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mysql +``` + +### Tag: package-2018-06-01 and python + +These settings apply only when `--tag=package-2018-06-01 --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2018-06-01' && $(python) +python: + namespace: azure.mgmt.rdbms.mysql + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mysql +``` + +### Tag: package-2017-12-01 and python + +These settings apply only when `--tag=package-2017-12-01 --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2017-12-01' && $(python) +python: + namespace: azure.mgmt.rdbms.mysql + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mysql +``` + +### Tag: package-2020-07-01-privatepreview and python + +These settings apply only when `--tag=package-2020-07-01-privatepreview --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-07-01-privatepreview' && $(python) +python: + namespace: azure.mgmt.rdbms.mysql.flexibleservers + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mysql/flexibleservers +``` + +### Tag: package-2020-01-01-privatepreview and python + +These settings apply only when `--tag=package-2020-01-01-privatepreview --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-01-01-privatepreview' && $(python) +python: + namespace: azure.mgmt.rdbms.mysql + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mysql +``` + +### Tag: package-2018-06-01-privatepreview and python + +These settings apply only when `--tag=package-2018-06-01-privatepreview --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2018-06-01-privatepreview' && $(python) +python: + namespace: azure.mgmt.rdbms.mysql + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mysql +``` + +### Tag: package-2017-12-01-preview and python + +These settings apply only when `--tag=package-2017-12-01-preview --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2017-12-01-preview' && $(python) +python: + namespace: azure.mgmt.rdbms.mysql + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mysql +``` \ No newline at end of file diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CapabilitiesByLocation.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CapabilitiesByLocation.json new file mode 100644 index 000000000000..9921b8a4c681 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CapabilitiesByLocation.json @@ -0,0 +1,180 @@ +{ + "parameters": { + "api-version": "2020-02-14-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "locationName": "WestUS" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "zone": "none", + "supportedFlexibleServerEditions": [ + { + "name": "Burstable", + "supportedStorageEditions": [ + { + "name": "ManagedDisk", + "supportedStorageMB": [ + { + "name": "32768", + "supportedIops": 120, + "storageSizeMB": 32768 + }, + { + "name": "65536", + "supportedIops": 240, + "storageSizeMB": 65536 + }, + { + "name": "131072", + "supportedIops": 500, + "storageSizeMB": 131072 + } + ] + } + ], + "supportedServerVersions": [ + { + "name": "12", + "supportedVcores": [ + { + "name": "Standard_B1s", + "vCores": 1, + "supportedIops": 320, + "supportedMemoryPerVcoreMB": 1024 + }, + { + "name": "Standard_B1ms", + "vCores": 1, + "supportedIops": 640, + "supportedMemoryPerVcoreMB": 2048 + }, + { + "name": "Standard_B2s", + "vCores": 2, + "supportedIops": 1280, + "supportedMemoryPerVcoreMB": 2048 + } + ] + } + ] + } + ] + }, + { + "zone": "1", + "supportedFlexibleServerEditions": [ + { + "name": "Burstable", + "supportedStorageEditions": [ + { + "name": "ManagedDisk", + "supportedStorageMB": [ + { + "name": "32768", + "supportedIops": 120, + "storageSizeMB": 32768 + }, + { + "name": "65536", + "supportedIops": 240, + "storageSizeMB": 65536 + }, + { + "name": "131072", + "supportedIops": 500, + "storageSizeMB": 131072 + } + ] + } + ], + "supportedServerVersions": [ + { + "name": "12", + "supportedVcores": [ + { + "name": "Standard_B1s", + "vCores": 1, + "supportedIops": 320, + "supportedMemoryPerVcoreMB": 1024 + }, + { + "name": "Standard_B1ms", + "vCores": 1, + "supportedIops": 640, + "supportedMemoryPerVcoreMB": 2048 + }, + { + "name": "Standard_B2s", + "vCores": 2, + "supportedIops": 1280, + "supportedMemoryPerVcoreMB": 2048 + } + ] + } + ] + } + ] + }, + { + "zone": "2", + "supportedFlexibleServerEditions": [ + { + "name": "Burstable", + "supportedStorageEditions": [ + { + "name": "ManagedDisk", + "supportedStorageMB": [ + { + "name": "32768", + "supportedIops": 120, + "storageSizeMB": 32768 + }, + { + "name": "65536", + "supportedIops": 240, + "storageSizeMB": 65536 + }, + { + "name": "131072", + "supportedIops": 500, + "storageSizeMB": 131072 + } + ] + } + ], + "supportedServerVersions": [ + { + "name": "12", + "supportedVcores": [ + { + "name": "Standard_B1s", + "vCores": 1, + "supportedIops": 320, + "supportedMemoryPerVcoreMB": 1024 + }, + { + "name": "Standard_B1ms", + "vCores": 1, + "supportedIops": 640, + "supportedMemoryPerVcoreMB": 2048 + }, + { + "name": "Standard_B2s", + "vCores": 2, + "supportedIops": 1280, + "supportedMemoryPerVcoreMB": 2048 + } + ] + } + ] + } + ] + } + ] + } + } + } +} diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowCreate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowCreate.json deleted file mode 100644 index 648e0befb9a2..000000000000 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowCreate.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "parameters": { - "maintenanceWindowName": "customerMaintenanceWindow", - "serverName": "testserver", - "resourceGroupName": "testrg", - "api-version": "2020-02-14-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "parameters": { - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - } - } - }, - "responses": { - "201": { - "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/prkinteastus/maintenanceWindows/customerMaintenanceWindow", - "name": "customerMaintenanceWindow", - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - }, - "type": "Microsoft.DBforPostgreSQL/flexibleServers/maintenanceWindows" - } - }, - "200": { - "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/prkinteastus/maintenanceWindows/customerMaintenanceWindow", - "name": "customerMaintenanceWindow", - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - }, - "type": "Microsoft.DBforPostgreSQL/flexibleServers/maintenanceWindows" - } - }, - "202": {} - } -} diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowDelete.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowDelete.json deleted file mode 100644 index cafa0a76ed07..000000000000 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "maintenanceWindowName": "customerMaintenanceWindow", - "serverName": "testserver", - "resourceGroupName": "TestGroup", - "api-version": "2020-02-14-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" - }, - "responses": { - "200": {}, - "202": {}, - "204": {} - } -} diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowGet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowGet.json deleted file mode 100644 index 8febc0a4b487..000000000000 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowGet.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parameters": { - "maintenanceWindowName": "customerMaintenanceWindow", - "serverName": "testserver", - "resourceGroupName": "testrg", - "api-version": "2020-02-14-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/prkinteastus/maintenanceWindows/customerMaintenanceWindow", - "name": "customerMaintenanceWindow", - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - }, - "type": "Microsoft.DBforPostgreSQL/flexibleServers/maintenanceWindows" - } - } - } -} diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowListByServer.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowListByServer.json deleted file mode 100644 index aff335545a5c..000000000000 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowListByServer.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "parameters": { - "serverName": "testserver", - "resourceGroupName": "testrg", - "api-version": "2020-02-14-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/prkinteastus/maintenanceWindows/customerMaintenanceWindow", - "name": "customerMaintenanceWindow", - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - }, - "type": "Microsoft.DBforPostgreSQL/flexibleServers/maintenanceWindows" - } - ] - } - } - } -} 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 ebb30c443b02..19f3b85ba6c5 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 @@ -14,12 +14,9 @@ "administratorLogin": "cloudsa", "administratorLoginPassword": "password", "version": "12", - "standbyCount": 0, - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet", - "delegatedVnetResourceGroup": "test-vnet-rg" + "haEnabled": "Enabled", + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, "storageProfile": { "storageMB": 524288, @@ -47,17 +44,22 @@ "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", - "standbyCount": 0, - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "haEnabled": "Enabled", + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "1" + "availabilityZone": "1", + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + } }, "location": "westus", "tags": { @@ -82,17 +84,22 @@ "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", - "standbyCount": 0, - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "haEnabled": "Enabled", + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "1" + "availabilityZone": "1", + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + } }, "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 a1218b930091..803ad0031622 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 @@ -28,8 +28,8 @@ "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", - "standbyCount": 0, - "vnetInjArgs": {}, + "haEnabled": "Disabled", + "delegatedSubnetArguments": {}, "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 @@ -59,8 +59,8 @@ "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", - "standbyCount": 0, - "vnetInjArgs": {}, + "haEnabled": "Disabled", + "delegatedSubnetArguments": {}, "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 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 90c6c3275d72..2866bc25f357 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 @@ -24,7 +24,15 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "1" + "haEnabled": "Enabled", + "availabilityZone": "1", + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + } }, "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 bfb6f8603d5e..d1f727e6dab8 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 @@ -20,11 +20,8 @@ "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", "displayName": "demosingleserver", "publicNetworkAccess": "Disabled", - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet", - "delegatedVnetResourceGroup": "test-vnet-rg" + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, "storageProfile": { "storageMB": 524288, diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyCreateOrUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyCreateOrUpdate.json new file mode 100644 index 000000000000..c42b5c076cc6 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyCreateOrUpdate.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "testrg", + "serverName": "testserver", + "keyName": "someVault_someKey_01234567890123456789012345678901", + "api-version": "2020-02-14-privatepreview", + "parameters": { + "properties": { + "serverKeyType": "AzureKeyVault", + "uri": "https://someVault.vault.azure.net/keys/someKey/01234567890123456789012345678901" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/testserver/keys/someVault_someKey_01234567890123456789012345678901", + "name": "omeVault_someKey_01234567890123456789012345678901", + "type": "Microsoft.DBforPostgreSQL/flexibleServers/keys", + "kind": "azurekeyvault", + "properties": { + "serverKeyType": "AzureKeyVault", + "uri": "https://someVault.vault.azure.net/keys/someKey/01234567890123456789012345678901", + "creationDate": "2017-05-01T00:00:00.0Z" + } + } + }, + "202": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/testserver/keys/someVault_someKey_01234567890123456789012345678901", + "name": "omeVault_someKey_01234567890123456789012345678901", + "type": "Microsoft.DBforPostgreSQL/flexibleServers/keys", + "kind": "azurekeyvault", + "properties": { + "serverKeyType": "AzureKeyVault", + "uri": "https://someVault.vault.azure.net/keys/someKey/01234567890123456789012345678901", + "creationDate": "2017-05-01T00:00:00.0Z" + } + } + } + } +} diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyDelete.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyDelete.json new file mode 100644 index 000000000000..769fa6985a14 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyDelete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "testrg", + "serverName": "testserver", + "keyName": "someVault_someKey_01234567890123456789012345678901", + "api-version": "2020-02-14-privatepreview" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyGet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyGet.json new file mode 100644 index 000000000000..87fdede04e58 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyGet.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "testrg", + "serverName": "testserver", + "keyName": "someVault_someKey_01234567890123456789012345678901", + "api-version": "2020-02-14-privatepreview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/testserver/keys/someVault_someKey_01234567890123456789012345678901", + "name": "someVault_someKey_01234567890123456789012345678901", + "type": "Microsoft.DBforPostgreSQL/flexibleServers/keys", + "kind": "azurekeyvault", + "properties": { + "serverKeyType": "AzureKeyVault", + "uri": "https://someVault.vault.azure.net/keys/someKey/01234567890123456789012345678901", + "creationDate": "2019-12-01T00:00:00.0Z" + } + } + } + } +} diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyList.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyList.json new file mode 100644 index 000000000000..f0923ae1877b --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyList.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "testrg", + "serverName": "testserver", + "api-version": "2020-02-14-privatepreview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/testserver/keys/someVault_someKey_01234567890123456789012345678901", + "name": "someVault_someKey_01234567890123456789012345678901", + "type": "Microsoft.DBforPostgreSQL/flexibleServers/keys", + "kind": "azurekeyvault", + "properties": { + "serverKeyType": "AzureKeyVault", + "uri": "https://someVault.vault.azure.net/keys/someKey/01234567890123456789012345678901", + "creationDate": "2019-12-01T00:00:00.0Z" + } + } + ] + } + } + } +} 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 494a116c5baa..630d9fe6f75c 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 @@ -25,7 +25,15 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "1" + "haEnabled": "Enabled", + "availabilityZone": "1", + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + } }, "location": "westus", "tags": { @@ -52,7 +60,14 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "2" + "haEnabled": "Disabled", + "availabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 10, + "startMinute": 30, + "customWindow": "Enabled" + } }, "location": "westus", "tags": { @@ -79,7 +94,14 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "3" + "haEnabled": "Disabled", + "availabilityZone": "3", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + } }, "location": "westus", "tags": { @@ -106,7 +128,15 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "1" + "haEnabled": "Enabled", + "availabilityZone": "1", + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + } }, "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 f2861579356f..6ff0d5f7a09d 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 @@ -26,7 +26,15 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "1" + "haEnabled": "Enabled", + "availabilityZone": "1", + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 10, + "startMinute": 30, + "customWindow": "Enabled" + } }, "location": "westus", "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc1", @@ -50,7 +58,14 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "2" + "haEnabled": "Disabled", + "availabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + } }, "location": "westus", "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/pgtestsvc2", @@ -74,7 +89,14 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "3" + "haEnabled": "Disabled", + "availabilityZone": "3", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 10, + "startMinute": 30, + "customWindow": "Enabled" + } }, "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 9be524337d1a..cd18ac62f1c0 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 @@ -38,7 +38,8 @@ "storageMB": 524288, "backupRetentionDays": 20 }, - "vnetInjArgs": {}, + "delegatedSubnetArguments": {}, + "haEnabled": "Disabled", "availabilityZone": "1" }, "location": "westus", diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json new file mode 100644 index 000000000000..0bf2308701ca --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "serverName": "pgtestsvc4", + "resourceGroupName": "testrg", + "api-version": "2020-02-14-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "location": "westus", + "properties": { + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 8, + "startMinute": 0, + "customWindow": "Enabled" + } + } + } + }, + "responses": { + "200": { + "body": { + "sku": { + "tier": "GeneralPurpose", + "name": "Standard_D4s_v3" + }, + "properties": { + "administratorLogin": "cloudsa", + "version": "12", + "state": "Ready", + "haState": "NotEnabled", + "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", + "displayName": "demosingleserver", + "publicNetworkAccess": "Enabled", + "storageProfile": { + "storageMB": 524288, + "backupRetentionDays": 20 + }, + "delegatedSubnetArguments": {}, + "haEnabled": "Disabled", + "availabilityZone": "1", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 8, + "startMinute": 0, + "customWindow": "Enabled" + } + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/flexibleServers/pgtestsvc4", + "name": "pgtestsvc4", + "type": "Microsoft.DBforPostgreSQL/flexibleServers" + } + }, + "202": {} + } +} diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/VirtualNetworkSubnetUsage.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/VirtualNetworkSubnetUsage.json new file mode 100644 index 000000000000..79466a840f2b --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/VirtualNetworkSubnetUsage.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "api-version": "2020-02-14-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "locationName": "WestUS", + "parameters": { + "virtualNetworkArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/testvnet" + } + }, + "responses": { + "200": { + "body": { + "delegatedSubnetsUsage": [ + { + "subnetName": "test-subnet-1", + "usage": 2 + }, + { + "subnetName": "test-subnet-2", + "usage": 3 + } + ] + } + } + } +} 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 047b068c01e8..faf2839e2751 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 @@ -105,6 +105,9 @@ "x-ms-examples": { "ServerUpdate": { "$ref": "./examples/ServerUpdate.json" + }, + "ServerUpdateWithCustomerMaintenanceWindow": { + "$ref": "./examples/ServerUpdateWithCustomerMaintenanceWindow.json" } }, "description": "Updates an existing server. The request body can contain one to many of the properties present in the normal server definition.", @@ -793,18 +796,13 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/maintenanceWindows/{maintenanceWindowName}": { - "put": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/keys": { + "get": { "tags": [ - "CustomerMaintenanceWindow" + "ServerKeys" ], - "operationId": "CustomerMaintenanceWindow_CreateOrUpdate", - "x-ms-examples": { - "CustomerMaintenanceWindowCreate": { - "$ref": "./examples/CustomerMaintenanceWindowCreate.json" - } - }, - "description": "Creates a new customer maintenance window.", + "description": "Gets a list of Server keys.", + "operationId": "ServerKeys_List", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -812,6 +810,45 @@ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved the list of PostgreSQL Server keys.", + "schema": { + "$ref": "#/definitions/ServerKeyListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List the keys for a PostgreSQL Server.": { + "$ref": "./examples/ServerKeyList.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/keys/{keyName}": { + "get": { + "tags": [ + "ServerKeys" + ], + "description": "Gets a PostgreSQL Server key.", + "operationId": "ServerKeys_Get", + "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, @@ -819,34 +856,88 @@ "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/MaintenanceWindowNameParameter" + "name": "keyName", + "in": "path", + "description": "The name of the PostgreSQL Server key to be retrieved.", + "required": true, + "type": "string" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved the specified PostgreSQL Server key.", + "schema": { + "$ref": "#/definitions/ServerKey" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Get the PostgreSQL Server key": { + "$ref": "./examples/ServerKeyGet.json" + } + } + }, + "put": { + "tags": [ + "ServerKeys" + ], + "description": "Creates or updates a PostgreSQL Server key.", + "operationId": "ServerKeys_CreateOrUpdate", + "parameters": [ + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "name": "keyName", + "in": "path", + "description": "The name of the PostgreSQL Server key to be operated on (updated or created).", + "required": true, + "type": "string" }, { "name": "parameters", "in": "body", + "description": "The requested PostgreSQL Server key resource state.", "required": true, "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" - }, - "description": "The required parameters for creating or updating a customer maintenance window." + "$ref": "#/definitions/ServerKey" + } + }, + { + "$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", + "description": "Successfully updated the PostgreSQL Server key.", "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" + "$ref": "#/definitions/ServerKey" } }, - "201": { - "description": "Created", + "202": { + "description": "Operation in progress", "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" + "$ref": "#/definitions/ServerKey" } }, - "202": { - "description": "Accepted" - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -854,45 +945,49 @@ } } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Creates or updates a PostgreSQL Server key": { + "$ref": "./examples/ServerKeyCreateOrUpdate.json" + } + } }, "delete": { "tags": [ - "CustomerMaintenanceWindow" + "ServerKeys" ], - "operationId": "CustomerMaintenanceWindow_Delete", - "x-ms-examples": { - "CustomerMaintenanceWindowDelete": { - "$ref": "./examples/CustomerMaintenanceWindowDelete.json" - } - }, - "description": "Deletes a PostgreSQL server Customer maintenance window.", + "description": "Deletes the PostgreSQL Server key with the given name.", + "operationId": "ServerKeys_Delete", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "name": "keyName", + "in": "path", + "description": "The name of the PostgreSQL Server key to be deleted.", + "required": true, + "type": "string" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/MaintenanceWindowNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" } ], "responses": { "200": { - "description": "OK" + "description": "Successfully deleted the PostgreSQL Server key." }, "202": { - "description": "Accepted" + "description": "Operation in progress" }, "204": { - "description": "NoContent" + "description": "The specified PostgreSQL Server key does not exist." }, "default": { "description": "Error response describing why the operation failed.", @@ -901,19 +996,26 @@ } } }, - "x-ms-long-running-operation": true - }, - "get": { + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Delete the PostgreSQL Server key": { + "$ref": "./examples/ServerKeyDelete.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForPostgreSql/checkNameAvailability": { + "post": { "tags": [ - "CustomerMaintenanceWindow" + "CheckNameAvailability" ], - "operationId": "CustomerMaintenanceWindow_Get", + "operationId": "CheckNameAvailability_Execute", "x-ms-examples": { - "CustomerMaintenanceWindowGet": { - "$ref": "./examples/CustomerMaintenanceWindowGet.json" + "NameAvailability": { + "$ref": "./examples/CheckNameAvailability.json" } }, - "description": "Get the Customer maintenance windows of a given PostgreSQL server.", + "description": "Check the availability of name for resource", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -922,20 +1024,20 @@ "$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/MaintenanceWindowNameParameter" + "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/CustomerMaintenanceWindow" + "$ref": "#/definitions/NameAvailability" } }, "default": { @@ -947,18 +1049,18 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/maintenanceWindows": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForPostgreSql/locations/{locationName}/capabilities": { "get": { "tags": [ - "CustomerMaintenanceWindow" + "LocationBasedCapabilities" ], - "operationId": "CustomerMaintenanceWindow_ListByServer", + "operationId": "LocationBasedCapabilities_Execute", "x-ms-examples": { - "CustomerMaintenanceWindowList": { - "$ref": "./examples/CustomerMaintenanceWindowListByServer.json" + "CapabilitiesList": { + "$ref": "./examples/CapabilitiesByLocation.json" } }, - "description": "List all the Customer Maintenance Windows in a given PostgreSQL flexible server.", + "description": "Get capabilities at specified location in a given subscription.", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -967,17 +1069,14 @@ "$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/LocationNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindowListResult" + "$ref": "#/definitions/CapabilitiesListResult" } }, "default": { @@ -986,21 +1085,24 @@ "$ref": "#/definitions/CloudError" } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.DBForPostgreSql/checkNameAvailability": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForPostgreSql/locations/{locationName}/checkVirtualNetworkSubnetUsage": { "post": { "tags": [ - "CheckNameAvailability" + "VirtualNetworkSubnetUsage" ], - "operationId": "CheckNameAvailability_Execute", + "operationId": "VirtualNetworkSubnetUsage_Execute", "x-ms-examples": { - "NameAvailability": { - "$ref": "./examples/CheckNameAvailability.json" + "VirtualNetworkSubnetUsageList": { + "$ref": "./examples/VirtualNetworkSubnetUsage.json" } }, - "description": "Check the availability of name for resource", + "description": "Get virtual network subnet usage for a given vNet resource id.", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -1009,20 +1111,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "name": "nameAvailabilityRequest", + "$ref": "#/parameters/LocationNameParameter" + }, + { + "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/NameAvailabilityRequest" + "$ref": "#/definitions/VirtualNetworkSubnetUsageParameter" }, - "description": "The required parameters for checking if resource name is available." + "description": "The required parameters for creating or updating a server." } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/NameAvailability" + "$ref": "#/definitions/VirtualNetworkSubnetUsageResult" } }, "default": { @@ -1069,11 +1174,269 @@ } }, "definitions": { + "ServerKeyListResult": { + "description": "A list of PostgreSQL Server keys.", + "type": "object", + "properties": { + "value": { + "description": "A list of PostgreSQL Server keys.", + "type": "array", + "items": { + "$ref": "#/definitions/ServerKey" + }, + "readOnly": true + }, + "nextLink": { + "description": "Link to retrieve next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "ServerKeyProperties": { + "description": "Properties for a key execution.", + "required": [ + "serverKeyType" + ], + "type": "object", + "properties": { + "serverKeyType": { + "description": "The key type like 'AzureKeyVault'.", + "enum": [ + "AzureKeyVault" + ], + "type": "string", + "x-ms-enum": { + "name": "ServerKeyType", + "modelAsString": true + } + }, + "uri": { + "description": "The URI of the key.", + "type": "string" + }, + "creationDate": { + "format": "date-time", + "description": "The key creation date.", + "type": "string", + "readOnly": true + } + } + }, + "ServerKey": { + "description": "A PostgreSQL Server key.", + "type": "object", + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + } + ], + "properties": { + "kind": { + "description": "Kind of encryption protector used to protect the key.", + "type": "string", + "readOnly": true + }, + "properties": { + "$ref": "#/definitions/ServerKeyProperties", + "description": "Properties of the ServerKey Resource.", + "x-ms-client-flatten": true + } + } + }, + "VirtualNetworkSubnetUsageParameter": { + "type": "object", + "properties": { + "virtualNetworkArmResourceId": { + "type": "string", + "description": "Virtual network resource id." + } + }, + "description": "Virtual network subnet usage parameter" + }, + "VirtualNetworkSubnetUsageResult": { + "type": "object", + "properties": { + "delegatedSubnetsUsage": { + "type": "array", + "items": { + "$ref": "#/definitions/DelegatedSubnetUsage" + }, + "readOnly": true + } + }, + "description": "Virtual network subnet usage data." + }, + "DelegatedSubnetUsage": { + "type": "object", + "properties": { + "subnetName": { + "type": "string", + "readOnly": true, + "description": "name of the subnet" + }, + "usage": { + "type": "integer", + "format": "int64", + "readOnly": true, + "description": "Number of used delegated subnets" + } + }, + "description": "Delegated subnet usage data." + }, + "StorageMBCapability": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "storage MB name", + "readOnly": true + }, + "supportedIops": { + "type": "integer", + "format": "int64", + "description": "supported IOPS", + "readOnly": true + }, + "storageSizeMB": { + "type": "integer", + "format": "int64", + "description": "storage size in MB", + "readOnly": true + } + }, + "description": "storage size in MB capability" + }, + "VcoreCapability": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "vCore name", + "readOnly": true + }, + "vCores": { + "type": "integer", + "format": "int64", + "description": "supported vCores", + "readOnly": true + }, + "supportedIops": { + "type": "integer", + "format": "int64", + "description": "supported IOPS", + "readOnly": true + }, + "supportedMemoryPerVcoreMB": { + "type": "integer", + "format": "int64", + "description": "supported memory per vCore in MB", + "readOnly": true + } + }, + "description": "Vcores capability" + }, + "ServerVersionCapability": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "server version", + "readOnly": true + }, + "supportedVcores": { + "type": "array", + "items": { + "$ref": "#/definitions/VcoreCapability" + }, + "readOnly": true + } + }, + "description": "Server version capabilities." + }, + "StorageEditionCapability": { + "properties": { + "name": { + "type": "string", + "description": "storage edition name", + "readOnly": true + }, + "supportedStorageMB": { + "type": "array", + "items": { + "$ref": "#/definitions/StorageMBCapability" + }, + "readOnly": true + } + }, + "description": "storage edition capability" + }, + "ServerEditionCapability": { + "properties": { + "name": { + "type": "string", + "description": "Server edition name", + "readOnly": true + }, + "supportedStorageEditions": { + "type": "array", + "items": { + "$ref": "#/definitions/StorageEditionCapability" + }, + "readOnly": true + }, + "supportedServerVersions": { + "type": "array", + "items": { + "$ref": "#/definitions/ServerVersionCapability" + }, + "readOnly": true + } + }, + "description": "Server edition capabilities." + }, + "CapabilityProperties": { + "properties": { + "zone": { + "type": "string", + "description": "zone name", + "readOnly": true + }, + "supportedFlexibleServerEditions": { + "type": "array", + "items": { + "$ref": "#/definitions/ServerEditionCapability" + }, + "readOnly": true + } + }, + "description": "Location capabilities." + }, + "CapabilitiesListResult": { + "type": "object", + "properties": { + "value": { + "description": "A list of supported capabilities.", + "type": "array", + "items": { + "$ref": "#/definitions/CapabilityProperties" + }, + "readOnly": true + }, + "nextLink": { + "description": "Link to retrieve next page of results.", + "type": "string", + "readOnly": true + } + }, + "description": "location capability" + }, "ServerVersion": { "type": "string", "description": "The version of a server.", "enum": [ - "12" + "12", + "11" ], "x-ms-enum": { "name": "ServerVersion", @@ -1154,6 +1517,7 @@ }, "publicNetworkAccess": { "type": "string", + "readOnly": true, "description": "public network access is enabled or not", "enum": [ "Enabled", @@ -1164,10 +1528,21 @@ "modelAsString": true } }, - "standbyCount": { - "type": "integer", - "format": "int32", - "description": "stand by count value can be either 0 or 1" + "maintenanceWindow": { + "$ref": "#/definitions/MaintenanceWindow", + "description": "Maintenance window of a server." + }, + "haEnabled": { + "type": "string", + "description": "stand by count value can be either enabled or disabled", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "HAEnabledEnum", + "modelAsString": false + } }, "sourceServerName": { "type": "string", @@ -1182,23 +1557,21 @@ "type": "string", "description": "availability Zone information of the server." }, - "vnetInjArgs": { + "standByAvailabilityZone": { + "type": "string", + "description": "availability Zone information of the server.", + "readOnly": true + }, + "byokEnforcement": { + "type": "string", + "description": "Status showing whether the data encryption is enabled with customer-managed keys.", + "readOnly": true + }, + "delegatedSubnetArguments": { "properties": { - "delegatedVnetID": { - "type": "string", - "description": "delegated vNet ID" - }, - "delegatedSubnetName": { - "type": "string", - "description": "delegated subnet name" - }, - "delegatedVnetName": { - "type": "string", - "description": "delegated vNet name" - }, - "delegatedVnetResourceGroup": { + "subnetArmResourceId": { "type": "string", - "description": "delegated vNet resource group name" + "description": "delegated subnet arm resource id." } } }, @@ -1250,6 +1623,31 @@ ], "description": "Represents a server." }, + "MaintenanceWindow": { + "type": "object", + "description": "Maintenance window of a server.", + "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" + } + } + }, "ServerPropertiesForUpdate": { "properties": { "administratorLoginPassword": { @@ -1257,19 +1655,25 @@ "format": "password", "description": "The password of the administrator login." }, - "vCores": { - "type": "integer", - "format": "int32", - "description": "Max compute of a server is 64vCores." - }, "storageProfile": { "$ref": "#/definitions/StorageProfile", "description": "Storage profile of a server." }, - "standbyCount": { - "type": "integer", - "format": "int32", - "description": "stand by count value can be either 0 or 1" + "haEnabled": { + "type": "string", + "description": "stand by count value can be either enabled or disabled", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "HAEnabledEnum", + "modelAsString": false + } + }, + "maintenanceWindow": { + "$ref": "#/definitions/MaintenanceWindow", + "description": "Maintenance window of a server." } } }, @@ -1285,7 +1689,7 @@ }, "properties": { "$ref": "#/definitions/ServerPropertiesForUpdate", - "x-ms-client-flatten": false, + "x-ms-client-flatten": true, "description": "Properties of the server." }, "tags": { @@ -1350,6 +1754,10 @@ } } }, + "required": [ + "name", + "tier" + ], "description": "Sku information related properties of a server." }, "FirewallRuleProperties": { @@ -1406,66 +1814,6 @@ }, "description": "A list of firewall rules." }, - "CustomerMaintenanceWindowProperties": { - "properties": { - "dayOfWeek": { - "type": "integer", - "format": "int32", - "description": "The day of week of the customer maintenance window to start" - }, - "durationInMinutes": { - "type": "integer", - "format": "int32", - "description": "The duration of the customer maintenance window to run." - }, - "startHour": { - "type": "integer", - "format": "int32", - "description": "The starting hour of the customer maintenance window." - }, - "startMinute": { - "type": "integer", - "format": "int32", - "description": "The starting minutes of the customer maintenance window." - } - }, - "required": [ - "dayOfWeek", - "startHour", - "startMinute" - ], - "description": "The properties of a server firewall rule." - }, - "CustomerMaintenanceWindow": { - "properties": { - "properties": { - "$ref": "#/definitions/CustomerMaintenanceWindowProperties", - "x-ms-client-flatten": true, - "description": "The properties of a customer maintenance window." - } - }, - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" - } - ], - "required": [ - "properties" - ], - "description": "Represents a server firewall rule." - }, - "CustomerMaintenanceWindowListResult": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/CustomerMaintenanceWindow" - }, - "description": "The list of CustomerMaintenanceWindows in a PostgreSQL server." - } - }, - "description": "A list of firewall rules." - }, "ConfigurationProperties": { "properties": { "value": { @@ -1664,6 +2012,14 @@ } }, "parameters": { + "LocationNameParameter": { + "name": "locationName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the location.", + "x-ms-parameter-location": "method" + }, "ServerNameParameter": { "name": "serverName", "in": "path", diff --git a/specification/postgresql/resource-manager/readme.az.md b/specification/postgresql/resource-manager/readme.az.md new file mode 100644 index 000000000000..cec43db01174 --- /dev/null +++ b/specification/postgresql/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: postgresql + namespace: azure.mgmt.postgresql + package-name: azure-mgmt-postgresql +az-output-folder: $(azure-cli-extension-folder)/src/postgresql +python-sdk-output-folder: "$(az-output-folder)/azext_postgresql/vendored_sdks/postgresql" +# 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/postgresql/resource-manager/readme.csharp.md b/specification/postgresql/resource-manager/readme.csharp.md new file mode 100644 index 000000000000..da3765836399 --- /dev/null +++ b/specification/postgresql/resource-manager/readme.csharp.md @@ -0,0 +1,101 @@ +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 + clear-output-folder: true +``` + +### C# multi-api + +Generate all API versions currently shipped for this package + +```yaml $(multiapi) +batch: + - tag: package-2020-01-01 + - tag: package-2018-06-01 + - tag: package-2017-12-01 + - tag: package-2020-02-14-privatepreview + - tag: package-2020-01-01-privatepreview + - tag: package-2018-06-01-privatepreview + - tag: package-2017-12-01-preview +``` + +### Tag: package-2020-01-01 and C# + +These settings apply only when `--tag=package-2020-01-01 --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-01-01' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.PostgreSQL + output-folder: $(csharp-sdks-folder)/postgresql/$(namespace)/src/Generated +``` + +### Tag: package-2018-06-01 and C# + +These settings apply only when `--tag=package-2018-06-01 --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2018-06-01' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.PostgreSQL + output-folder: $(csharp-sdks-folder)/postgresql/$(namespace)/src/Generated +``` + +### Tag: package-2017-12-01 and C# + +These settings apply only when `--tag=package-2017-12-01 --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2017-12-01' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.PostgreSQL + output-folder: $(csharp-sdks-folder)/postgresql/$(namespace)/src/Generated +``` + +### Tag: package-2020-02-14-privatepreview and C# + +These settings apply only when `--tag=package-2020-02-14-privatepreview --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-02-14-privatepreview' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.PostgreSQL.FlexibleServers + output-folder: $(csharp-sdks-folder)/postgresql/$(namespace)/src/Generated +``` + +### Tag: package-2020-01-01-privatepreview and C# + +These settings apply only when `--tag=package-2020-01-01-privatepreview --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-01-01-privatepreview' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.PostgreSQL + output-folder: $(csharp-sdks-folder)/postgresql/$(namespace)/src/Generated +``` + +### Tag: package-2018-06-01-privatepreview and C# + +These settings apply only when `--tag=package-2018-06-01-privatepreview --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2018-06-01-privatepreview' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.PostgreSQL + output-folder: $(csharp-sdks-folder)/postgresql/$(namespace)/src/Generated +``` + +### Tag: package-2017-12-01-preview and C# + +These settings apply only when `--tag=package-2017-12-01-preview --csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(tag) == 'package-2017-12-01-preview' && $(csharp) +csharp: + namespace: Microsoft.Azure.Management.PostgreSQL + output-folder: $(csharp-sdks-folder)/postgresql/$(namespace)/src/Generated +``` \ No newline at end of file diff --git a/specification/postgresql/resource-manager/readme.go.md b/specification/postgresql/resource-manager/readme.go.md index 7fc16ffa1a54..76ec7d9c39f1 100644 --- a/specification/postgresql/resource-manager/readme.go.md +++ b/specification/postgresql/resource-manager/readme.go.md @@ -5,7 +5,6 @@ These settings apply only when `--go` is specified on the command line. ``` yaml $(go) go: license-header: MICROSOFT_APACHE_NO_VERSION - namespace: postgresql clear-output-folder: true ``` @@ -13,17 +12,30 @@ go: ``` yaml $(go) && $(multiapi) batch: + - tag: package-2020-02-14-privatepreview - tag: package-2020-01-01 - tag: package-2017-12-01-preview - tag: package-2017-12-01 ``` +### Tag: package-2020-02-14 and go + +These settings apply only when `--tag=package-2020-02-14-privatepreview --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-2020-02-14-privatepreview' && $(go) +rpname: postgresql +namespace: postgresqlflexibleservers +output-folder: $(go-sdk-folder)/services/preview/$(rpname)/mgmt/2020-02-14-preview/$(namespace) +``` + ### Tag: package-2020-01-01 and go These settings apply only when `--tag=package-2020-01-01 --go` is specified on the command line. Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2020-01-01' && $(go) +namespace: postgresql output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2020-01-01/$(namespace) ``` @@ -33,6 +45,7 @@ These settings apply only when `--tag=package-2017-12-01-preview --go` is specif Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2017-12-01-preview' && $(go) +namespace: postgresql output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-12-01-preview/$(namespace) ``` @@ -42,5 +55,6 @@ These settings apply only when `--tag=package-2017-12-01 --go` is specified on t Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2017-12-01' && $(go) +namespace: postgresql output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-12-01/$(namespace) ``` \ No newline at end of file diff --git a/specification/postgresql/resource-manager/readme.md b/specification/postgresql/resource-manager/readme.md index af66caa06f89..3e516e46a60f 100644 --- a/specification/postgresql/resource-manager/readme.md +++ b/specification/postgresql/resource-manager/readme.md @@ -135,6 +135,8 @@ This is not used by Autorest itself. swagger-to-sdk: - repo: azure-sdk-for-net - repo: azure-sdk-for-python + after_scripts: + - python ./scripts/multiapi_init_gen.py azure-mgmt-rdbms - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-js @@ -146,45 +148,11 @@ swagger-to-sdk: ### 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)/postgresql/Microsoft.Azure.Management.PostgreSQL/src/Generated - clear-output-folder: true -``` - +See configuration in [readme.csharp.md](./readme.csharp.md) ## Python -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) -python-mode: create -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - namespace: azure.mgmt.rdbms.postgresql - package-name: azure-mgmt-rdbms - clear-output-folder: true -``` -``` yaml $(python) && $(python-mode) == 'update' -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql -``` -``` yaml $(python) && $(python-mode) == 'create' -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms -``` +See configuration in [readme.python.md](./readme.python.md) ## Go diff --git a/specification/postgresql/resource-manager/readme.python.md b/specification/postgresql/resource-manager/readme.python.md new file mode 100644 index 000000000000..22ac8e36995b --- /dev/null +++ b/specification/postgresql/resource-manager/readme.python.md @@ -0,0 +1,136 @@ +## Python + +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 !$(track2) +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 2 + package-name: azure-mgmt-rdbms + clear-output-folder: true + no-namespace-folders: true +``` + +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 $(multiapi) && !$(track2) +batch: + - tag: package-2020-01-01 + - tag: package-2018-06-01 + - tag: package-2017-12-01 + - tag: package-2020-02-14-privatepreview + - tag: package-2020-01-01-privatepreview + - tag: package-2018-06-01-privatepreview + - tag: package-2017-12-01-preview +``` + +```yaml $(multiapi) && $(track2) +clear-output-folder: true +batch: + - tag: package-2020-01-01 + - tag: package-2018-06-01 + - tag: package-2017-12-01 + - tag: package-2020-02-14-privatepreview + - tag: package-2020-01-01-privatepreview + - tag: package-2018-06-01-privatepreview + - tag: package-2017-12-01-preview + - multiapiscript: true + +``` + +``` yaml $(multiapiscript) +output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/ +clear-output-folder: false +perform-load: false +``` + +### Tag: package-2020-01-01 and python + +These settings apply only when `--tag=package-2020-01-01 --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-01-01' && $(python) +python: + namespace: azure.mgmt.rdbms.postgresql + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql +``` + +### Tag: package-2018-06-01 and python + +These settings apply only when `--tag=package-2018-06-01 --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2018-06-01' && $(python) +python: + namespace: azure.mgmt.rdbms.postgresql + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql +``` + +### Tag: package-2017-12-01 and python + +These settings apply only when `--tag=package-2017-12-01 --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2017-12-01' && $(python) +python: + namespace: azure.mgmt.rdbms.postgresql + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql +``` + +### Tag: package-2020-02-14-privatepreview and python + +These settings apply only when `--tag=package-2020-02-14-privatepreview --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-02-14-privatepreview' && $(python) +python: + namespace: azure.mgmt.rdbms.postgresql.flexibleservers + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/flexibleservers +``` + +### Tag: package-2020-01-01-privatepreview and python + +These settings apply only when `--tag=package-2020-01-01-privatepreview --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-01-01-privatepreview' && $(python) +python: + namespace: azure.mgmt.rdbms.postgresql + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql +``` + +### Tag: package-2018-06-01-privatepreview and python + +These settings apply only when `--tag=package-2018-06-01-privatepreview --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2018-06-01-privatepreview' && $(python) +python: + namespace: azure.mgmt.rdbms.postgresql + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql +``` + +### Tag: package-2017-12-01-preview and python + +These settings apply only when `--tag=package-2017-12-01-preview --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2017-12-01-preview' && $(python) +python: + namespace: azure.mgmt.rdbms.postgresql + output-folder: $(python-sdks-folder)/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql +``` \ No newline at end of file