From fa61953e638677fe5e1308a1b7b326526caf1484 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 4 Aug 2020 12:17:44 -0700 Subject: [PATCH 01/40] Modified the names for Flexible server. --- .../2020-02-14-privatepreview/postgresql.json | 246 +++++++++--------- .../postgresql/resource-manager/readme.md | 5 + 2 files changed, 129 insertions(+), 122 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 8d350737eb01..4204738fb6f2 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json @@ -60,14 +60,14 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" }, "description": "The required parameters for creating or updating a server." } @@ -76,13 +76,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" } }, "202": { @@ -91,7 +91,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -119,14 +119,14 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ServerForUpdate" + "$ref": "#/definitions/FlexibleServerForUpdate" }, "description": "The required parameters for updating a server." } @@ -135,7 +135,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" } }, "202": { @@ -144,7 +144,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -172,7 +172,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { @@ -188,7 +188,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -219,20 +219,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -265,13 +265,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerListResult" + "$ref": "#/definitions/FlexibleServerListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -304,13 +304,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerListResult" + "$ref": "#/definitions/FlexibleServerListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -342,7 +342,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { @@ -355,7 +355,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -385,7 +385,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { @@ -398,7 +398,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -428,7 +428,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { @@ -441,7 +441,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -471,17 +471,17 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/FirewallRuleNameParameter" + "$ref": "#/parameters/FlexibleServerFirewallRuleNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" }, "description": "The required parameters for creating or updating a firewall rule." } @@ -490,13 +490,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" } }, "202": { @@ -505,7 +505,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -533,10 +533,10 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/FirewallRuleNameParameter" + "$ref": "#/parameters/FlexibleServerFirewallRuleNameParameter" } ], "responses": { @@ -552,7 +552,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -580,23 +580,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/FirewallRuleNameParameter" + "$ref": "#/parameters/FlexibleServerFirewallRuleNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -625,20 +625,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FirewallRuleListResult" + "$ref": "#/definitions/FlexibleServerFirewallRuleListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -670,20 +670,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ConfigurationListResult" + "$ref": "#/definitions/FlexibleServerConfigurationListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -715,23 +715,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/ConfigurationNameParameter" + "$ref": "#/parameters/FlexibleServerConfigurationNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Configuration" + "$ref": "#/definitions/FlexibleServerConfiguration" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -760,17 +760,17 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/MaintenanceWindowNameParameter" + "$ref": "#/parameters/FlexibleServerMaintenanceWindowNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" }, "description": "The required parameters for creating or updating a customer maintenance window." } @@ -779,13 +779,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" } }, "202": { @@ -794,7 +794,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -822,10 +822,10 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/MaintenanceWindowNameParameter" + "$ref": "#/parameters/FlexibleServerMaintenanceWindowNameParameter" } ], "responses": { @@ -841,7 +841,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } }, @@ -869,23 +869,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" }, { - "$ref": "#/parameters/MaintenanceWindowNameParameter" + "$ref": "#/parameters/FlexibleServerMaintenanceWindowNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -902,7 +902,7 @@ "$ref": "./examples/CustomerMaintenanceWindowListByServer.json" } }, - "description": "List all the Customer Maintenance Windows in a given PostgreSQL server.", + "description": "List all the Customer Maintenance Windows in a given PostgreSQL flexible server.", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -914,20 +914,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "#/parameters/FlexibleServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindowListResult" + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindowListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -957,7 +957,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/NameAvailabilityRequest" + "$ref": "#/definitions/FlexibleServerNameAvailabilityRequest" }, "description": "The required parameters for checking if resource name is available." } @@ -966,13 +966,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/NameAvailability" + "$ref": "#/definitions/FlexibleServerNameAvailability" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -999,13 +999,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/OperationListResult" + "$ref": "#/definitions/FlexibleServerOperationListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/FlexibleServerCloudError" } } } @@ -1013,7 +1013,7 @@ } }, "definitions": { - "ServerVersion": { + "FlexibleServerVersion": { "type": "string", "description": "The version of a server.", "enum": [ @@ -1024,7 +1024,7 @@ "modelAsString": true } }, - "ServerProperties": { + "FlexibleServerProperties": { "properties": { "administratorLogin": { "type": "string", @@ -1045,7 +1045,7 @@ ] }, "version": { - "$ref": "#/definitions/ServerVersion", + "$ref": "#/definitions/FlexibleServerVersion", "description": "PostgreSQL Server version." }, "state": { @@ -1093,7 +1093,7 @@ "description": "The display name of a server." }, "storageProfile": { - "$ref": "#/definitions/StorageProfile", + "$ref": "#/definitions/FlexibleServerStorageProfile", "description": "Storage profile of a server." }, "publicNetworkAccess": { @@ -1148,23 +1148,33 @@ "x-ms-enum": { "name": "CreateMode", "modelAsString": true - } + }, + "x-ms-mutability": [ + "create" + ] + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Application-specific metadata in the form of key-value pairs." } }, "description": "The properties of a server." }, - "Server": { + "FlexibleServer": { "properties": { "identity": { "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Identity", "description": "The Azure Active Directory identity of the server." }, "sku": { - "$ref": "#/definitions/Sku", + "$ref": "#/definitions/FlexibleServerSku", "description": "The SKU (pricing tier) of the server." }, "properties": { - "$ref": "#/definitions/ServerProperties", + "$ref": "#/definitions/FlexibleServerProperties", "x-ms-client-flatten": true, "description": "Properties of the server." } @@ -1176,49 +1186,41 @@ ], "description": "Represents a server." }, - "ServerPropertiesForUpdate": { + "FlexibleServerPropertiesForUpdate": { "properties": { "administratorLoginPassword": { "type": "string", "format": "password", "description": "The password of the administrator login." }, - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "PostgreSQL Server version." - }, "vCores": { "type": "integer", "format": "int32", "description": "Max compute of a server is 64vCores." }, "storageProfile": { - "$ref": "#/definitions/StorageProfile", + "$ref": "#/definitions/FlexibleServerStorageProfile", "description": "Storage profile of a server." }, "standbyCount": { "type": "integer", "format": "int32", "description": "stand by count value can be either 0 or 1" - }, - "serverEdition": { - "type": "string", - "description": "server edition default to general purpose" } } }, - "ServerForUpdate": { + "FlexibleServerForUpdate": { "properties": { "location": { "type": "string", "description": "The location the resource resides in." }, "sku": { - "$ref": "#/definitions/Sku", + "$ref": "#/definitions/FlexibleServerSku", "description": "The SKU (pricing tier) of the server." }, "properties": { - "$ref": "#/definitions/ServerPropertiesForUpdate", + "$ref": "#/definitions/FlexibleServerPropertiesForUpdate", "x-ms-client-flatten": false, "description": "Properties of the server." }, @@ -1232,15 +1234,15 @@ }, "description": "Represents a server to be updated." }, - "ServerListResult": { + "FlexibleServerListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" }, - "description": "The list of servers" + "description": "The list of flexible servers" }, "nextLink": { "description": "The link used to get the next page of operations.", @@ -1249,7 +1251,7 @@ }, "description": "A list of servers." }, - "StorageProfile": { + "FlexibleServerStorageProfile": { "properties": { "backupRetentionDays": { "type": "integer", @@ -1264,7 +1266,7 @@ }, "description": "Storage Profile properties of a server" }, - "Sku": { + "FlexibleServerSku": { "properties": { "name": { "type": "string", @@ -1292,7 +1294,7 @@ }, "description": "Sku information related properties of a server." }, - "FirewallRuleProperties": { + "FlexibleServerFirewallRuleProperties": { "properties": { "startIpAddress": { "type": "string", @@ -1311,10 +1313,10 @@ ], "description": "The properties of a server firewall rule." }, - "FirewallRule": { + "FlexibleServerFirewallRule": { "properties": { "properties": { - "$ref": "#/definitions/FirewallRuleProperties", + "$ref": "#/definitions/FlexibleServerFirewallRuleProperties", "x-ms-client-flatten": true, "description": "The properties of a firewall rule." } @@ -1329,13 +1331,13 @@ ], "description": "Represents a server firewall rule." }, - "FirewallRuleListResult": { + "FlexibleServerFirewallRuleListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" }, "description": "The list of firewall rules in a server." }, @@ -1346,7 +1348,7 @@ }, "description": "A list of firewall rules." }, - "CustomerMaintenanceWindowProperties": { + "FlexibleServerCustomerMaintenanceWindowProperties": { "properties": { "dayOfWeek": { "type": "integer", @@ -1376,10 +1378,10 @@ ], "description": "The properties of a server firewall rule." }, - "CustomerMaintenanceWindow": { + "FlexibleServerCustomerMaintenanceWindow": { "properties": { "properties": { - "$ref": "#/definitions/CustomerMaintenanceWindowProperties", + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindowProperties", "x-ms-client-flatten": true, "description": "The properties of a customer maintenance window." } @@ -1394,19 +1396,19 @@ ], "description": "Represents a server firewall rule." }, - "CustomerMaintenanceWindowListResult": { + "FlexibleServerCustomerMaintenanceWindowListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/CustomerMaintenanceWindow" + "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" }, "description": "The list of CustomerMaintenanceWindows in a PostgreSQL server." } }, "description": "A list of firewall rules." }, - "ConfigurationProperties": { + "FlexibleServerConfigurationProperties": { "properties": { "value": { "type": "string", @@ -1449,10 +1451,10 @@ }, "description": "The properties of a configuration." }, - "Configuration": { + "FlexibleServerConfiguration": { "properties": { "properties": { - "$ref": "#/definitions/ConfigurationProperties", + "$ref": "#/definitions/FlexibleServerConfigurationProperties", "x-ms-client-flatten": true, "description": "The properties of a configuration." } @@ -1464,13 +1466,13 @@ ], "description": "Represents a Configuration." }, - "ConfigurationListResult": { + "FlexibleServerConfigurationListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/Configuration" + "$ref": "#/definitions/FlexibleServerConfiguration" }, "description": "The list of server configurations." }, @@ -1481,7 +1483,7 @@ }, "description": "A list of server configurations." }, - "OperationDisplay": { + "FlexibleServerOperationDisplay": { "properties": { "provider": { "type": "string", @@ -1506,7 +1508,7 @@ }, "description": "Display metadata associated with the operation." }, - "Operation": { + "FlexibleServerOperation": { "properties": { "name": { "type": "string", @@ -1514,7 +1516,7 @@ "description": "The name of the operation being performed on this particular object." }, "display": { - "$ref": "#/definitions/OperationDisplay", + "$ref": "#/definitions/FlexibleServerOperationDisplay", "readOnly": true, "description": "The localized display information for this particular operation or action." }, @@ -1544,19 +1546,19 @@ }, "description": "REST API operation definition." }, - "OperationListResult": { + "FlexibleServerOperationListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/Operation" + "$ref": "#/definitions/FlexibleServerOperation" }, "description": "The list of resource provider operations." } }, "description": "A list of resource provider operations." }, - "NameAvailabilityRequest": { + "FlexibleServerNameAvailabilityRequest": { "required": [ "name" ], @@ -1572,7 +1574,7 @@ }, "description": "Request from client to check resource name availability." }, - "NameAvailability": { + "FlexibleServerNameAvailability": { "properties": { "message": { "type": "string", @@ -1593,7 +1595,7 @@ }, "description": "Represents a resource name availability." }, - "CloudError": { + "FlexibleServerCloudError": { "x-ms-external": true, "properties": { "error": { @@ -1604,7 +1606,7 @@ } }, "parameters": { - "ServerNameParameter": { + "FlexibleServerNameParameter": { "name": "serverName", "in": "path", "required": true, @@ -1612,7 +1614,7 @@ "description": "The name of the server.", "x-ms-parameter-location": "method" }, - "FirewallRuleNameParameter": { + "FlexibleServerFirewallRuleNameParameter": { "name": "firewallRuleName", "in": "path", "required": true, @@ -1620,7 +1622,7 @@ "description": "The name of the server firewall rule.", "x-ms-parameter-location": "method" }, - "ConfigurationNameParameter": { + "FlexibleServerConfigurationNameParameter": { "name": "configurationName", "in": "path", "required": true, @@ -1628,7 +1630,7 @@ "description": "The name of the server configuration.", "x-ms-parameter-location": "method" }, - "MaintenanceWindowNameParameter": { + "FlexibleServerMaintenanceWindowNameParameter": { "name": "maintenanceWindowName", "in": "path", "required": true, diff --git a/specification/postgresql/resource-manager/readme.md b/specification/postgresql/resource-manager/readme.md index fff38f5d4148..158ffc2ea1a1 100644 --- a/specification/postgresql/resource-manager/readme.md +++ b/specification/postgresql/resource-manager/readme.md @@ -39,6 +39,11 @@ These settings apply only when `--tag=package-2020-02-14-privatepreview` is spec ``` yaml $(tag) == 'package-2020-02-14-privatepreview' input-file: - Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +- Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json +- Microsoft.DBforPostgreSQL/stable/2018-06-01/PrivateEndpointConnections.json +- Microsoft.DBforPostgreSQL/stable/2018-06-01/PrivateLinkResources.json +- Microsoft.DBforPostgreSQL/stable/2020-01-01/DataEncryptionKeys.json +- Microsoft.DBforPostgreSQL/stable/2020-01-01/ServerSecurityAlertPolicies.json ``` ### Tag: package-2020-01-01-privatepreview From 26cf293b9191a89c6149420eada3724cf05ccd61 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 4 Aug 2020 17:42:37 -0700 Subject: [PATCH 02/40] Rename Flexible Operations List operation id. --- .../preview/2020-02-14-privatepreview/postgresql.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 4204738fb6f2..3d7bd3717368 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json @@ -983,7 +983,7 @@ "tags": [ "Operations" ], - "operationId": "Operations_List", + "operationId": "FlexibleServerOperations_List", "x-ms-examples": { "OperationList": { "$ref": "./examples/OperationList.json" From ba16ec93dc3cbe72180356885626c0b098ddd795 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 4 Aug 2020 18:24:37 -0700 Subject: [PATCH 03/40] Fixed the skutier and Delete operaton --- .../preview/2020-02-14-privatepreview/postgresql.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 3d7bd3717368..1aaf6b7dd7cf 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json @@ -515,7 +515,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FirewallRules_Delete", + "operationId": "FlexibleServerFirewallRules_Delete", "x-ms-examples": { "FirewallRuleDelete": { "$ref": "./examples/FirewallRuleDelete.json" @@ -1281,7 +1281,7 @@ "MemoryOptimized" ], "x-ms-enum": { - "name": "SkuTier", + "name": "FlexibleServerSkuTier", "modelAsString": true } }, From af160048f019760d484664b6beb6f8a9d7e1080c Mon Sep 17 00:00:00 2001 From: Suna Liu Date: Thu, 16 Jul 2020 18:25:47 +0800 Subject: [PATCH 04/40] Added swagger files for MySQL Flexible Server preview --- .../examples/CheckNameAvailability.json | 19 + .../examples/ConfigurationGet.json | 28 + .../examples/ConfigurationsListByServer.json | 91 + .../examples/ConfigurationsUpdate.json | 65 + .../examples/DatabaseCreate.json | 40 + .../examples/DatabaseDelete.json | 14 + .../examples/DatabaseGet.json | 22 + .../examples/DatabasesListByServer.json | 34 + .../examples/FirewallRuleCreate.json | 40 + .../examples/FirewallRuleDelete.json | 14 + .../examples/FirewallRuleGet.json | 22 + .../examples/FirewallRulesListByServer.json | 34 + .../examples/MaintenanceWindowCreate.json | 46 + .../examples/MaintenanceWindowDelete.json | 14 + .../examples/MaintenanceWindowGet.json | 24 + .../MaintenanceWindowsListByServer.json | 27 + .../examples/OperationsList.json | 217 ++ .../examples/ReplicasListByServer.json | 103 + .../examples/ServerCreate.json | 89 + .../examples/ServerCreateReplica.json | 80 + .../ServerCreateWithPointInTimeRestore.json | 82 + .../examples/ServerDelete.json | 13 + .../examples/ServerGet.json | 42 + .../examples/ServerGetWithVnet.json | 47 + .../examples/ServerRestart.json | 12 + .../examples/ServerStart.json | 12 + .../examples/ServerStop.json | 12 + .../examples/ServerUpdate.json | 45 + .../examples/ServersList.json | 83 + .../examples/ServersListByResourceGroup.json | 61 + .../2020-07-01-privatepreview/mysql.json | 2145 +++++++++++++++++ .../mysql/resource-manager/readme.md | 9 + 32 files changed, 3586 insertions(+) create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CheckNameAvailability.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationGet.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsListByServer.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsUpdate.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabaseCreate.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabaseDelete.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabaseGet.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabasesListByServer.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRuleCreate.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRuleDelete.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRuleGet.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRulesListByServer.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowCreate.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowDelete.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowGet.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowsListByServer.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/OperationsList.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ReplicasListByServer.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreate.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateReplica.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateWithPointInTimeRestore.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerDelete.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerRestart.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerStart.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerStop.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdate.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersList.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersListByResourceGroup.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CheckNameAvailability.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CheckNameAvailability.json new file mode 100644 index 000000000000..aa0844b5f22f --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CheckNameAvailability.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "nameAvailabilityRequest": { + "name": "name1", + "type": "Microsoft.DBforMySQL" + } + }, + "responses": { + "200": { + "body": { + "nameAvailable": true, + "message": "", + "reason": "" + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationGet.json new file mode 100644 index 000000000000..9aba78a89497 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationGet.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "configurationName": "event_scheduler", + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "properties": { + "value": "ON", + "description": "Indicates the status of the Event Scheduler.", + "defaultValue": "OFF", + "dataType": "Enumeration", + "allowedValues": "ON,OFF,DISABLED", + "source": "user-override", + "isConfigPendingRestart": "False", + "isDynamicConfig": "True" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver/configurations/event_scheduler", + "name": "event_scheduler", + "type": "Microsoft.DBforMySQL/flexibleServers/configurations" + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsListByServer.json new file mode 100644 index 000000000000..911e54400e0a --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsListByServer.json @@ -0,0 +1,91 @@ +{ + "parameters": { + "serverName": "mysqltestsvc1", + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "value": "OFF", + "description": "Indicates the status of the Event Scheduler.", + "defaultValue": "OFF", + "dataType": "Enumeration", + "allowedValues": "ON,OFF,DISABLED", + "source": "system-default", + "isConfigPendingRestart": "False", + "isDynamicConfig": "True" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltestsvc1/configurations/event_scheduler", + "name": "event_scheduler", + "type": "Microsoft.DBforMySQL/flexibleServers/configurations" + }, + { + "properties": { + "value": "4", + "description": "Number of digits by which to increase the scale of the result of division operations.", + "defaultValue": "4", + "dataType": "Integer", + "allowedValues": "0-30", + "source": "system-default", + "isConfigPendingRestart": "False", + "isDynamicConfig": "True" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltestsvc1/configurations/div_precision_increment", + "name": "div_precision_increment", + "type": "Microsoft.DBforMySQL/flexibleServers/configurations" + }, + { + "properties": { + "value": "1024", + "description": "Maximum allowed result length in bytes for the GROUP_CONCAT().", + "defaultValue": "1024", + "dataType": "Integer", + "allowedValues": "4-16777216", + "source": "system-default", + "isConfigPendingRestart": "False", + "isDynamicConfig": "True" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltestsvc1/configurations/group_concat_max_len", + "name": "group_concat_max_len", + "type": "Microsoft.DBforMySQL/flexibleServers/configurations" + }, + { + "properties": { + "value": "ON", + "description": "Whether innodb adaptive hash indexes are enabled or disabled.", + "defaultValue": "ON", + "dataType": "Enumeration", + "allowedValues": "ON,OFF", + "source": "system-default", + "isConfigPendingRestart": "False", + "isDynamicConfig": "True" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltestsvc1/configurations/innodb_adaptive_hash_index", + "name": "innodb_adaptive_hash_index", + "type": "Microsoft.DBforMySQL/flexibleServers/configurations" + }, + { + "properties": { + "value": "50", + "description": "The length of time in seconds an InnoDB transaction waits for a row lock before giving up.", + "defaultValue": "50", + "dataType": "Integer", + "allowedValues": "1-3600", + "source": "system-default", + "isConfigPendingRestart": "False", + "isDynamicConfig": "True" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltestsvc1/configurations/innodb_lock_wait_timeout", + "name": "innodb_lock_wait_timeout", + "type": "Microsoft.DBforMySQL/flexibleServers/configurations" + } + ] + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsUpdate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsUpdate.json new file mode 100644 index 000000000000..77508fdbe8b2 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsUpdate.json @@ -0,0 +1,65 @@ +{ + "parameters": { + "serverName": "testserver", + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "value": [ + { + "name": "event_scheduler", + "properties": { + "value": "ON", + "source": "user-override" + } + }, + { + "name": "wait_timeout", + "properties": { + "value": "3600", + "source": "user-override" + } + } + ] + } + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "value": "ON", + "description": "Indicates the status of the Event Scheduler.", + "defaultValue": "OFF", + "dataType": "Enumeration", + "allowedValues": "ON,OFF,DISABLED", + "source": "user-override", + "isConfigPendingRestart": "False", + "isDynamicConfig": "True" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/testserver/configurations/event_scheduler", + "name": "event_scheduler", + "type": "Microsoft.DBforMySQL/flexibleServers/configurations" + }, + { + "properties": { + "value": "3600", + "description": "The number of seconds the server waits for activity on a noninteractive connection before closing it.", + "defaultValue": "120", + "dataType": "Integer", + "allowedValues": "60-86400", + "source": "user-override", + "isConfigPendingRestart": "False", + "isDynamicConfig": "True" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/testserver/configurations/wait_timeout", + "name": "wait_timeout", + "type": "Microsoft.DBforMySQL/flexibleServers/configurations" + } + ] + } + }, + "202": {} + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabaseCreate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabaseCreate.json new file mode 100644 index 000000000000..7c5ce7433497 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabaseCreate.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "databaseName": "db1", + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "charset": "utf8", + "collation": "utf8_general_ci" + } + } + }, + "responses": { + "201": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver/databases/db1", + "name": "db1", + "type": "Microsoft.DBforMySQL/flexibleServers/databases", + "properties": { + "charset": "utf8", + "collation": "utf8_general_ci" + } + } + }, + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver/databases/db1", + "name": "db1", + "type": "Microsoft.DBforMySQL/flexibleServers/databases", + "properties": { + "charset": "utf8", + "collation": "utf8_general_ci" + } + } + }, + "202": {} + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabaseDelete.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabaseDelete.json new file mode 100644 index 000000000000..0cea2a749897 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabaseDelete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "databaseName": "db1", + "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/DatabaseGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabaseGet.json new file mode 100644 index 000000000000..4a0c51486617 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabaseGet.json @@ -0,0 +1,22 @@ +{ + "parameters": { + "databaseName": "db1", + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver/databases/db1", + "name": "db1", + "type": "Microsoft.DBforMySQL/flexibleServers/databases", + "properties": { + "charset": "utf8", + "collation": "utf8_general_ci" + } + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabasesListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabasesListByServer.json new file mode 100644 index 000000000000..f4c905a6416f --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/DatabasesListByServer.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver/databases/db1", + "name": "db1", + "type": "Microsoft.DBforMySQL/flexibleServers/databases", + "properties": { + "charset": "utf8", + "collation": "utf8_general_ci" + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver/databases/db2", + "name": "db2", + "type": "Microsoft.DBforMySQL/flexibleServers/databases", + "properties": { + "charset": "utf8", + "collation": "utf8_general_ci" + } + } + ] + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRuleCreate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRuleCreate.json new file mode 100644 index 000000000000..32033729928a --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRuleCreate.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "firewallRuleName": "rule1", + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "startIpAddress": "0.0.0.0", + "endIpAddress": "255.255.255.255" + } + } + }, + "responses": { + "201": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver/firewallRules/rule1", + "name": "rule1", + "type": "Microsoft.DBforMySQL/flexibleServers/firewallRules", + "properties": { + "startIpAddress": "0.0.0.0", + "endIpAddress": "255.255.255.255" + } + } + }, + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver/firewallRules/rule1", + "name": "rule1", + "type": "Microsoft.DBforMySQL/flexibleServers/firewallRules", + "properties": { + "startIpAddress": "0.0.0.0", + "endIpAddress": "255.255.255.255" + } + } + }, + "202": {} + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRuleDelete.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRuleDelete.json new file mode 100644 index 000000000000..03cd8a8ae18d --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRuleDelete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "firewallRuleName": "rule1", + "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/FirewallRuleGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRuleGet.json new file mode 100644 index 000000000000..9552656bc388 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRuleGet.json @@ -0,0 +1,22 @@ +{ + "parameters": { + "firewallRuleName": "rule1", + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver/firewallRules/rule1", + "name": "rule1", + "type": "Microsoft.DBforMySQL/flexibleServers/firewallRules", + "properties": { + "startIpAddress": "0.0.0.0", + "endIpAddress": "255.255.255.255" + } + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRulesListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRulesListByServer.json new file mode 100644 index 000000000000..98e8a3db4b98 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/FirewallRulesListByServer.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver/firewallRules/rule1", + "name": "rule1", + "type": "Microsoft.DBforMySQL/flexibleServers/firewallRules", + "properties": { + "startIpAddress": "0.0.0.0", + "endIpAddress": "255.255.255.255" + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver/firewallRules/rule2", + "name": "rule2", + "type": "Microsoft.DBforMySQL/flexibleServers/firewallRules", + "properties": { + "startIpAddress": "1.0.0.0", + "endIpAddress": "255.0.0.0" + } + } + ] + } + } + } +} 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 new file mode 100644 index 000000000000..0b1c4f6aba78 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowCreate.json @@ -0,0 +1,46 @@ +{ + "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": {} + } +} \ No newline at end of file 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 new file mode 100644 index 000000000000..9a4a9ce069ad --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowDelete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "maintenanceWindowName": "customerMaintenanceWindow", + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} \ No newline at end of file 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 new file mode 100644 index 000000000000..536e92fee202 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowGet.json @@ -0,0 +1,24 @@ +{ + "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" + } + } + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowsListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowsListByServer.json new file mode 100644 index 000000000000..7388b9c9a29d --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowsListByServer.json @@ -0,0 +1,27 @@ +{ + "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.DBforMySQL/flexibleServers/testserver/maintenanceWindows/customerMaintenanceWindow", + "name": "customerMaintenanceWindow", + "properties": { + "dayOfWeek": 1, + "startHour": 0, + "startMinute": 30, + "durationInMinutes": 30 + }, + "type": "Microsoft.DBforMySQL/flexibleServers/maintenanceWindows" + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/OperationsList.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/OperationsList.json new file mode 100644 index 000000000000..850bf4852be2 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/OperationsList.json @@ -0,0 +1,217 @@ +{ + "parameters": { + "api-version": "2020-07-01-privatepreview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.DBforMySQL/locations/performanceTiers/read", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "Performance Tiers", + "operation": "List Performance Tiers", + "description": "Returns the list of Performance Tiers available." + } + }, + { + "name": "Microsoft.DBforMySQL/flexibleServers/firewallRules/read", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "Firewall Rules", + "operation": "List/Get Firewall Rules", + "description": "Return the list of firewall rules for a server or gets the properties for the specified firewall rule." + } + }, + { + "name": "Microsoft.DBforMySQL/flexibleServers/firewallRules/write", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "Firewall Rules", + "operation": "Create/Update Firewall Rule", + "description": "Creates a firewall rule with the specified parameters or update an existing rule." + } + }, + { + "name": "Microsoft.DBforMySQL/flexibleServers/firewallRules/delete", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "Firewall Rules", + "operation": "Delete Firewall Rule", + "description": "Deletes an existing firewall rule." + } + }, + { + "name": "Microsoft.DBforMySQL/flexibleServers/read", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "MySQL Server", + "operation": "List/Get MySQL Servers", + "description": "Return the list of servers or gets the properties for the specified server." + } + }, + { + "name": "Microsoft.DBforMySQL/flexibleServers/write", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "MySQL Server", + "operation": "Create/Update MySQL Server", + "description": "Creates a server with the specified parameters or update the properties or tags for the specified server." + } + }, + { + "name": "Microsoft.DBforMySQL/flexibleServers/delete", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "MySQL Server", + "operation": "Delete MySQL Server", + "description": "Deletes an existing server." + } + }, + { + "name": "Microsoft.DBforMySQL/performanceTiers/read", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "Performance Tiers", + "operation": "List Performance Tiers", + "description": "Returns the list of Performance Tiers available." + } + }, + { + "name": "Microsoft.DBforMySQL/flexibleServers/recoverableServers/read", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "Recoverable MySQL Server", + "operation": "Get Recoverable MySQL Server info", + "description": "Return the recoverable MySQL Server info" + } + }, + { + "name": "Microsoft.DBforMySQL/flexibleServers/providers/Microsoft.Insights/metricDefinitions/read", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "Database Metric Definition", + "operation": "Get database metric definitions", + "description": "Return types of metrics that are available for databases" + }, + "properties": { + "serviceSpecification": { + "metricSpecifications": [ + { + "name": "cpu_percent", + "displayName": "CPU percent", + "displayDescription": "CPU percent", + "unit": "Percent", + "aggregationType": "Average", + "fillGapWithZero": true + }, + { + "name": "memory_percent", + "displayName": "Memory percent", + "displayDescription": "Memory percent", + "unit": "Percent", + "aggregationType": "Average", + "fillGapWithZero": true + }, + { + "name": "io_consumption_percent", + "displayName": "IO percent", + "displayDescription": "IO percent", + "unit": "Percent", + "aggregationType": "Average", + "fillGapWithZero": true + }, + { + "name": "storage_percent", + "displayName": "Storage percentage", + "displayDescription": "Storage percentage", + "unit": "Percent", + "aggregationType": "Average" + }, + { + "name": "storage_used", + "displayName": "Storage used", + "displayDescription": "Storage used", + "unit": "Bytes", + "aggregationType": "Average" + }, + { + "name": "storage_limit", + "displayName": "Storage limit", + "displayDescription": "Storage limit", + "unit": "Bytes", + "aggregationType": "Average" + }, + { + "name": "serverlog_storage_percent", + "displayName": "Server Log storage percent", + "displayDescription": "Server Log storage percent", + "unit": "Percent", + "aggregationType": "Average" + }, + { + "name": "serverlog_storage_usage", + "displayName": "Server Log storage used", + "displayDescription": "Server Log storage used", + "unit": "Bytes", + "aggregationType": "Average" + }, + { + "name": "serverlog_storage_limit", + "displayName": "Server Log storage limit", + "displayDescription": "Server Log storage limit", + "unit": "Bytes", + "aggregationType": "Average" + }, + { + "name": "active_connections", + "displayName": "Total active connections", + "displayDescription": "Total active connections", + "unit": "Count", + "aggregationType": "Average", + "fillGapWithZero": true + }, + { + "name": "connections_failed", + "displayName": "Total failed connections", + "displayDescription": "Total failed connections", + "unit": "Count", + "aggregationType": "Average", + "fillGapWithZero": true + }, + { + "name": "seconds_behind_master", + "displayName": "Replication lag in seconds", + "displayDescription": "Replication lag in seconds", + "unit": "Count", + "aggregationType": "Average", + "fillGapWithZero": true + } + ] + } + } + }, + { + "name": "Microsoft.DBforMySQL/flexibleServers/providers/Microsoft.Insights/diagnosticSettings/read", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "Database Metric Definition", + "operation": "Read diagnostic setting", + "description": "Gets the disagnostic setting for the resource" + } + }, + { + "name": "Microsoft.DBforMySQL/flexibleServers/providers/Microsoft.Insights/diagnosticSettings/write", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "Database Metric Definition", + "operation": "Write diagnostic setting", + "description": "Creates or updates the diagnostic setting for the resource" + } + } + ] + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ReplicasListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ReplicasListByServer.json new file mode 100644 index 000000000000..42c8fceea849 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ReplicasListByServer.json @@ -0,0 +1,103 @@ +{ + "parameters": { + "serverName": "testprimary", + "resourceGroupName": "TestGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver", + "name": "testserver", + "type": "Microsoft.DBforMySQL/flexibleServers", + "location": "northeurope", + "tags": { + "elasticServer": "1" + }, + "sku": { + "name": "Standard_D12_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "storageProfile": { + "storageMB": 256000, + "storageIOps": 200, + "backupRetentionDays": 35 + }, + "administratorLogin": "cloudsa", + "sslEnforcement": "Enabled", + "publicNetworkAccess": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "testserver.mysql.database.azure.com", + "version": "5.7", + "replicationRole": "Replica", + "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testprimary", + "replicaCapacity": 0 + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver1", + "name": "testserver1", + "type": "Microsoft.DBforMySQL/flexibleServers", + "location": "northeurope", + "tags": { + "elasticServer": "1" + }, + "sku": { + "name": "Standard_D12_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "storageProfile": { + "storageMB": 256000, + "storageIOps": 200, + "backupRetentionDays": 35 + }, + "administratorLogin": "cloudsa", + "sslEnforcement": "Enabled", + "publicNetworkAccess": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "testserver1.mysql.database.azure.com", + "version": "5.7", + "replicationRole": "Replica", + "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testprimary", + "replicaCapacity": 0 + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver2", + "name": "testserver2", + "type": "Microsoft.DBforMySQL/flexibleServers", + "location": "northeurope", + "tags": { + "elasticServer": "1" + }, + "sku": { + "name": "Standard_D12_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "storageProfile": { + "storageMB": 256000, + "storageIOps": 200, + "backupRetentionDays": 35 + }, + "administratorLogin": "cloudsa", + "sslEnforcement": "Enabled", + "publicNetworkAccess": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "testserver2.mysql.database.azure.com", + "version": "5.7", + "replicationRole": "Replica", + "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testprimary", + "replicaCapacity": 0 + } + } + ] + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreate.json new file mode 100644 index 000000000000..17c588c0504e --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreate.json @@ -0,0 +1,89 @@ +{ + "parameters": { + "serverName": "mysqltestsvc4", + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "location": "westus", + "properties": { + "administratorLogin": "cloudsa", + "administratorLoginPassword": "pass$w0rd", + "sslEnforcement": "Enabled", + "publicNetworkAccess": "Enabled", + "storageProfile": { + "storageMB": 128000, + "storageIOps": 200, + "backupRetentionDays": 7 + }, + "createMode": "Default" + }, + "sku": { + "name": "Standard_D14_v2", + "tier": "GeneralPurpose" + }, + "tags": { + "ElasticServer": "1" + } + } + }, + "responses": { + "201": { + "body": { + "sku": { + "name": "Standard_D14_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "storageIOps": 200, + "backupRetentionDays": 7 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "publicNetworkAccess": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com" + }, + "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" + } + }, + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltestsvc4", + "name": "mysqltestsvc4", + "type": "Microsoft.DBforMySQL/flexibleServers", + "location": "westus", + "sku": { + "name": "Standard_D14_v2", + "tier": "GeneralPurpose" + }, + "tags": { + "elasticServer": "1" + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "storageIOps": 200, + "backupRetentionDays": 7 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "publicNetworkAccess": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com" + } + } + }, + "202": {} + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateReplica.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateReplica.json new file mode 100644 index 000000000000..3c6fd9ecee60 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateReplica.json @@ -0,0 +1,80 @@ +{ + "parameters": { + "serverName": "targetserver", + "resourceGroupName": "TargetResourceGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "location": "westus", + "properties": { + "createMode": "Replica", + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/PrimaryResourceGroup/providers/Microsoft.DBforMySQL/flexibleServers/primaryserver" + } + } + }, + "responses": { + "201": { + "body": { + "sku": { + "name": "Standard_D14_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "storageIOps": 200, + "backupRetentionDays": 14 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "publicNetworkAccess": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com", + "replicationRole": "Replica", + "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/PrimaryResourceGroup/providers/Microsoft.DBforMySQL/flexibleServers/primaryserver", + "replicaCapacity": 0 + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TargetResourceGroup/providers/Microsoft.DBforMySQL/flexibleServers/targetserver", + "name": "targetserver", + "type": "Microsoft.DBforMySQL/flexibleServers" + } + }, + "200": { + "body": { + "sku": { + "name": "Standard_D14_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "storageIOps": 200, + "backupRetentionDays": 14 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "publicNetworkAccess": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com", + "replicationRole": "Replica", + "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/PrimaryResourceGroup/providers/Microsoft.DBforMySQL/flexibleServers/primaryserver", + "replicaCapacity": 0 + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TargetResourceGroup/providers/Microsoft.DBforMySQL/flexibleServers/targetserver", + "name": "targetserver", + "type": "Microsoft.DBforMySQL/flexibleServers" + } + }, + "202": {} + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateWithPointInTimeRestore.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateWithPointInTimeRestore.json new file mode 100644 index 000000000000..0f7ebe2f7be6 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateWithPointInTimeRestore.json @@ -0,0 +1,82 @@ +{ + "parameters": { + "serverName": "targetserver", + "resourceGroupName": "TargetResourceGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "location": "brazilsouth", + "properties": { + "restorePointInTime": "2017-12-14T00:00:37.467Z", + "createMode": "PointInTimeRestore", + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/SourceResourceGroup/providers/Microsoft.DBforMySQL/flexibleServers/sourceserver" + }, + "sku": { + "name": "Standard_D14_v2", + "tier": "GeneralPurpose" + }, + "tags": { + "ElasticServer": "1" + } + } + }, + "responses": { + "201": { + "body": { + "sku": { + "name": "Standard_D14_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "storageIOps": 200, + "backupRetentionDays": 7 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "publicNetworkAccess": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com" + }, + "location": "brazilsouth", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/targetserver", + "name": "targetserver", + "type": "Microsoft.DBforMySQL/flexibleServers" + } + }, + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/targetserver", + "name": "targetserver", + "type": "Microsoft.DBforMySQL/flexibleServers", + "location": "brazilsouth", + "sku": { + "name": "Standard_D14_v2", + "tier": "GeneralPurpose" + }, + "tags": { + "elasticServer": "1" + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "storageIOps": 200, + "backupRetentionDays": 7 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "publicNetworkAccess": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com" + } + } + }, + "202": {} + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerDelete.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerDelete.json new file mode 100644 index 000000000000..11f8c32f160e --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerDelete.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "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/ServerGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json new file mode 100644 index 000000000000..0f7a328ee264 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "serverName": "mysqltestsvc4", + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "sku": { + "name": "Standard_D14_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "storageIOps": 200, + "backupRetentionDays": 7 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com", + "replicationRole": "None", + "primaryServerId": "", + "replicaCapacity": 5, + "publicNetworkAccess": "Enabled", + "standbyCount": 0 + }, + "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" + } + } + } +} 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 new file mode 100644 index 000000000000..dc5ef3257b0a --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "serverName": "mysqltestsrv", + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "sku": { + "name": "Standard_D12_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "storageIOps": 200, + "backupRetentionDays": 7 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "mysqltestsrv.mysql.database.azure.com", + "replicationRole": "None", + "primaryServerId": "", + "replicaCapacity": 5, + "publicNetworkAccess": "Enabled", + "standbyCount": 0, + "vnetInjArgs": { + "delegatedSubnetName": "test-subnet", + "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", + "delegatedVnetName": "test-vnet" + } + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltestsrv", + "name": "mysqltestsrv", + "type": "Microsoft.DBforMySQL/flexibleServers" + } + } + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerRestart.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerRestart.json new file mode 100644 index 000000000000..3d861c30dec3 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerRestart.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {} + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerStart.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerStart.json new file mode 100644 index 000000000000..3d861c30dec3 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerStart.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {} + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerStop.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerStop.json new file mode 100644 index 000000000000..3d861c30dec3 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerStop.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {} + } +} 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 new file mode 100644 index 000000000000..c042adec2a3d --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdate.json @@ -0,0 +1,45 @@ +{ + "parameters": { + "serverName": "mysqltestsvc4", + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "administratorLoginPassword": "newpa$$w0rd", + "sslEnforcement": "Disabled", + "publicNetworkAccess": "Disabled" + } + } + }, + "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" + }, + "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/examples/ServersList.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersList.json new file mode 100644 index 000000000000..1f2c6f7c3373 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersList.json @@ -0,0 +1,83 @@ +{ + "parameters": { + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "sku": { + "name": "Standard_D12_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "testuser", + "storageProfile": { + "storageMB": 5120, + "storageIOps": 200, + "backupRetentionDays": 7 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "mysqltestsvc1.mysql.database.azure.com", + "publicNetworkAccess": "Enabled" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltestsvc1", + "name": "mysqltestsvc1", + "type": "Microsoft.DBforMySQL/flexibleServers" + }, + { + "sku": { + "name": "Standard_D12_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "testuser", + "storageProfile": { + "storageMB": 5120, + "storageIOps": 200, + "backupRetentionDays": 7 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "mysqltstsvc2.mysql.database.azure.com", + "publicNetworkAccess": "Enabled" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltstsvc2", + "name": "mysqltstsvc2", + "type": "Microsoft.DBforMySQL/flexibleServers" + }, + { + "sku": { + "name": "Standard_D13_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "testuser", + "storageProfile": { + "storageMB": 102400, + "storageIOps": 200, + "backupRetentionDays": 35 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "mysqltestsvc3.mysql.database.azure.com", + "publicNetworkAccess": "Enabled" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg1/providers/Microsoft.DBforMySQL/flexibleServers/mysqltestsvc3", + "name": "mysqltestsvc3", + "type": "Microsoft.DBforMySQL/flexibleServers" + } + ] + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersListByResourceGroup.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersListByResourceGroup.json new file mode 100644 index 000000000000..a2b253402604 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersListByResourceGroup.json @@ -0,0 +1,61 @@ +{ + "parameters": { + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "sku": { + "name": "Standard_D12_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "testuser", + "storageProfile": { + "storageMB": 5120, + "storageIOps": 200, + "backupRetentionDays": 7 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "mysqltestsvc1.mysql.database.azure.com", + "publicNetworkAccess": "Enabled" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltestsvc1", + "name": "mysqltestsvc1", + "type": "Microsoft.DBforMySQL/flexibleServers" + }, + { + "sku": { + "name": "Standard_D13_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "testuser", + "storageProfile": { + "storageMB": 5120, + "storageIOps": 200, + "backupRetentionDays": 7 + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "state": "Ready", + "fullyQualifiedDomainName": "mysqltstsvc2.mysql.database.azure.com", + "publicNetworkAccess": "Enabled" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltstsvc2", + "name": "mysqltstsvc2", + "type": "Microsoft.DBforMySQL/flexibleServers" + } + ] + } + } + } +} 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 new file mode 100644 index 000000000000..18d27e621ea8 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json @@ -0,0 +1,2145 @@ +{ + "swagger": "2.0", + "info": { + "title": "MySQLServerManagementClient", + "description": "The Microsoft Azure management API provides create, read, update, and delete functionality for Azure MySQL resources including servers, databases, firewall rules and configurations.", + "version": "2020-07-01-privatepreview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}": { + "put": { + "tags": [ + "Servers" + ], + "operationId": "Servers_Create", + "x-ms-examples": { + "Create a new server": { + "$ref": "./examples/ServerCreate.json" + }, + "Create a server as a point in time restore": { + "$ref": "./examples/ServerCreateWithPointInTimeRestore.json" + }, + "Create a replica server": { + "$ref": "./examples/ServerCreateReplica.json" + } + }, + "description": "Creates a new server or updates an existing server. The update action will overwrite the existing server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ServerForCreate" + }, + "description": "The required parameters for creating or updating a server." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Server" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/Server" + } + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true + }, + "patch": { + "tags": [ + "Servers" + ], + "operationId": "Servers_Update", + "x-ms-examples": { + "Update a server": { + "$ref": "./examples/ServerUpdate.json" + } + }, + "description": "Updates an existing server. The request body can contain one to many of the properties present in the normal server definition.", + "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" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ServerForUpdate" + }, + "description": "The required parameters for updating a server." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Server" + } + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true + }, + "delete": { + "tags": [ + "Servers" + ], + "operationId": "Servers_Delete", + "x-ms-examples": { + "Delete a server": { + "$ref": "./examples/ServerDelete.json" + } + }, + "description": "Deletes a server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "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 + }, + "get": { + "tags": [ + "Servers" + ], + "operationId": "Servers_Get", + "x-ms-examples": { + "Get a server": { + "$ref": "./examples/ServerGet.json" + }, + "Get a server with vnet": { + "$ref": "./examples/ServerGetWithVnet.json" + } + }, + "description": "Gets information about a server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Server" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers": { + "get": { + "tags": [ + "Servers" + ], + "operationId": "Servers_ListByResourceGroup", + "x-ms-examples": { + "List servers in a reource group": { + "$ref": "./examples/ServersListByResourceGroup.json" + } + }, + "description": "List all the servers in a given resource group.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DBforMySQL/flexibleServers": { + "get": { + "tags": [ + "Servers" + ], + "operationId": "Servers_List", + "x-ms-examples": { + "List servers in a subscription": { + "$ref": "./examples/ServersList.json" + } + }, + "description": "List all the servers in a given subscription.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/restart": { + "post": { + "tags": [ + "ServerRestart" + ], + "operationId": "Servers_Restart", + "x-ms-examples": { + "Restart a server": { + "$ref": "./examples/ServerRestart.json" + } + }, + "description": "Restarts a server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/start": { + "post": { + "tags": [ + "ServerStart" + ], + "operationId": "Servers_Start", + "x-ms-examples": { + "Start a server": { + "$ref": "./examples/ServerStart.json" + } + }, + "description": "Starts a server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/stop": { + "post": { + "tags": [ + "ServerStop" + ], + "operationId": "Servers_Stop", + "x-ms-examples": { + "Stop a server": { + "$ref": "./examples/ServerStop.json" + } + }, + "description": "Stops a server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/Replicas": { + "get": { + "tags": [ + "Servers" + ], + "operationId": "Replicas_ListByServer", + "x-ms-examples": { + "List replicas for a server": { + "$ref": "./examples/ReplicasListByServer.json" + } + }, + "description": "List all the replicas for a given server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/firewallRules/{firewallRuleName}": { + "put": { + "tags": [ + "FirewallRules" + ], + "operationId": "FirewallRules_CreateOrUpdate", + "x-ms-examples": { + "Create a firewall rule": { + "$ref": "./examples/FirewallRuleCreate.json" + } + }, + "description": "Creates a new firewall rule or updates an existing firewall rule.", + "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/FirewallRuleNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/FirewallRule" + }, + "description": "The required parameters for creating or updating a firewall rule." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FirewallRule" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/FirewallRule" + } + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true + }, + "delete": { + "tags": [ + "FirewallRules" + ], + "operationId": "FirewallRules_Delete", + "x-ms-examples": { + "Delete a firewall rule": { + "$ref": "./examples/FirewallRuleDelete.json" + } + }, + "description": "Deletes a firewall rule.", + "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/FirewallRuleNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "NoContent" + } + }, + "x-ms-long-running-operation": true + }, + "get": { + "tags": [ + "FirewallRules" + ], + "operationId": "FirewallRules_Get", + "x-ms-examples": { + "Get a firewall rule": { + "$ref": "./examples/FirewallRuleGet.json" + } + }, + "description": "Gets information about a server firewall rule.", + "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/FirewallRuleNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FirewallRule" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/firewallRules": { + "get": { + "tags": [ + "FirewallRules" + ], + "operationId": "FirewallRules_ListByServer", + "x-ms-examples": { + "List all firewall rules in a server": { + "$ref": "./examples/FirewallRulesListByServer.json" + } + }, + "description": "List all the firewall rules in a given server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FirewallRuleListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/databases/{databaseName}": { + "put": { + "tags": [ + "Databases" + ], + "operationId": "Databases_CreateOrUpdate", + "x-ms-examples": { + "Create a dataabse": { + "$ref": "./examples/DatabaseCreate.json" + } + }, + "description": "Creates a new database or updates an existing database.", + "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/DatabaseNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Database" + }, + "description": "The required parameters for creating or updating a database." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Database" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/Database" + } + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true + }, + "delete": { + "tags": [ + "Databases" + ], + "operationId": "Databases_Delete", + "x-ms-examples": { + "Delete a database": { + "$ref": "./examples/DatabaseDelete.json" + } + }, + "description": "Deletes a database.", + "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/DatabaseNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "NoContent" + } + }, + "x-ms-long-running-operation": true + }, + "get": { + "tags": [ + "Databases" + ], + "operationId": "Databases_Get", + "x-ms-examples": { + "Get a database": { + "$ref": "./examples/DatabaseGet.json" + } + }, + "description": "Gets information about a database.", + "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/DatabaseNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Database" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/databases": { + "get": { + "tags": [ + "Databases" + ], + "operationId": "Databases_ListByServer", + "x-ms-examples": { + "List databases in a server": { + "$ref": "./examples/DatabasesListByServer.json" + } + }, + "description": "List all the databases in a given server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/DatabaseListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/configurations/{configurationName}": { + "get": { + "tags": [ + "Configurations" + ], + "operationId": "Configurations_Get", + "x-ms-examples": { + "Get a configuration": { + "$ref": "./examples/ConfigurationGet.json" + } + }, + "description": "Gets information about a configuration of server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/ConfigurationNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Configuration" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/configurations": { + "get": { + "tags": [ + "Configurations" + ], + "operationId": "Configurations_ListByServer", + "x-ms-examples": { + "List all configurations for a server": { + "$ref": "./examples/ConfigurationsListByServer.json" + } + }, + "description": "List all the configurations in a given server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConfigurationListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/updateConfigurations": { + "post": { + "tags": [ + "Configurations" + ], + "operationId": "Configurations_Update", + "x-ms-examples": { + "Update a set of configurations": { + "$ref": "./examples/ConfigurationsUpdate.json" + } + }, + "description": "Updates a set configurations for a server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ConfigurationUpdateList" + }, + "description": "The required parameters for updating server configurations." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConfigurationListResult" + } + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } + } + }, + "/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" + } + }, + "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" + } + }, + "x-ms-long-running-operation": true + }, + "get": { + "tags": [ + "MaintenanceWindows" + ], + "operationId": "MaintenanceWindows_Get", + "x-ms-examples": { + "Get a maintenance window": { + "$ref": "./examples/MaintenanceWindowGet.json" + } + }, + "description": "Get the maintenance windows of a given server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/MaintenanceWindowNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/MaintenanceWindow" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/maintenanceWindows": { + "get": { + "tags": [ + "MaintenanceWindows" + ], + "operationId": "MaintenanceWindows_ListByServer", + "x-ms-examples": { + "List maintenance windows for a server": { + "$ref": "./examples/MaintenanceWindowsListByServer.json" + } + }, + "description": "List all the maintenance windows in a given server.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/MaintenanceWindowListResult" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DBforMySQL/checkNameAvailability": { + "post": { + "tags": [ + "CheckNameAvailability" + ], + "operationId": "CheckNameAvailability_Execute", + "x-ms-examples": { + "Check name availability": { + "$ref": "./examples/CheckNameAvailability.json" + } + }, + "description": "Check the availability of name for server", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "nameAvailabilityRequest", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/NameAvailabilityRequest" + }, + "description": "The required parameters for checking if server name is available." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/NameAvailability" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, + "/providers/Microsoft.DBforMySQL/operations": { + "get": { + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "x-ms-examples": { + "OperationList": { + "$ref": "./examples/OperationsList.json" + } + }, + "description": "Lists all of the available REST API operations.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationListResult" + } + } + } + } + } + }, + "definitions": { + "ServerVersion": { + "type": "string", + "description": "The version of a server.", + "enum": [ + "5.7" + ], + "x-ms-enum": { + "name": "ServerVersion", + "modelAsString": true + } + }, + "SslEnforcement": { + "type": "string", + "description": "Enable ssl enforcement or not when connect to server.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "SslEnforcementEnum", + "modelAsString": false + } + }, + "InfrastructureEncryption": { + "type": "string", + "description": "Add a second layer of encryption for your data using new encryption algorithm which gives additional data protection. Value is optional but if passed in, must be 'Disabled' or 'Enabled'.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "InfrastructureEncryption", + "modelAsString": true, + "values": [ + { + "value": "Enabled", + "description": "Default value for single layer of encryption for data at rest." + }, + { + "value": "Disabled", + "description": "Additional (2nd) layer of encryption for data at rest" + } + ] + } + }, + "PublicNetworkAccess": { + "type": "string", + "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "PublicNetworkAccessEnum", + "modelAsString": true + } + }, + "VnetInjArgs": { + "properties": { + "delegatedVnetID": { + "type": "string", + "description": "delegated vNet ID" + }, + "delegatedSubnetName": { + "type": "string", + "description": "delegated subnet name" + }, + "delegatedVnetName": { + "type": "string", + "description": "delegated vNet name" + } + }, + "description": "Vnet properties of a server" + }, + "StorageProfile": { + "properties": { + "backupRetentionDays": { + "type": "integer", + "description": "Backup retention days for the server." + }, + "storageMB": { + "type": "integer", + "format": "int32", + "description": "Max storage allowed for a server." + }, + "storageIOps": { + "type": "integer", + "format": "int32", + "description": "Storage IOPS for a server." + }, + "storageAutogrow": { + "type": "string", + "description": "Enable Storage Auto Grow.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "StorageAutogrow", + "modelAsString": true + } + } + }, + "description": "Storage Profile properties of a server" + }, + "ServerProperties": { + "properties": { + "administratorLogin": { + "type": "string", + "description": "The administrator's login name of a server. Can only be specified when the server is being created (and is required for creation)." + }, + "version": { + "$ref": "#/definitions/ServerVersion", + "description": "Server version." + }, + "sslEnforcement": { + "$ref": "#/definitions/SslEnforcement", + "description": "Enable ssl enforcement or not when connect to server." + }, + "infrastructureEncryption": { + "$ref": "#/definitions/InfrastructureEncryption", + "description": "Status showing whether the server enabled infrastructure encryption." + }, + "state": { + "type": "string", + "description": "The state of a server.", + "enum": [ + "Ready", + "Dropping", + "Disabled", + "Starting", + "Stopping", + "Stopped", + "Updating" + ], + "x-ms-enum": { + "name": "ServerState", + "modelAsString": true + } + }, + "haState": { + "type": "string", + "description": "The state of a HA server.", + "enum": [ + "NotEnabled", + "CreatingStandby", + "ReplicatingData", + "FailingOver", + "Healthy", + "RemovingStandby" + ], + "x-ms-enum": { + "name": "ServerHAState", + "modelAsString": true + } + }, + "standbyCount": { + "type": "integer", + "format": "int32", + "description": "stand by count value can be either 0 or 1" + }, + "fullyQualifiedDomainName": { + "type": "string", + "description": "The fully qualified domain name of a server." + }, + "storageProfile": { + "$ref": "#/definitions/StorageProfile", + "description": "Storage profile of a server." + }, + "replicationRole": { + "type": "string", + "description": "The replication role." + }, + "primaryServerId": { + "type": "string", + "description": "The primary server id of a replica server." + }, + "replicaCapacity": { + "type": "integer", + "format": "int32", + "minimum": 0, + "description": "The maximum number of replicas that a primary server can have." + }, + "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'" + }, + "vnetInjArgs": { + "$ref": "#/definitions/VnetInjArgs", + "description": "Vnet arguments." + } + }, + "description": "The properties of a server." + }, + "ServerPropertiesForCreate": { + "discriminator": "createMode", + "required": [ + "createMode" + ], + "properties": { + "version": { + "$ref": "#/definitions/ServerVersion", + "description": "Server version." + }, + "sslEnforcement": { + "$ref": "#/definitions/SslEnforcement", + "description": "Enable ssl enforcement or not when connect to server." + }, + "infrastructureEncryption": { + "$ref": "#/definitions/InfrastructureEncryption", + "description": "Status showing whether the server enabled infrastructure encryption." + }, + "vnetInjArgs": { + "$ref": "#/definitions/VnetInjArgs", + "description": "Vnet arguments." + }, + "standbyCount": { + "type": "integer", + "format": "int32", + "description": "stand by count value can be either 0 or 1." + }, + "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'" + }, + "storageProfile": { + "$ref": "#/definitions/StorageProfile", + "description": "Storage profile of a server." + }, + "createMode": { + "type": "string", + "description": "The mode to create a new server.", + "enum": [ + "Default", + "PointInTimeRestore", + "Replica" + ], + "x-ms-enum": { + "name": "CreateMode", + "modelAsString": true + } + } + }, + "description": "The properties used to create a new server." + }, + "ServerPropertiesForDefaultCreate": { + "x-ms-discriminator-value": "Default", + "allOf": [ + { + "$ref": "#/definitions/ServerPropertiesForCreate" + } + ], + "properties": { + "administratorLogin": { + "type": "string", + "description": "The administrator's login name of a server. Can only be specified when the server is being created (and is required for creation)." + }, + "administratorLoginPassword": { + "type": "string", + "x-ms-secret": true, + "format": "password", + "description": "The password of the administrator login." + } + }, + "required": [ + "administratorLogin", + "administratorLoginPassword" + ], + "description": "The properties used to create a new server." + }, + "ServerPropertiesForRestore": { + "x-ms-discriminator-value": "PointInTimeRestore", + "allOf": [ + { + "$ref": "#/definitions/ServerPropertiesForCreate" + } + ], + "properties": { + "sourceServerId": { + "type": "string", + "description": "The source server id to restore from." + }, + "restorePointInTime": { + "type": "string", + "format": "date-time", + "description": "Restore point creation time (ISO8601 format), specifying the time to restore from." + } + }, + "required": [ + "sourceServerId", + "restorePointInTime" + ], + "description": "The properties used to create a new server by restoring from a backup." + }, + "ServerPropertiesForReplica": { + "x-ms-discriminator-value": "Replica", + "allOf": [ + { + "$ref": "#/definitions/ServerPropertiesForCreate" + } + ], + "properties": { + "sourceServerId": { + "type": "string", + "description": "The primary server id to create replica from." + } + }, + "required": [ + "sourceServerId" + ], + "description": "The properties to create a new replica." + }, + "Sku": { + "properties": { + "name": { + "type": "string", + "description": "The name of the sku, e.g. Standard_D32s_v3." + }, + "tier": { + "type": "string", + "description": "The tier of the particular SKU, e.g. GeneralPurpose.", + "enum": [ + "Burstable", + "GeneralPurpose", + "MemoryOptimized" + ], + "x-ms-enum": { + "name": "SkuTier", + "modelAsString": true + } + } + }, + "description": "Billing information related properties of a server." + }, + "Server": { + "properties": { + "identity": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Identity", + "description": "The Azure Active Directory identity of the server." + }, + "sku": { + "$ref": "#/definitions/Sku", + "description": "The SKU (pricing tier) of the server." + }, + "properties": { + "$ref": "#/definitions/ServerProperties", + "x-ms-client-flatten": true, + "description": "Properties of the server." + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" + } + ], + "description": "Represents a server." + }, + "ServerForCreate": { + "properties": { + "sku": { + "$ref": "#/definitions/Sku", + "description": "The SKU (pricing tier) of the server." + }, + "properties": { + "$ref": "#/definitions/ServerPropertiesForCreate", + "x-ms-client-flatten": false, + "description": "Properties of the server." + }, + "location": { + "type": "string", + "description": "The location the resource resides in." + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Application-specific metadata in the form of key-value pairs." + } + }, + "required": [ + "properties", + "location" + ], + "description": "Represents a server to be created." + }, + "ServerForUpdate": { + "properties": { + "sku": { + "$ref": "#/definitions/Sku", + "description": "The SKU (pricing tier) of the server." + }, + "properties": { + "properties": { + "storageProfile": { + "$ref": "#/definitions/StorageProfile", + "description": "Storage profile of a server." + }, + "administratorLoginPassword": { + "type": "string", + "x-ms-secret": true, + "format": "password", + "description": "The password of the administrator login." + }, + "sslEnforcement": { + "$ref": "#/definitions/SslEnforcement", + "description": "Enable ssl enforcement or not when connect to server." + }, + "vnetInjArgs": { + "$ref": "#/definitions/VnetInjArgs", + "description": "Vnet arguments." + }, + "standbyCount": { + "type": "integer", + "format": "int32", + "description": "stand by count value can be either 0 or 1" + }, + "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'" + }, + "replicationRole": { + "type": "string", + "description": "The replication role of the server." + } + }, + "x-ms-client-flatten": true, + "description": "The properties that can be updated for a server." + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Application-specific metadata in the form of key-value pairs." + } + }, + "description": "Parameters allowed to update for a server." + }, + "ServerListResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Server" + }, + "description": "The list of servers" + }, + "nextLink": { + "description": "The link used to get the next page of operations.", + "type": "string" + } + }, + "description": "A list of servers." + }, + "FirewallRuleProperties": { + "properties": { + "startIpAddress": { + "type": "string", + "pattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$", + "description": "The start IP address of the server firewall rule. Must be IPv4 format." + }, + "endIpAddress": { + "type": "string", + "pattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$", + "description": "The end IP address of the server firewall rule. Must be IPv4 format." + } + }, + "required": [ + "startIpAddress", + "endIpAddress" + ], + "description": "The properties of a server firewall rule." + }, + "FirewallRule": { + "properties": { + "properties": { + "$ref": "#/definitions/FirewallRuleProperties", + "x-ms-client-flatten": true, + "description": "The properties of a firewall rule." + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + } + ], + "required": [ + "properties" + ], + "description": "Represents a server firewall rule." + }, + "FirewallRuleListResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/FirewallRule" + }, + "description": "The list of firewall rules in a server." + }, + "nextLink": { + "description": "The link used to get the next page of operations.", + "type": "string" + } + }, + "description": "A list of firewall rules." + }, + "DatabaseProperties": { + "properties": { + "charset": { + "type": "string", + "description": "The charset of the database." + }, + "collation": { + "type": "string", + "description": "The collation of the database." + } + }, + "description": "The properties of a database." + }, + "Database": { + "properties": { + "properties": { + "$ref": "#/definitions/DatabaseProperties", + "x-ms-client-flatten": true, + "description": "The properties of a database." + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + } + ], + "description": "Represents a Database." + }, + "DatabaseListResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Database" + }, + "description": "The list of databases housed in a server" + }, + "nextLink": { + "description": "The link used to get the next page of operations.", + "type": "string" + } + }, + "description": "A List of databases." + }, + "ConfigurationProperties": { + "properties": { + "value": { + "type": "string", + "description": "Value of the configuration." + }, + "description": { + "type": "string", + "readOnly": true, + "description": "Description of the configuration." + }, + "defaultValue": { + "type": "string", + "readOnly": true, + "description": "Default value of the configuration." + }, + "dataType": { + "type": "string", + "readOnly": true, + "description": "Data type of the configuration." + }, + "allowedValues": { + "type": "string", + "readOnly": true, + "description": "Allowed values of the configuration." + }, + "source": { + "type": "string", + "description": "Source of the configuration." + }, + "isConfigPendingRestart": { + "type": "string", + "description": "If is the configuration pending restart or not.", + "enum": [ + "True", + "False" + ], + "x-ms-enum": { + "name": "IsConfigPendingRestart", + "modelAsString": true + } + }, + "isDynamicConfig": { + "type": "string", + "description": "If is the configuration dynamic.", + "enum": [ + "True", + "False" + ], + "x-ms-enum": { + "name": "IsDynamicConfig", + "modelAsString": true + } + } + }, + "description": "The properties of a configuration." + }, + "Configuration": { + "properties": { + "properties": { + "$ref": "#/definitions/ConfigurationProperties", + "x-ms-client-flatten": true, + "description": "The properties of a configuration." + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + } + ], + "description": "Represents a Configuration." + }, + "ConfigurationListResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Configuration" + }, + "description": "The list of server configurations." + }, + "nextLink": { + "description": "The link used to get the next page of operations.", + "type": "string" + } + }, + "description": "A list of server configurations." + }, + "ConfigurationForUpdate": { + "properties": { + "name": { + "type": "string", + "description": "Name of the configuration." + }, + "properties": { + "properties": { + "value": { + "type": "string", + "description": "Value of the configuration." + }, + "source": { + "type": "string", + "description": "Source of the configuration." + } + }, + "x-ms-client-flatten": true, + "description": "The properties can be updated for a configuration." + } + }, + "description": "Represents a Configuration." + }, + "ConfigurationUpdateList": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ConfigurationForUpdate" + }, + "description": "The list of server configurations." + } + }, + "description": "A list of server configurations to update." + }, + "MaintenanceWindowProperties": { + "properties": { + "dayOfWeek": { + "type": "integer", + "description": "The day of week of the maintenance window to start" + }, + "durationInMinutes": { + "type": "integer", + "description": "The duration of the maintenance window to run." + }, + "startHour": { + "type": "integer", + "description": "The starting hour of the maintenance window." + }, + "startMinute": { + "type": "integer", + "description": "The starting minutes of the maintenance window." + } + }, + "required": [ + "dayOfWeek", + "startHour", + "startMinute" + ], + "description": "The properties of a server maintenance window." + }, + "MaintenanceWindow": { + "properties": { + "properties": { + "$ref": "#/definitions/MaintenanceWindowProperties", + "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 maintenance window." + }, + "MaintenanceWindowListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/MaintenanceWindow" + }, + "description": "The list of maintenance windows in a server." + } + }, + "description": "A list of maintenance windows." + }, + "OperationDisplay": { + "properties": { + "provider": { + "type": "string", + "readOnly": true, + "description": "Operation resource provider name." + }, + "resource": { + "type": "string", + "readOnly": true, + "description": "Resource on which the operation is performed." + }, + "operation": { + "type": "string", + "readOnly": true, + "description": "Localized friendly name for the operation." + }, + "description": { + "type": "string", + "readOnly": true, + "description": "Operation description." + } + }, + "description": "Display metadata associated with the operation." + }, + "Operation": { + "properties": { + "name": { + "type": "string", + "readOnly": true, + "description": "The name of the operation being performed on this particular object." + }, + "display": { + "$ref": "#/definitions/OperationDisplay", + "readOnly": true, + "description": "The localized display information for this particular operation or action." + }, + "origin": { + "type": "string", + "readOnly": true, + "description": "The intended executor of the operation.", + "enum": [ + "NotSpecified", + "user", + "system" + ], + "x-ms-enum": { + "name": "OperationOrigin", + "modelAsString": true + } + }, + "properties": { + "type": "object", + "additionalProperties": { + "type": "object" + }, + "readOnly": true, + "x-ms-client-flatten": false, + "description": "Additional descriptions for the operation." + } + }, + "description": "REST API operation definition." + }, + "OperationListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + }, + "description": "The list of resource provider operations." + } + }, + "description": "A list of resource provider operations." + }, + "NameAvailabilityRequest": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string", + "description": "Resource name to verify." + }, + "type": { + "type": "string", + "description": "Resource type used for verification." + } + }, + "description": "Request from client to check resource name availability." + }, + "NameAvailability": { + "properties": { + "message": { + "type": "string", + "description": "Error Message." + }, + "nameAvailable": { + "type": "boolean", + "description": "Indicates whether the resource name is available." + }, + "reason": { + "type": "string", + "description": "Reason for name being unavailable." + } + }, + "description": "Represents a resource name availability." + }, + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse", + "description": "The resource management error response." + } + }, + "description": "An error response from the Batch service." + } + }, + "parameters": { + "ServerNameParameter": { + "name": "serverName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the server.", + "x-ms-parameter-location": "method" + }, + "FirewallRuleNameParameter": { + "name": "firewallRuleName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the server firewall rule.", + "x-ms-parameter-location": "method" + }, + "DatabaseNameParameter": { + "name": "databaseName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the database.", + "x-ms-parameter-location": "method" + }, + "ConfigurationNameParameter": { + "name": "configurationName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the server configuration.", + "x-ms-parameter-location": "method" + }, + "MaintenanceWindowNameParameter": { + "name": "maintenanceWindowName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the maintenance window.", + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/mysql/resource-manager/readme.md b/specification/mysql/resource-manager/readme.md index 9a348aab98f8..cb35a0c056fa 100644 --- a/specification/mysql/resource-manager/readme.md +++ b/specification/mysql/resource-manager/readme.md @@ -105,6 +105,15 @@ input-file: - Microsoft.DBforMySQL/stable/2020-01-01/Servers.json ``` +### Tag: package-2020-07-01-privatepreview + +These settings apply only when `--tag=package-2020-07-01-privatepreview` is specified on the command line. + +``` yaml $(tag) == 'package-2020-07-01-privatepreview' +input-file: +- Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json +``` + ## Suppression ``` yaml directive: From a3df0db11784ee9793370b43c3ee8f8226828902 Mon Sep 17 00:00:00 2001 From: suna Liu Date: Wed, 29 Jul 2020 14:02:08 +0800 Subject: [PATCH 05/40] Fix Spell and Prettier check failures --- .../2020-07-01-privatepreview/mysql.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 18d27e621ea8..9de183abc076 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 @@ -248,7 +248,7 @@ ], "operationId": "Servers_ListByResourceGroup", "x-ms-examples": { - "List servers in a reource group": { + "List servers in a resource group": { "$ref": "./examples/ServersListByResourceGroup.json" } }, @@ -678,7 +678,7 @@ ], "operationId": "Databases_CreateOrUpdate", "x-ms-examples": { - "Create a dataabse": { + "Create a database": { "$ref": "./examples/DatabaseCreate.json" } }, @@ -1332,9 +1332,9 @@ "description": "Max storage allowed for a server." }, "storageIOps": { - "type": "integer", - "format": "int32", - "description": "Storage IOPS for a server." + "type": "integer", + "format": "int32", + "description": "Storage IOPS for a server." }, "storageAutogrow": { "type": "string", @@ -1835,8 +1835,8 @@ "type": "string", "description": "If is the configuration pending restart or not.", "enum": [ - "True", - "False" + "True", + "False" ], "x-ms-enum": { "name": "IsConfigPendingRestart", @@ -1847,8 +1847,8 @@ "type": "string", "description": "If is the configuration dynamic.", "enum": [ - "True", - "False" + "True", + "False" ], "x-ms-enum": { "name": "IsDynamicConfig", From 58558c25820303d34ceec264a6dee0d6c3a7e0f5 Mon Sep 17 00:00:00 2001 From: suna Liu Date: Wed, 29 Jul 2020 15:05:24 +0800 Subject: [PATCH 06/40] Fix Prettier check failures in examples --- .../examples/ConfigurationsUpdate.json | 2 +- .../examples/MaintenanceWindowCreate.json | 2 +- .../examples/MaintenanceWindowDelete.json | 2 +- .../examples/MaintenanceWindowGet.json | 2 +- .../examples/MaintenanceWindowsListByServer.json | 2 +- .../2020-07-01-privatepreview/examples/ServerGetWithVnet.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsUpdate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsUpdate.json index 77508fdbe8b2..67d637677a2d 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsUpdate.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsUpdate.json @@ -62,4 +62,4 @@ }, "202": {} } -} \ No newline at end of file +} 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 index 0b1c4f6aba78..89163e0da956 100644 --- 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 @@ -43,4 +43,4 @@ }, "202": {} } -} \ No newline at end of file +} 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 index 9a4a9ce069ad..02d91e35a6fc 100644 --- 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 @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} 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 index 536e92fee202..ba086b9877e5 100644 --- 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 @@ -21,4 +21,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowsListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowsListByServer.json index 7388b9c9a29d..d67701018154 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowsListByServer.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowsListByServer.json @@ -24,4 +24,4 @@ } } } -} \ No newline at end of file +} 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 dc5ef3257b0a..f9035ae121a9 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 @@ -44,4 +44,4 @@ } } } -} \ No newline at end of file +} From 7e640ad5a65fca12dc5bf4893d81f270c23bbe4a Mon Sep 17 00:00:00 2001 From: suna Liu Date: Fri, 31 Jul 2020 14:28:03 +0800 Subject: [PATCH 07/40] Address ARM comments: ServerForCreate to Server, update operation_id and remove updateConfigurations API --- .../examples/ConfigurationGet.json | 3 +- .../examples/ConfigurationUpdate.json | 35 + .../examples/ConfigurationsUpdate.json | 65 -- .../2020-07-01-privatepreview/mysql.json | 597 +++++++++--------- 4 files changed, 320 insertions(+), 380 deletions(-) create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationUpdate.json delete mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsUpdate.json diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationGet.json index 9aba78a89497..68bbdafca700 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationGet.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationGet.json @@ -17,7 +17,8 @@ "allowedValues": "ON,OFF,DISABLED", "source": "user-override", "isConfigPendingRestart": "False", - "isDynamicConfig": "True" + "isDynamicConfig": "True", + "isReadOnly": "False" }, "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testserver/configurations/event_scheduler", "name": "event_scheduler", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationUpdate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationUpdate.json new file mode 100644 index 000000000000..cdd4dc412a55 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationUpdate.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "serverName": "testserver", + "configurationName": "event_scheduler", + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "value": "on", + "source": "user-override" + } + } + }, + "responses": { + "200": { + "body": { + "properties": { + "value": "ON", + "description": "Indicates the status of the Event Scheduler.", + "defaultValue": "OFF", + "dataType": "Enumeration", + "allowedValues": "ON,OFF,DISABLED", + "source": "user-override", + "isConfigPendingRestart": "False", + "isDynamicConfig": "True" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/testserver/configurations/event_scheduler", + "name": "event_scheduler", + "type": "Microsoft.DBforMySQL/flexibleServers/configurations" + } + }, + "202": {} + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsUpdate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsUpdate.json deleted file mode 100644 index 67d637677a2d..000000000000 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ConfigurationsUpdate.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "parameters": { - "serverName": "testserver", - "resourceGroupName": "testrg", - "api-version": "2020-07-01-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "parameters": { - "value": [ - { - "name": "event_scheduler", - "properties": { - "value": "ON", - "source": "user-override" - } - }, - { - "name": "wait_timeout", - "properties": { - "value": "3600", - "source": "user-override" - } - } - ] - } - }, - "responses": { - "200": { - "body": { - "value": [ - { - "properties": { - "value": "ON", - "description": "Indicates the status of the Event Scheduler.", - "defaultValue": "OFF", - "dataType": "Enumeration", - "allowedValues": "ON,OFF,DISABLED", - "source": "user-override", - "isConfigPendingRestart": "False", - "isDynamicConfig": "True" - }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/testserver/configurations/event_scheduler", - "name": "event_scheduler", - "type": "Microsoft.DBforMySQL/flexibleServers/configurations" - }, - { - "properties": { - "value": "3600", - "description": "The number of seconds the server waits for activity on a noninteractive connection before closing it.", - "defaultValue": "120", - "dataType": "Integer", - "allowedValues": "60-86400", - "source": "user-override", - "isConfigPendingRestart": "False", - "isDynamicConfig": "True" - }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/testserver/configurations/wait_timeout", - "name": "wait_timeout", - "type": "Microsoft.DBforMySQL/flexibleServers/configurations" - } - ] - } - }, - "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 9de183abc076..742b992e274a 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 @@ -34,12 +34,12 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}": { "put": { "tags": [ "Servers" ], - "operationId": "Servers_Create", + "operationId": "FlexibleServers_Create", "x-ms-examples": { "Create a new server": { "$ref": "./examples/ServerCreate.json" @@ -70,7 +70,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ServerForCreate" + "$ref": "#/definitions/Server" }, "description": "The required parameters for creating or updating a server." } @@ -104,7 +104,7 @@ "tags": [ "Servers" ], - "operationId": "Servers_Update", + "operationId": "FlexibleServers_Update", "x-ms-examples": { "Update a server": { "$ref": "./examples/ServerUpdate.json" @@ -157,7 +157,7 @@ "tags": [ "Servers" ], - "operationId": "Servers_Delete", + "operationId": "FlexibleServers_Delete", "x-ms-examples": { "Delete a server": { "$ref": "./examples/ServerDelete.json" @@ -201,7 +201,7 @@ "tags": [ "Servers" ], - "operationId": "Servers_Get", + "operationId": "FlexibleServers_Get", "x-ms-examples": { "Get a server": { "$ref": "./examples/ServerGet.json" @@ -241,12 +241,12 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers": { "get": { "tags": [ "Servers" ], - "operationId": "Servers_ListByResourceGroup", + "operationId": "FlexibleServers_ListByResourceGroup", "x-ms-examples": { "List servers in a resource group": { "$ref": "./examples/ServersListByResourceGroup.json" @@ -283,12 +283,12 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.DBforMySQL/flexibleServers": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForMySQL/flexibleServers": { "get": { "tags": [ "Servers" ], - "operationId": "Servers_List", + "operationId": "FlexibleServers_List", "x-ms-examples": { "List servers in a subscription": { "$ref": "./examples/ServersList.json" @@ -322,12 +322,12 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/restart": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/restart": { "post": { "tags": [ "ServerRestart" ], - "operationId": "Servers_Restart", + "operationId": "FlexibleServers_Restart", "x-ms-examples": { "Restart a server": { "$ref": "./examples/ServerRestart.json" @@ -365,12 +365,12 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/start": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/start": { "post": { "tags": [ "ServerStart" ], - "operationId": "Servers_Start", + "operationId": "FlexibleServers_Start", "x-ms-examples": { "Start a server": { "$ref": "./examples/ServerStart.json" @@ -408,12 +408,12 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/stop": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/stop": { "post": { "tags": [ "ServerStop" ], - "operationId": "Servers_Stop", + "operationId": "FlexibleServers_Stop", "x-ms-examples": { "Stop a server": { "$ref": "./examples/ServerStop.json" @@ -451,12 +451,12 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/Replicas": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/replicas": { "get": { "tags": [ "Servers" ], - "operationId": "Replicas_ListByServer", + "operationId": "FlexibleServersReplicas_ListByServer", "x-ms-examples": { "List replicas for a server": { "$ref": "./examples/ReplicasListByServer.json" @@ -483,6 +483,12 @@ "schema": { "$ref": "#/definitions/ServerListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-pageable": { @@ -490,12 +496,12 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/firewallRules/{firewallRuleName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/firewallRules/{firewallRuleName}": { "put": { "tags": [ "FirewallRules" ], - "operationId": "FirewallRules_CreateOrUpdate", + "operationId": "FlexibleServersFirewallRules_CreateOrUpdate", "x-ms-examples": { "Create a firewall rule": { "$ref": "./examples/FirewallRuleCreate.json" @@ -543,6 +549,12 @@ }, "202": { "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-long-running-operation": true @@ -551,7 +563,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FirewallRules_Delete", + "operationId": "FlexibleServersFirewallRules_Delete", "x-ms-examples": { "Delete a firewall rule": { "$ref": "./examples/FirewallRuleDelete.json" @@ -584,6 +596,12 @@ }, "204": { "description": "NoContent" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-long-running-operation": true @@ -592,7 +610,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FirewallRules_Get", + "operationId": "FlexibleServersFirewallRules_Get", "x-ms-examples": { "Get a firewall rule": { "$ref": "./examples/FirewallRuleGet.json" @@ -632,12 +650,12 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/firewallRules": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/firewallRules": { "get": { "tags": [ "FirewallRules" ], - "operationId": "FirewallRules_ListByServer", + "operationId": "FlexibleServersFirewallRules_ListByServer", "x-ms-examples": { "List all firewall rules in a server": { "$ref": "./examples/FirewallRulesListByServer.json" @@ -664,6 +682,12 @@ "schema": { "$ref": "#/definitions/FirewallRuleListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-pageable": { @@ -671,12 +695,12 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/databases/{databaseName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/databases/{databaseName}": { "put": { "tags": [ "Databases" ], - "operationId": "Databases_CreateOrUpdate", + "operationId": "FlexibleServersDatabases_CreateOrUpdate", "x-ms-examples": { "Create a database": { "$ref": "./examples/DatabaseCreate.json" @@ -724,6 +748,12 @@ }, "202": { "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-long-running-operation": true @@ -732,7 +762,7 @@ "tags": [ "Databases" ], - "operationId": "Databases_Delete", + "operationId": "FlexibleServersDatabases_Delete", "x-ms-examples": { "Delete a database": { "$ref": "./examples/DatabaseDelete.json" @@ -765,6 +795,12 @@ }, "204": { "description": "NoContent" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-long-running-operation": true @@ -773,7 +809,7 @@ "tags": [ "Databases" ], - "operationId": "Databases_Get", + "operationId": "FlexibleServersDatabases_Get", "x-ms-examples": { "Get a database": { "$ref": "./examples/DatabaseGet.json" @@ -803,16 +839,22 @@ "schema": { "$ref": "#/definitions/Database" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/databases": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/databases": { "get": { "tags": [ "Databases" ], - "operationId": "Databases_ListByServer", + "operationId": "FlexibleServersDatabases_ListByServer", "x-ms-examples": { "List databases in a server": { "$ref": "./examples/DatabasesListByServer.json" @@ -839,6 +881,12 @@ "schema": { "$ref": "#/definitions/DatabaseListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-pageable": { @@ -846,18 +894,18 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/configurations/{configurationName}": { - "get": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/configurations/{configurationName}": { + "patch": { "tags": [ "Configurations" ], - "operationId": "Configurations_Get", + "operationId": "FlexibleServersConfigurations_Update", "x-ms-examples": { - "Get a configuration": { - "$ref": "./examples/ConfigurationGet.json" + "Update a user configration": { + "$ref": "./examples/ConfigurationUpdate.json" } }, - "description": "Gets information about a configuration of server.", + "description": "Updates a configuration of a server.", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -873,6 +921,15 @@ }, { "$ref": "#/parameters/ConfigurationNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Configuration" + }, + "description": "The required parameters for updating a server configuration." } ], "responses": { @@ -882,27 +939,29 @@ "$ref": "#/definitions/Configuration" } }, + "202": { + "description": "Accepted" + }, "default": { "description": "Error response describing why the operation failed.", "schema": { "$ref": "#/definitions/CloudError" } } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/configurations": { + }, + "x-ms-long-running-operation": true + }, "get": { "tags": [ "Configurations" ], - "operationId": "Configurations_ListByServer", + "operationId": "FlexibleServersConfigurations_Get", "x-ms-examples": { - "List all configurations for a server": { - "$ref": "./examples/ConfigurationsListByServer.json" + "Get a configuration": { + "$ref": "./examples/ConfigurationGet.json" } }, - "description": "List all the configurations in a given server.", + "description": "Gets information about a configuration of server.", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -915,13 +974,16 @@ }, { "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/ConfigurationNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ConfigurationListResult" + "$ref": "#/definitions/Configuration" } }, "default": { @@ -930,24 +992,21 @@ "$ref": "#/definitions/CloudError" } } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/updateConfigurations": { - "post": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/configurations": { + "get": { "tags": [ "Configurations" ], - "operationId": "Configurations_Update", + "operationId": "FlexibleServersConfigurations_ListByServer", "x-ms-examples": { - "Update a set of configurations": { - "$ref": "./examples/ConfigurationsUpdate.json" + "List all configurations for a server": { + "$ref": "./examples/ConfigurationsListByServer.json" } }, - "description": "Updates a set configurations for a server.", + "description": "List all the configurations in a given server.", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -960,15 +1019,6 @@ }, { "$ref": "#/parameters/ServerNameParameter" - }, - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/ConfigurationUpdateList" - }, - "description": "The required parameters for updating server configurations." } ], "responses": { @@ -978,9 +1028,6 @@ "$ref": "#/definitions/ConfigurationListResult" } }, - "202": { - "description": "Accepted" - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -988,18 +1035,17 @@ } } }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/maintenanceWindows/{maintenanceWindowName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/maintenanceWindows/{maintenanceWindowName}": { "put": { "tags": [ "MaintenanceWindows" ], - "operationId": "MaintenanceWindows_CreateOrUpdate", + "operationId": "FlexibleServersMaintenanceWindows_CreateOrUpdate", "x-ms-examples": { "Create a maintenance window": { "$ref": "./examples/MaintenanceWindowCreate.json" @@ -1047,6 +1093,12 @@ }, "202": { "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-long-running-operation": true @@ -1055,7 +1107,7 @@ "tags": [ "MaintenanceWindows" ], - "operationId": "MaintenanceWindows_Delete", + "operationId": "FlexibleServersMaintenanceWindows_Delete", "x-ms-examples": { "Delete a maintenance window": { "$ref": "./examples/MaintenanceWindowDelete.json" @@ -1088,6 +1140,12 @@ }, "204": { "description": "NoContent" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-long-running-operation": true @@ -1096,7 +1154,7 @@ "tags": [ "MaintenanceWindows" ], - "operationId": "MaintenanceWindows_Get", + "operationId": "FlexibleServersMaintenanceWindows_Get", "x-ms-examples": { "Get a maintenance window": { "$ref": "./examples/MaintenanceWindowGet.json" @@ -1136,12 +1194,12 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/flexibleServers/{serverName}/maintenanceWindows": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/maintenanceWindows": { "get": { "tags": [ "MaintenanceWindows" ], - "operationId": "MaintenanceWindows_ListByServer", + "operationId": "FlexibleServersMaintenanceWindows_ListByServer", "x-ms-examples": { "List maintenance windows for a server": { "$ref": "./examples/MaintenanceWindowsListByServer.json" @@ -1168,16 +1226,25 @@ "schema": { "$ref": "#/definitions/MaintenanceWindowListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.DBforMySQL/checkNameAvailability": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForMySQL/checkNameAvailability": { "post": { "tags": [ "CheckNameAvailability" ], - "operationId": "CheckNameAvailability_Execute", + "operationId": "FlexibleServersCheckNameAvailability_Execute", "x-ms-examples": { "Check name availability": { "$ref": "./examples/CheckNameAvailability.json" @@ -1217,7 +1284,7 @@ } } }, - "/providers/Microsoft.DBforMySQL/operations": { + "/providers/Microsoft.DBForMySQL/operations": { "get": { "tags": [ "Operations" @@ -1240,6 +1307,12 @@ "schema": { "$ref": "#/definitions/OperationListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } } } @@ -1266,7 +1339,7 @@ ], "x-ms-enum": { "name": "SslEnforcementEnum", - "modelAsString": false + "modelAsString": true } }, "InfrastructureEncryption": { @@ -1277,18 +1350,8 @@ "Disabled" ], "x-ms-enum": { - "name": "InfrastructureEncryption", - "modelAsString": true, - "values": [ - { - "value": "Enabled", - "description": "Default value for single layer of encryption for data at rest." - }, - { - "value": "Disabled", - "description": "Additional (2nd) layer of encryption for data at rest" - } - ] + "name": "InfrastructureEncryptionEnum", + "modelAsString": true } }, "PublicNetworkAccess": { @@ -1324,6 +1387,7 @@ "properties": { "backupRetentionDays": { "type": "integer", + "format": "int32", "description": "Backup retention days for the server." }, "storageMB": { @@ -1351,11 +1415,47 @@ }, "description": "Storage Profile properties of a server" }, + "Sku": { + "properties": { + "name": { + "type": "string", + "description": "The name of the sku, e.g. Standard_D32s_v3." + }, + "tier": { + "type": "string", + "description": "The tier of the particular SKU, e.g. GeneralPurpose.", + "enum": [ + "Burstable", + "GeneralPurpose", + "MemoryOptimized" + ], + "x-ms-enum": { + "name": "SkuTier", + "modelAsString": true + } + } + }, + "description": "Billing information related properties of a server." + }, "ServerProperties": { "properties": { "administratorLogin": { "type": "string", - "description": "The administrator's login name of a server. Can only be specified when the server is being created (and is required for creation)." + "description": "The administrator's login name of a server. Can only be specified when the server is being created (and is required for creation).", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "administratorLoginPassword": { + "type": "string", + "x-ms-secret": true, + "format": "password", + "description": "The password of the administrator login (required for server creation).", + "x-ms-mutability": [ + "create", + "update" + ] }, "version": { "$ref": "#/definitions/ServerVersion", @@ -1367,10 +1467,14 @@ }, "infrastructureEncryption": { "$ref": "#/definitions/InfrastructureEncryption", - "description": "Status showing whether the server enabled infrastructure encryption." + "description": "Status showing whether the server enabled infrastructure encryption.", + "x-ms-mutability": [ + "create" + ] }, "state": { "type": "string", + "readOnly": true, "description": "The state of a server.", "enum": [ "Ready", @@ -1388,6 +1492,7 @@ }, "haState": { "type": "string", + "readOnly": true, "description": "The state of a HA server.", "enum": [ "NotEnabled", @@ -1409,7 +1514,8 @@ }, "fullyQualifiedDomainName": { "type": "string", - "description": "The fully qualified domain name of a server." + "description": "The fully qualified domain name of a server.", + "readOnly": true }, "storageProfile": { "$ref": "#/definitions/StorageProfile", @@ -1421,7 +1527,8 @@ }, "primaryServerId": { "type": "string", - "description": "The primary server id of a replica server." + "description": "The primary server id of a replica server.", + "readOnly": true }, "replicaCapacity": { "type": "integer", @@ -1433,51 +1540,28 @@ "$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'" }, - "vnetInjArgs": { - "$ref": "#/definitions/VnetInjArgs", - "description": "Vnet arguments." - } - }, - "description": "The properties of a server." - }, - "ServerPropertiesForCreate": { - "discriminator": "createMode", - "required": [ - "createMode" - ], - "properties": { - "version": { - "$ref": "#/definitions/ServerVersion", - "description": "Server version." - }, - "sslEnforcement": { - "$ref": "#/definitions/SslEnforcement", - "description": "Enable ssl enforcement or not when connect to server." + "sourceServerId": { + "type": "string", + "description": "The source MySQL server name to restore from.", + "x-ms-mutability": [ + "create" + ] }, - "infrastructureEncryption": { - "$ref": "#/definitions/InfrastructureEncryption", - "description": "Status showing whether the server enabled infrastructure encryption." + "restorePointInTime": { + "type": "string", + "format": "date-time", + "description": "Restore point creation time (ISO8601 format), specifying the time to restore from.", + "x-ms-mutability": [ + "create" + ] }, "vnetInjArgs": { "$ref": "#/definitions/VnetInjArgs", "description": "Vnet arguments." }, - "standbyCount": { - "type": "integer", - "format": "int32", - "description": "stand by count value can be either 0 or 1." - }, - "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'" - }, - "storageProfile": { - "$ref": "#/definitions/StorageProfile", - "description": "Storage profile of a server." - }, "createMode": { "type": "string", - "description": "The mode to create a new server.", + "description": "The mode to create a new MySQL server.", "enum": [ "Default", "PointInTimeRestore", @@ -1486,99 +1570,20 @@ "x-ms-enum": { "name": "CreateMode", "modelAsString": true - } - } - }, - "description": "The properties used to create a new server." - }, - "ServerPropertiesForDefaultCreate": { - "x-ms-discriminator-value": "Default", - "allOf": [ - { - "$ref": "#/definitions/ServerPropertiesForCreate" - } - ], - "properties": { - "administratorLogin": { - "type": "string", - "description": "The administrator's login name of a server. Can only be specified when the server is being created (and is required for creation)." - }, - "administratorLoginPassword": { - "type": "string", - "x-ms-secret": true, - "format": "password", - "description": "The password of the administrator login." - } - }, - "required": [ - "administratorLogin", - "administratorLoginPassword" - ], - "description": "The properties used to create a new server." - }, - "ServerPropertiesForRestore": { - "x-ms-discriminator-value": "PointInTimeRestore", - "allOf": [ - { - "$ref": "#/definitions/ServerPropertiesForCreate" - } - ], - "properties": { - "sourceServerId": { - "type": "string", - "description": "The source server id to restore from." - }, - "restorePointInTime": { - "type": "string", - "format": "date-time", - "description": "Restore point creation time (ISO8601 format), specifying the time to restore from." - } - }, - "required": [ - "sourceServerId", - "restorePointInTime" - ], - "description": "The properties used to create a new server by restoring from a backup." - }, - "ServerPropertiesForReplica": { - "x-ms-discriminator-value": "Replica", - "allOf": [ - { - "$ref": "#/definitions/ServerPropertiesForCreate" - } - ], - "properties": { - "sourceServerId": { - "type": "string", - "description": "The primary server id to create replica from." - } - }, - "required": [ - "sourceServerId" - ], - "description": "The properties to create a new replica." - }, - "Sku": { - "properties": { - "name": { - "type": "string", - "description": "The name of the sku, e.g. Standard_D32s_v3." + }, + "x-ms-mutability": [ + "create" + ] }, - "tier": { - "type": "string", - "description": "The tier of the particular SKU, e.g. GeneralPurpose.", - "enum": [ - "Burstable", - "GeneralPurpose", - "MemoryOptimized" - ], - "x-ms-enum": { - "name": "SkuTier", - "modelAsString": true - } + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Application-specific metadata in the form of key-value pairs." } }, - "description": "Billing information related properties of a server." + "description": "The properties of a server." }, "Server": { "properties": { @@ -1603,34 +1608,41 @@ ], "description": "Represents a server." }, - "ServerForCreate": { + "ServerPropertiesForUpdate": { "properties": { - "sku": { - "$ref": "#/definitions/Sku", - "description": "The SKU (pricing tier) of the server." - }, - "properties": { - "$ref": "#/definitions/ServerPropertiesForCreate", - "x-ms-client-flatten": false, - "description": "Properties of the server." + "storageProfile": { + "$ref": "#/definitions/StorageProfile", + "description": "Storage profile of a server." }, - "location": { + "administratorLoginPassword": { "type": "string", - "description": "The location the resource resides in." + "x-ms-secret": true, + "format": "password", + "description": "The password of the administrator login." }, - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Application-specific metadata in the form of key-value pairs." + "sslEnforcement": { + "$ref": "#/definitions/SslEnforcement", + "description": "Enable ssl enforcement or not when connect to server." + }, + "vnetInjArgs": { + "$ref": "#/definitions/VnetInjArgs", + "description": "Vnet arguments." + }, + "standbyCount": { + "type": "integer", + "format": "int32", + "description": "stand by count value can be either 0 or 1" + }, + "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'" + }, + "replicationRole": { + "type": "string", + "description": "The replication role of the server." } }, - "required": [ - "properties", - "location" - ], - "description": "Represents a server to be created." + "description": "The properties that can be updated for a server." }, "ServerForUpdate": { "properties": { @@ -1639,39 +1651,7 @@ "description": "The SKU (pricing tier) of the server." }, "properties": { - "properties": { - "storageProfile": { - "$ref": "#/definitions/StorageProfile", - "description": "Storage profile of a server." - }, - "administratorLoginPassword": { - "type": "string", - "x-ms-secret": true, - "format": "password", - "description": "The password of the administrator login." - }, - "sslEnforcement": { - "$ref": "#/definitions/SslEnforcement", - "description": "Enable ssl enforcement or not when connect to server." - }, - "vnetInjArgs": { - "$ref": "#/definitions/VnetInjArgs", - "description": "Vnet arguments." - }, - "standbyCount": { - "type": "integer", - "format": "int32", - "description": "stand by count value can be either 0 or 1" - }, - "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'" - }, - "replicationRole": { - "type": "string", - "description": "The replication role of the server." - } - }, + "$ref": "#/definitions/ServerPropertiesForUpdate", "x-ms-client-flatten": true, "description": "The properties that can be updated for a server." }, @@ -1831,8 +1811,22 @@ "type": "string", "description": "Source of the configuration." }, + "isReadOnly": { + "type": "string", + "readOnly": true, + "description": "If is the configuration read only.", + "enum": [ + "True", + "False" + ], + "x-ms-enum": { + "name": "IsReadOnly", + "modelAsString": true + } + }, "isConfigPendingRestart": { "type": "string", + "readOnly": true, "description": "If is the configuration pending restart or not.", "enum": [ "True", @@ -1845,6 +1839,7 @@ }, "isDynamicConfig": { "type": "string", + "readOnly": true, "description": "If is the configuration dynamic.", "enum": [ "True", @@ -1890,57 +1885,26 @@ }, "description": "A list of server configurations." }, - "ConfigurationForUpdate": { - "properties": { - "name": { - "type": "string", - "description": "Name of the configuration." - }, - "properties": { - "properties": { - "value": { - "type": "string", - "description": "Value of the configuration." - }, - "source": { - "type": "string", - "description": "Source of the configuration." - } - }, - "x-ms-client-flatten": true, - "description": "The properties can be updated for a configuration." - } - }, - "description": "Represents a Configuration." - }, - "ConfigurationUpdateList": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/ConfigurationForUpdate" - }, - "description": "The list of server configurations." - } - }, - "description": "A list of server configurations to update." - }, "MaintenanceWindowProperties": { "properties": { "dayOfWeek": { "type": "integer", + "format": "int32", "description": "The day of week of the maintenance window to start" }, "durationInMinutes": { "type": "integer", + "format": "int32", "description": "The duration of the maintenance window to run." }, "startHour": { "type": "integer", + "format": "int32", "description": "The starting hour of the maintenance window." }, "startMinute": { "type": "integer", + "format": "int32", "description": "The starting minutes of the maintenance window." } }, @@ -1970,16 +1934,21 @@ "description": "Represents a server maintenance window." }, "MaintenanceWindowListResult": { + "type": "object", "properties": { "value": { "type": "array", "items": { "$ref": "#/definitions/MaintenanceWindow" }, - "description": "The list of maintenance windows in a server." + "description": "The list of server maintenance window." + }, + "nextLink": { + "description": "The link used to get the next page of operations.", + "type": "string" } }, - "description": "A list of maintenance windows." + "description": "A list of maintenance windows for a MySQL server." }, "OperationDisplay": { "properties": { From 25bb3e7d2eb8a4017355aa9db263d9f654ac9c76 Mon Sep 17 00:00:00 2001 From: suna Liu Date: Fri, 31 Jul 2020 14:42:53 +0800 Subject: [PATCH 08/40] Fix LintDiff check errors --- .../2020-07-01-privatepreview/mysql.json | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) 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 742b992e274a..023b156c44f6 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 @@ -34,7 +34,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}": { "put": { "tags": [ "Servers" @@ -241,7 +241,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers": { "get": { "tags": [ "Servers" @@ -283,7 +283,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.DBForMySQL/flexibleServers": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForMySql/flexibleServers": { "get": { "tags": [ "Servers" @@ -322,7 +322,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/restart": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/restart": { "post": { "tags": [ "ServerRestart" @@ -365,7 +365,7 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/start": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/start": { "post": { "tags": [ "ServerStart" @@ -408,7 +408,7 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/stop": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/stop": { "post": { "tags": [ "ServerStop" @@ -451,7 +451,7 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/replicas": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/replicas": { "get": { "tags": [ "Servers" @@ -496,7 +496,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/firewallRules/{firewallRuleName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/firewallRules/{firewallRuleName}": { "put": { "tags": [ "FirewallRules" @@ -650,7 +650,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/firewallRules": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/firewallRules": { "get": { "tags": [ "FirewallRules" @@ -695,7 +695,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/databases/{databaseName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/databases/{databaseName}": { "put": { "tags": [ "Databases" @@ -849,7 +849,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/databases": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/databases": { "get": { "tags": [ "Databases" @@ -894,14 +894,14 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/configurations/{configurationName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/configurations/{configurationName}": { "patch": { "tags": [ "Configurations" ], "operationId": "FlexibleServersConfigurations_Update", "x-ms-examples": { - "Update a user configration": { + "Update a user configuration": { "$ref": "./examples/ConfigurationUpdate.json" } }, @@ -995,7 +995,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/configurations": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/configurations": { "get": { "tags": [ "Configurations" @@ -1040,7 +1040,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/maintenanceWindows/{maintenanceWindowName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/maintenanceWindows/{maintenanceWindowName}": { "put": { "tags": [ "MaintenanceWindows" @@ -1194,7 +1194,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySQL/flexibleServers/{serverName}/maintenanceWindows": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/maintenanceWindows": { "get": { "tags": [ "MaintenanceWindows" @@ -1239,7 +1239,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.DBForMySQL/checkNameAvailability": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForMySql/checkNameAvailability": { "post": { "tags": [ "CheckNameAvailability" @@ -1284,7 +1284,7 @@ } } }, - "/providers/Microsoft.DBForMySQL/operations": { + "/providers/Microsoft.DBForMySql/operations": { "get": { "tags": [ "Operations" From f2effc9c079ffb18d9da0e215689576950c9aea1 Mon Sep 17 00:00:00 2001 From: suna Liu Date: Mon, 3 Aug 2020 11:28:05 +0800 Subject: [PATCH 09/40] change storageIOps to storageIops --- .../examples/ReplicasListByServer.json | 6 +++--- .../2020-07-01-privatepreview/examples/ServerCreate.json | 6 +++--- .../examples/ServerCreateReplica.json | 4 ++-- .../examples/ServerCreateWithPointInTimeRestore.json | 4 ++-- .../2020-07-01-privatepreview/examples/ServerGet.json | 2 +- .../examples/ServerGetWithVnet.json | 2 +- .../2020-07-01-privatepreview/examples/ServersList.json | 6 +++--- .../examples/ServersListByResourceGroup.json | 4 ++-- .../preview/2020-07-01-privatepreview/mysql.json | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ReplicasListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ReplicasListByServer.json index 42c8fceea849..3adac848f697 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ReplicasListByServer.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ReplicasListByServer.json @@ -24,7 +24,7 @@ "properties": { "storageProfile": { "storageMB": 256000, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 35 }, "administratorLogin": "cloudsa", @@ -53,7 +53,7 @@ "properties": { "storageProfile": { "storageMB": 256000, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 35 }, "administratorLogin": "cloudsa", @@ -82,7 +82,7 @@ "properties": { "storageProfile": { "storageMB": 256000, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 35 }, "administratorLogin": "cloudsa", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreate.json index 17c588c0504e..66901e5f2c54 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreate.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreate.json @@ -13,7 +13,7 @@ "publicNetworkAccess": "Enabled", "storageProfile": { "storageMB": 128000, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 7 }, "createMode": "Default" @@ -38,7 +38,7 @@ "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 7 }, "version": "5.7", @@ -73,7 +73,7 @@ "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 7 }, "version": "5.7", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateReplica.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateReplica.json index 3c6fd9ecee60..5fd812fe0901 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateReplica.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateReplica.json @@ -23,7 +23,7 @@ "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 14 }, "version": "5.7", @@ -54,7 +54,7 @@ "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 14 }, "version": "5.7", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateWithPointInTimeRestore.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateWithPointInTimeRestore.json index 0f7ebe2f7be6..4b3990b72432 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateWithPointInTimeRestore.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateWithPointInTimeRestore.json @@ -31,7 +31,7 @@ "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 7 }, "version": "5.7", @@ -66,7 +66,7 @@ "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 7 }, "version": "5.7", 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 0f7a328ee264..ae8793aa74e7 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 @@ -16,7 +16,7 @@ "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 7 }, "version": "5.7", 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 f9035ae121a9..a2fc5d608772 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 @@ -16,7 +16,7 @@ "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 7 }, "version": "5.7", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersList.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersList.json index 1f2c6f7c3373..07bb843e2ef6 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersList.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersList.json @@ -16,7 +16,7 @@ "administratorLogin": "testuser", "storageProfile": { "storageMB": 5120, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 7 }, "version": "5.7", @@ -39,7 +39,7 @@ "administratorLogin": "testuser", "storageProfile": { "storageMB": 5120, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 7 }, "version": "5.7", @@ -62,7 +62,7 @@ "administratorLogin": "testuser", "storageProfile": { "storageMB": 102400, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 35 }, "version": "5.7", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersListByResourceGroup.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersListByResourceGroup.json index a2b253402604..e782700573d2 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersListByResourceGroup.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServersListByResourceGroup.json @@ -17,7 +17,7 @@ "administratorLogin": "testuser", "storageProfile": { "storageMB": 5120, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 7 }, "version": "5.7", @@ -40,7 +40,7 @@ "administratorLogin": "testuser", "storageProfile": { "storageMB": 5120, - "storageIOps": 200, + "storageIops": 200, "backupRetentionDays": 7 }, "version": "5.7", 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 023b156c44f6..dd2652a98858 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 @@ -1395,7 +1395,7 @@ "format": "int32", "description": "Max storage allowed for a server." }, - "storageIOps": { + "storageIops": { "type": "integer", "format": "int32", "description": "Storage IOPS for a server." From 5ca899dd2e1ca22b177dab47d4b309430175cc8d Mon Sep 17 00:00:00 2001 From: suna Liu Date: Thu, 6 Aug 2020 13:52:32 +0800 Subject: [PATCH 10/40] Change operations to old name --- .../examples/ServerGet.json | 1 + .../2020-07-01-privatepreview/mysql.json | 57 ++++++++++--------- 2 files changed, 32 insertions(+), 26 deletions(-) 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 ae8793aa74e7..26101224c4d2 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 @@ -23,6 +23,7 @@ "sslEnforcement": "Enabled", "state": "Ready", "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com", + "earliestRestoreDate": "2020-03-14T18:02:41.577+00:00", "replicationRole": "None", "primaryServerId": "", "replicaCapacity": 5, 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 dd2652a98858..33c2295f54d1 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 @@ -39,7 +39,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Create", + "operationId": "Servers_Create", "x-ms-examples": { "Create a new server": { "$ref": "./examples/ServerCreate.json" @@ -104,7 +104,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Update", + "operationId": "Servers_Update", "x-ms-examples": { "Update a server": { "$ref": "./examples/ServerUpdate.json" @@ -157,7 +157,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Delete", + "operationId": "Servers_Delete", "x-ms-examples": { "Delete a server": { "$ref": "./examples/ServerDelete.json" @@ -201,7 +201,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Get", + "operationId": "Servers_Get", "x-ms-examples": { "Get a server": { "$ref": "./examples/ServerGet.json" @@ -246,7 +246,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_ListByResourceGroup", + "operationId": "Servers_ListByResourceGroup", "x-ms-examples": { "List servers in a resource group": { "$ref": "./examples/ServersListByResourceGroup.json" @@ -288,7 +288,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_List", + "operationId": "Servers_List", "x-ms-examples": { "List servers in a subscription": { "$ref": "./examples/ServersList.json" @@ -327,7 +327,7 @@ "tags": [ "ServerRestart" ], - "operationId": "FlexibleServers_Restart", + "operationId": "Servers_Restart", "x-ms-examples": { "Restart a server": { "$ref": "./examples/ServerRestart.json" @@ -370,7 +370,7 @@ "tags": [ "ServerStart" ], - "operationId": "FlexibleServers_Start", + "operationId": "Servers_Start", "x-ms-examples": { "Start a server": { "$ref": "./examples/ServerStart.json" @@ -413,7 +413,7 @@ "tags": [ "ServerStop" ], - "operationId": "FlexibleServers_Stop", + "operationId": "Servers_Stop", "x-ms-examples": { "Stop a server": { "$ref": "./examples/ServerStop.json" @@ -456,7 +456,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServersReplicas_ListByServer", + "operationId": "Replicas_ListByServer", "x-ms-examples": { "List replicas for a server": { "$ref": "./examples/ReplicasListByServer.json" @@ -501,7 +501,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_CreateOrUpdate", + "operationId": "FirewallRules_CreateOrUpdate", "x-ms-examples": { "Create a firewall rule": { "$ref": "./examples/FirewallRuleCreate.json" @@ -563,7 +563,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_Delete", + "operationId": "FirewallRules_Delete", "x-ms-examples": { "Delete a firewall rule": { "$ref": "./examples/FirewallRuleDelete.json" @@ -610,7 +610,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_Get", + "operationId": "FirewallRules_Get", "x-ms-examples": { "Get a firewall rule": { "$ref": "./examples/FirewallRuleGet.json" @@ -655,7 +655,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_ListByServer", + "operationId": "FirewallRules_ListByServer", "x-ms-examples": { "List all firewall rules in a server": { "$ref": "./examples/FirewallRulesListByServer.json" @@ -700,7 +700,7 @@ "tags": [ "Databases" ], - "operationId": "FlexibleServersDatabases_CreateOrUpdate", + "operationId": "Databases_CreateOrUpdate", "x-ms-examples": { "Create a database": { "$ref": "./examples/DatabaseCreate.json" @@ -762,7 +762,7 @@ "tags": [ "Databases" ], - "operationId": "FlexibleServersDatabases_Delete", + "operationId": "Databases_Delete", "x-ms-examples": { "Delete a database": { "$ref": "./examples/DatabaseDelete.json" @@ -809,7 +809,7 @@ "tags": [ "Databases" ], - "operationId": "FlexibleServersDatabases_Get", + "operationId": "Databases_Get", "x-ms-examples": { "Get a database": { "$ref": "./examples/DatabaseGet.json" @@ -854,7 +854,7 @@ "tags": [ "Databases" ], - "operationId": "FlexibleServersDatabases_ListByServer", + "operationId": "Databases_ListByServer", "x-ms-examples": { "List databases in a server": { "$ref": "./examples/DatabasesListByServer.json" @@ -899,7 +899,7 @@ "tags": [ "Configurations" ], - "operationId": "FlexibleServersConfigurations_Update", + "operationId": "Configurations_Update", "x-ms-examples": { "Update a user configuration": { "$ref": "./examples/ConfigurationUpdate.json" @@ -955,7 +955,7 @@ "tags": [ "Configurations" ], - "operationId": "FlexibleServersConfigurations_Get", + "operationId": "Configurations_Get", "x-ms-examples": { "Get a configuration": { "$ref": "./examples/ConfigurationGet.json" @@ -1000,7 +1000,7 @@ "tags": [ "Configurations" ], - "operationId": "FlexibleServersConfigurations_ListByServer", + "operationId": "Configurations_ListByServer", "x-ms-examples": { "List all configurations for a server": { "$ref": "./examples/ConfigurationsListByServer.json" @@ -1045,7 +1045,7 @@ "tags": [ "MaintenanceWindows" ], - "operationId": "FlexibleServersMaintenanceWindows_CreateOrUpdate", + "operationId": "MaintenanceWindows_CreateOrUpdate", "x-ms-examples": { "Create a maintenance window": { "$ref": "./examples/MaintenanceWindowCreate.json" @@ -1107,7 +1107,7 @@ "tags": [ "MaintenanceWindows" ], - "operationId": "FlexibleServersMaintenanceWindows_Delete", + "operationId": "MaintenanceWindows_Delete", "x-ms-examples": { "Delete a maintenance window": { "$ref": "./examples/MaintenanceWindowDelete.json" @@ -1154,7 +1154,7 @@ "tags": [ "MaintenanceWindows" ], - "operationId": "FlexibleServersMaintenanceWindows_Get", + "operationId": "MaintenanceWindows_Get", "x-ms-examples": { "Get a maintenance window": { "$ref": "./examples/MaintenanceWindowGet.json" @@ -1199,7 +1199,7 @@ "tags": [ "MaintenanceWindows" ], - "operationId": "FlexibleServersMaintenanceWindows_ListByServer", + "operationId": "MaintenanceWindows_ListByServer", "x-ms-examples": { "List maintenance windows for a server": { "$ref": "./examples/MaintenanceWindowsListByServer.json" @@ -1244,7 +1244,7 @@ "tags": [ "CheckNameAvailability" ], - "operationId": "FlexibleServersCheckNameAvailability_Execute", + "operationId": "CheckNameAvailability_Execute", "x-ms-examples": { "Check name availability": { "$ref": "./examples/CheckNameAvailability.json" @@ -1517,6 +1517,11 @@ "description": "The fully qualified domain name of a server.", "readOnly": true }, + "earliestRestoreDate": { + "type": "string", + "format": "date-time", + "description": "Earliest restore point creation time (ISO8601 format)" + }, "storageProfile": { "$ref": "#/definitions/StorageProfile", "description": "Storage profile of a server." From 656bdbc94fac03c802092655cd80187423fcd4af Mon Sep 17 00:00:00 2001 From: Mollee Jain Date: Thu, 6 Aug 2020 14:05:53 -0700 Subject: [PATCH 11/40] Multiple namespaces for flexible server enablement Python SDK --- .../mysql/resource-manager/readme.az.md | 14 +++ .../mysql/resource-manager/readme.md | 26 +---- .../mysql/resource-manager/readme.python.md | 107 ++++++++++++++++++ .../postgresql/resource-manager/readme.az.md | 14 +++ .../postgresql/resource-manager/readme.md | 25 +--- .../resource-manager/readme.python.md | 107 ++++++++++++++++++ 6 files changed, 244 insertions(+), 49 deletions(-) create mode 100644 specification/mysql/resource-manager/readme.az.md create mode 100644 specification/mysql/resource-manager/readme.python.md create mode 100644 specification/postgresql/resource-manager/readme.az.md create mode 100644 specification/postgresql/resource-manager/readme.python.md 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.md b/specification/mysql/resource-manager/readme.md index cb35a0c056fa..91b6a010facf 100644 --- a/specification/mysql/resource-manager/readme.md +++ b/specification/mysql/resource-manager/readme.md @@ -159,33 +159,9 @@ csharp: clear-output-folder: true ``` - ## 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..efbc80ed1dda --- /dev/null +++ b/specification/mysql/resource-manager/readme.python.md @@ -0,0 +1,107 @@ +## 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: + 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 +``` + +### Python 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 + - tag: package-2017-12-01-preview +``` + +### 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/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.md b/specification/postgresql/resource-manager/readme.md index fff38f5d4148..45bf2a56ed41 100644 --- a/specification/postgresql/resource-manager/readme.md +++ b/specification/postgresql/resource-manager/readme.md @@ -158,30 +158,7 @@ csharp: ## 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..7629a8acbb46 --- /dev/null +++ b/specification/postgresql/resource-manager/readme.python.md @@ -0,0 +1,107 @@ +## 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: + 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 +``` + +### Python 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 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 From 474767a72c9481d059f1823e24787b8b8bfe2fa9 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Thu, 6 Aug 2020 15:48:53 -0700 Subject: [PATCH 12/40] Revert the Model name changes --- .../2020-02-14-privatepreview/postgresql.json | 226 +++++++++--------- 1 file changed, 113 insertions(+), 113 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 1aaf6b7dd7cf..9ec9b33eeb38 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json @@ -60,14 +60,14 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FlexibleServer" + "$ref": "#/definitions/Server" }, "description": "The required parameters for creating or updating a server." } @@ -76,13 +76,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServer" + "$ref": "#/definitions/Server" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/FlexibleServer" + "$ref": "#/definitions/Server" } }, "202": { @@ -91,7 +91,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -119,14 +119,14 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FlexibleServerForUpdate" + "$ref": "#/definitions/ServerForUpdate" }, "description": "The required parameters for updating a server." } @@ -135,7 +135,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServer" + "$ref": "#/definitions/Server" } }, "202": { @@ -144,7 +144,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -172,7 +172,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { @@ -188,7 +188,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -219,20 +219,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServer" + "$ref": "#/definitions/Server" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -265,13 +265,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerListResult" + "$ref": "#/definitions/ServerListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -304,13 +304,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerListResult" + "$ref": "#/definitions/ServerListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -342,7 +342,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { @@ -355,7 +355,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -385,7 +385,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { @@ -398,7 +398,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -428,7 +428,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { @@ -441,7 +441,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -471,17 +471,17 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerFirewallRuleNameParameter" + "$ref": "#/parameters/FirewallRuleNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FlexibleServerFirewallRule" + "$ref": "#/definitions/FirewallRule" }, "description": "The required parameters for creating or updating a firewall rule." } @@ -490,13 +490,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerFirewallRule" + "$ref": "#/definitions/FirewallRule" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/FlexibleServerFirewallRule" + "$ref": "#/definitions/FirewallRule" } }, "202": { @@ -505,7 +505,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -515,7 +515,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServerFirewallRules_Delete", + "operationId": "FirewallRules_Delete", "x-ms-examples": { "FirewallRuleDelete": { "$ref": "./examples/FirewallRuleDelete.json" @@ -533,10 +533,10 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerFirewallRuleNameParameter" + "$ref": "#/parameters/FirewallRuleNameParameter" } ], "responses": { @@ -552,7 +552,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -580,23 +580,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerFirewallRuleNameParameter" + "$ref": "#/parameters/FirewallRuleNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerFirewallRule" + "$ref": "#/definitions/FirewallRule" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -625,20 +625,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerFirewallRuleListResult" + "$ref": "#/definitions/FirewallRuleListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -670,20 +670,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerConfigurationListResult" + "$ref": "#/definitions/ConfigurationListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -715,23 +715,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerConfigurationNameParameter" + "$ref": "#/parameters/ConfigurationNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerConfiguration" + "$ref": "#/definitions/Configuration" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -760,17 +760,17 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerMaintenanceWindowNameParameter" + "$ref": "#/parameters/MaintenanceWindowNameParameter" }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" + "$ref": "#/definitions/CustomerMaintenanceWindow" }, "description": "The required parameters for creating or updating a customer maintenance window." } @@ -779,13 +779,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" + "$ref": "#/definitions/CustomerMaintenanceWindow" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" + "$ref": "#/definitions/CustomerMaintenanceWindow" } }, "202": { @@ -794,7 +794,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -822,10 +822,10 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerMaintenanceWindowNameParameter" + "$ref": "#/parameters/MaintenanceWindowNameParameter" } ], "responses": { @@ -841,7 +841,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } }, @@ -869,23 +869,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" }, { - "$ref": "#/parameters/FlexibleServerMaintenanceWindowNameParameter" + "$ref": "#/parameters/MaintenanceWindowNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" + "$ref": "#/definitions/CustomerMaintenanceWindow" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -914,20 +914,20 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/FlexibleServerNameParameter" + "$ref": "#/parameters/ServerNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindowListResult" + "$ref": "#/definitions/CustomerMaintenanceWindowListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -957,7 +957,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FlexibleServerNameAvailabilityRequest" + "$ref": "#/definitions/NameAvailabilityRequest" }, "description": "The required parameters for checking if resource name is available." } @@ -966,13 +966,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerNameAvailability" + "$ref": "#/definitions/NameAvailability" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -999,13 +999,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FlexibleServerOperationListResult" + "$ref": "#/definitions/OperationListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/FlexibleServerCloudError" + "$ref": "#/definitions/CloudError" } } } @@ -1013,7 +1013,7 @@ } }, "definitions": { - "FlexibleServerVersion": { + "ServerVersion": { "type": "string", "description": "The version of a server.", "enum": [ @@ -1024,7 +1024,7 @@ "modelAsString": true } }, - "FlexibleServerProperties": { + "ServerProperties": { "properties": { "administratorLogin": { "type": "string", @@ -1045,7 +1045,7 @@ ] }, "version": { - "$ref": "#/definitions/FlexibleServerVersion", + "$ref": "#/definitions/ServerVersion", "description": "PostgreSQL Server version." }, "state": { @@ -1093,7 +1093,7 @@ "description": "The display name of a server." }, "storageProfile": { - "$ref": "#/definitions/FlexibleServerStorageProfile", + "$ref": "#/definitions/StorageProfile", "description": "Storage profile of a server." }, "publicNetworkAccess": { @@ -1163,18 +1163,18 @@ }, "description": "The properties of a server." }, - "FlexibleServer": { + "Server": { "properties": { "identity": { "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Identity", "description": "The Azure Active Directory identity of the server." }, "sku": { - "$ref": "#/definitions/FlexibleServerSku", + "$ref": "#/definitions/Sku", "description": "The SKU (pricing tier) of the server." }, "properties": { - "$ref": "#/definitions/FlexibleServerProperties", + "$ref": "#/definitions/ServerProperties", "x-ms-client-flatten": true, "description": "Properties of the server." } @@ -1186,7 +1186,7 @@ ], "description": "Represents a server." }, - "FlexibleServerPropertiesForUpdate": { + "ServerPropertiesForUpdate": { "properties": { "administratorLoginPassword": { "type": "string", @@ -1199,7 +1199,7 @@ "description": "Max compute of a server is 64vCores." }, "storageProfile": { - "$ref": "#/definitions/FlexibleServerStorageProfile", + "$ref": "#/definitions/StorageProfile", "description": "Storage profile of a server." }, "standbyCount": { @@ -1209,18 +1209,18 @@ } } }, - "FlexibleServerForUpdate": { + "ServerForUpdate": { "properties": { "location": { "type": "string", "description": "The location the resource resides in." }, "sku": { - "$ref": "#/definitions/FlexibleServerSku", + "$ref": "#/definitions/Sku", "description": "The SKU (pricing tier) of the server." }, "properties": { - "$ref": "#/definitions/FlexibleServerPropertiesForUpdate", + "$ref": "#/definitions/ServerPropertiesForUpdate", "x-ms-client-flatten": false, "description": "Properties of the server." }, @@ -1234,13 +1234,13 @@ }, "description": "Represents a server to be updated." }, - "FlexibleServerListResult": { + "ServerListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FlexibleServer" + "$ref": "#/definitions/Server" }, "description": "The list of flexible servers" }, @@ -1251,7 +1251,7 @@ }, "description": "A list of servers." }, - "FlexibleServerStorageProfile": { + "StorageProfile": { "properties": { "backupRetentionDays": { "type": "integer", @@ -1266,7 +1266,7 @@ }, "description": "Storage Profile properties of a server" }, - "FlexibleServerSku": { + "Sku": { "properties": { "name": { "type": "string", @@ -1281,7 +1281,7 @@ "MemoryOptimized" ], "x-ms-enum": { - "name": "FlexibleServerSkuTier", + "name": "SkuTier", "modelAsString": true } }, @@ -1294,7 +1294,7 @@ }, "description": "Sku information related properties of a server." }, - "FlexibleServerFirewallRuleProperties": { + "FirewallRuleProperties": { "properties": { "startIpAddress": { "type": "string", @@ -1313,10 +1313,10 @@ ], "description": "The properties of a server firewall rule." }, - "FlexibleServerFirewallRule": { + "FirewallRule": { "properties": { "properties": { - "$ref": "#/definitions/FlexibleServerFirewallRuleProperties", + "$ref": "#/definitions/FirewallRuleProperties", "x-ms-client-flatten": true, "description": "The properties of a firewall rule." } @@ -1331,13 +1331,13 @@ ], "description": "Represents a server firewall rule." }, - "FlexibleServerFirewallRuleListResult": { + "FirewallRuleListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FlexibleServerFirewallRule" + "$ref": "#/definitions/FirewallRule" }, "description": "The list of firewall rules in a server." }, @@ -1348,7 +1348,7 @@ }, "description": "A list of firewall rules." }, - "FlexibleServerCustomerMaintenanceWindowProperties": { + "CustomerMaintenanceWindowProperties": { "properties": { "dayOfWeek": { "type": "integer", @@ -1378,10 +1378,10 @@ ], "description": "The properties of a server firewall rule." }, - "FlexibleServerCustomerMaintenanceWindow": { + "CustomerMaintenanceWindow": { "properties": { "properties": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindowProperties", + "$ref": "#/definitions/CustomerMaintenanceWindowProperties", "x-ms-client-flatten": true, "description": "The properties of a customer maintenance window." } @@ -1396,19 +1396,19 @@ ], "description": "Represents a server firewall rule." }, - "FlexibleServerCustomerMaintenanceWindowListResult": { + "CustomerMaintenanceWindowListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FlexibleServerCustomerMaintenanceWindow" + "$ref": "#/definitions/CustomerMaintenanceWindow" }, "description": "The list of CustomerMaintenanceWindows in a PostgreSQL server." } }, "description": "A list of firewall rules." }, - "FlexibleServerConfigurationProperties": { + "ConfigurationProperties": { "properties": { "value": { "type": "string", @@ -1451,10 +1451,10 @@ }, "description": "The properties of a configuration." }, - "FlexibleServerConfiguration": { + "Configuration": { "properties": { "properties": { - "$ref": "#/definitions/FlexibleServerConfigurationProperties", + "$ref": "#/definitions/ConfigurationProperties", "x-ms-client-flatten": true, "description": "The properties of a configuration." } @@ -1466,13 +1466,13 @@ ], "description": "Represents a Configuration." }, - "FlexibleServerConfigurationListResult": { + "ConfigurationListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FlexibleServerConfiguration" + "$ref": "#/definitions/Configuration" }, "description": "The list of server configurations." }, @@ -1483,7 +1483,7 @@ }, "description": "A list of server configurations." }, - "FlexibleServerOperationDisplay": { + "OperationDisplay": { "properties": { "provider": { "type": "string", @@ -1508,7 +1508,7 @@ }, "description": "Display metadata associated with the operation." }, - "FlexibleServerOperation": { + "Operation": { "properties": { "name": { "type": "string", @@ -1516,7 +1516,7 @@ "description": "The name of the operation being performed on this particular object." }, "display": { - "$ref": "#/definitions/FlexibleServerOperationDisplay", + "$ref": "#/definitions/OperationDisplay", "readOnly": true, "description": "The localized display information for this particular operation or action." }, @@ -1546,19 +1546,19 @@ }, "description": "REST API operation definition." }, - "FlexibleServerOperationListResult": { + "OperationListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FlexibleServerOperation" + "$ref": "#/definitions/Operation" }, "description": "The list of resource provider operations." } }, "description": "A list of resource provider operations." }, - "FlexibleServerNameAvailabilityRequest": { + "NameAvailabilityRequest": { "required": [ "name" ], @@ -1574,7 +1574,7 @@ }, "description": "Request from client to check resource name availability." }, - "FlexibleServerNameAvailability": { + "NameAvailability": { "properties": { "message": { "type": "string", @@ -1595,7 +1595,7 @@ }, "description": "Represents a resource name availability." }, - "FlexibleServerCloudError": { + "CloudError": { "x-ms-external": true, "properties": { "error": { @@ -1606,7 +1606,7 @@ } }, "parameters": { - "FlexibleServerNameParameter": { + "ServerNameParameter": { "name": "serverName", "in": "path", "required": true, @@ -1614,7 +1614,7 @@ "description": "The name of the server.", "x-ms-parameter-location": "method" }, - "FlexibleServerFirewallRuleNameParameter": { + "FirewallRuleNameParameter": { "name": "firewallRuleName", "in": "path", "required": true, @@ -1622,7 +1622,7 @@ "description": "The name of the server firewall rule.", "x-ms-parameter-location": "method" }, - "FlexibleServerConfigurationNameParameter": { + "ConfigurationNameParameter": { "name": "configurationName", "in": "path", "required": true, @@ -1630,7 +1630,7 @@ "description": "The name of the server configuration.", "x-ms-parameter-location": "method" }, - "FlexibleServerMaintenanceWindowNameParameter": { + "MaintenanceWindowNameParameter": { "name": "maintenanceWindowName", "in": "path", "required": true, From 0451dc2002290e4b3886fd4d3fb09c7100ffec05 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Fri, 7 Aug 2020 11:39:08 -0700 Subject: [PATCH 13/40] Undo Operation ID name changes --- .../2020-02-14-privatepreview/postgresql.json | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 9ec9b33eeb38..c553c9b5a3cd 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json @@ -39,7 +39,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Create", + "operationId": "Servers_Create", "x-ms-examples": { "Create a new server": { "$ref": "./examples/ServerCreate.json" @@ -101,7 +101,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Update", + "operationId": "Servers_Update", "x-ms-examples": { "ServerUpdate": { "$ref": "./examples/ServerUpdate.json" @@ -154,7 +154,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Delete", + "operationId": "Servers_Delete", "x-ms-examples": { "ServerDelete": { "$ref": "./examples/ServerDelete.json" @@ -198,7 +198,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_Get", + "operationId": "Servers_Get", "x-ms-examples": { "ServerGet": { "$ref": "./examples/ServerGet.json" @@ -243,7 +243,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_ListByResourceGroup", + "operationId": "Servers_ListByResourceGroup", "x-ms-examples": { "ServerListByResourceGroup": { "$ref": "./examples/ServerListByResourceGroup.json" @@ -285,7 +285,7 @@ "tags": [ "Servers" ], - "operationId": "FlexibleServers_List", + "operationId": "Servers_List", "x-ms-examples": { "ServerList": { "$ref": "./examples/ServerList.json" @@ -324,7 +324,7 @@ "tags": [ "ServerRestart" ], - "operationId": "FlexibleServers_Restart", + "operationId": "Servers_Restart", "x-ms-examples": { "ServerRestart": { "$ref": "./examples/ServerRestart.json" @@ -367,7 +367,7 @@ "tags": [ "ServerStart" ], - "operationId": "FlexibleServers_Start", + "operationId": "Servers_Start", "x-ms-examples": { "ServerStart": { "$ref": "./examples/ServerStart.json" @@ -410,7 +410,7 @@ "tags": [ "ServerStop" ], - "operationId": "FlexibleServers_Stop", + "operationId": "Servers_Stop", "x-ms-examples": { "ServerStop": { "$ref": "./examples/ServerStop.json" @@ -453,7 +453,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_CreateOrUpdate", + "operationId": "FirewallRules_CreateOrUpdate", "x-ms-examples": { "FirewallRuleCreate": { "$ref": "./examples/FirewallRuleCreate.json" @@ -562,7 +562,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_Get", + "operationId": "FirewallRules_Get", "x-ms-examples": { "FirewallRuleList": { "$ref": "./examples/FirewallRuleGet.json" @@ -607,7 +607,7 @@ "tags": [ "FirewallRules" ], - "operationId": "FlexibleServersFirewallRules_ListByServer", + "operationId": "FirewallRules_ListByServer", "x-ms-examples": { "FirewallRuleList": { "$ref": "./examples/FirewallRuleListByServer.json" @@ -652,7 +652,7 @@ "tags": [ "Configurations" ], - "operationId": "FlexibleServersConfigurations_ListByServer", + "operationId": "Configurations_ListByServer", "x-ms-examples": { "ConfigurationList": { "$ref": "./examples/ConfigurationListByServer.json" @@ -697,7 +697,7 @@ "tags": [ "Configurations" ], - "operationId": "FlexibleServersConfigurations_Get", + "operationId": "Configurations_Get", "x-ms-examples": { "ConfigurationGet": { "$ref": "./examples/ConfigurationGet.json" @@ -742,7 +742,7 @@ "tags": [ "CustomerMaintenanceWindow" ], - "operationId": "FlexibleServersCustomerMaintenanceWindow_CreateOrUpdate", + "operationId": "CustomerMaintenanceWindow_CreateOrUpdate", "x-ms-examples": { "CustomerMaintenanceWindowCreate": { "$ref": "./examples/CustomerMaintenanceWindowCreate.json" @@ -804,7 +804,7 @@ "tags": [ "CustomerMaintenanceWindow" ], - "operationId": "FlexibleServersCustomerMaintenanceWindow_Delete", + "operationId": "CustomerMaintenanceWindow_Delete", "x-ms-examples": { "CustomerMaintenanceWindowDelete": { "$ref": "./examples/CustomerMaintenanceWindowDelete.json" @@ -851,7 +851,7 @@ "tags": [ "CustomerMaintenanceWindow" ], - "operationId": "FlexibleServersCustomerMaintenanceWindow_Get", + "operationId": "CustomerMaintenanceWindow_Get", "x-ms-examples": { "CustomerMaintenanceWindowGet": { "$ref": "./examples/CustomerMaintenanceWindowGet.json" @@ -896,7 +896,7 @@ "tags": [ "CustomerMaintenanceWindow" ], - "operationId": "FlexibleServersCustomerMaintenanceWindow_ListByServer", + "operationId": "CustomerMaintenanceWindow_ListByServer", "x-ms-examples": { "CustomerMaintenanceWindowList": { "$ref": "./examples/CustomerMaintenanceWindowListByServer.json" @@ -938,7 +938,7 @@ "tags": [ "CheckNameAvailability" ], - "operationId": "FlexibleServersCheckNameAvailability_Execute", + "operationId": "CheckNameAvailability_Execute", "x-ms-examples": { "NameAvailability": { "$ref": "./examples/CheckNameAvailability.json" @@ -983,7 +983,7 @@ "tags": [ "Operations" ], - "operationId": "FlexibleServerOperations_List", + "operationId": "Operations_List", "x-ms-examples": { "OperationList": { "$ref": "./examples/OperationList.json" From 8240bca3162b67316748e3b7ab407792cf0875e4 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Fri, 7 Aug 2020 12:02:42 -0700 Subject: [PATCH 14/40] revert readme.md file. --- specification/postgresql/resource-manager/readme.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/specification/postgresql/resource-manager/readme.md b/specification/postgresql/resource-manager/readme.md index 158ffc2ea1a1..fff38f5d4148 100644 --- a/specification/postgresql/resource-manager/readme.md +++ b/specification/postgresql/resource-manager/readme.md @@ -39,11 +39,6 @@ These settings apply only when `--tag=package-2020-02-14-privatepreview` is spec ``` yaml $(tag) == 'package-2020-02-14-privatepreview' input-file: - Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json -- Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json -- Microsoft.DBforPostgreSQL/stable/2018-06-01/PrivateEndpointConnections.json -- Microsoft.DBforPostgreSQL/stable/2018-06-01/PrivateLinkResources.json -- Microsoft.DBforPostgreSQL/stable/2020-01-01/DataEncryptionKeys.json -- Microsoft.DBforPostgreSQL/stable/2020-01-01/ServerSecurityAlertPolicies.json ``` ### Tag: package-2020-01-01-privatepreview From aa3ce8dcc8757952cf9957aea300c87109ec6fce Mon Sep 17 00:00:00 2001 From: Mollee Jain Date: Thu, 13 Aug 2020 11:24:29 -0700 Subject: [PATCH 15/40] mySQL udpate --- specification/mysql/resource-manager/readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/mysql/resource-manager/readme.md b/specification/mysql/resource-manager/readme.md index fef1875fc8a6..e0f51c557043 100644 --- a/specification/mysql/resource-manager/readme.md +++ b/specification/mysql/resource-manager/readme.md @@ -141,10 +141,13 @@ 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 - repo: azure-sdk-for-node + - repo: azure-cli-extensions ``` From 4e30fdff83842f451d788249617c1191030ef932 Mon Sep 17 00:00:00 2001 From: George Christoglou Date: Mon, 17 Aug 2020 20:48:10 +0300 Subject: [PATCH 16/40] Generate mysql & postgresql flexible servers SDKs --- .../mysql/resource-manager/readme.csharp.md | 103 ++++++++++++++++++ .../mysql/resource-manager/readme.go.md | 11 ++ .../mysql/resource-manager/readme.md | 12 +- .../resource-manager/readme.csharp.md | 101 +++++++++++++++++ .../postgresql/resource-manager/readme.go.md | 10 ++ .../postgresql/resource-manager/readme.md | 13 +-- 6 files changed, 227 insertions(+), 23 deletions(-) create mode 100644 specification/mysql/resource-manager/readme.csharp.md create mode 100644 specification/postgresql/resource-manager/readme.csharp.md 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..2573e3788882 100644 --- a/specification/mysql/resource-manager/readme.go.md +++ b/specification/mysql/resource-manager/readme.go.md @@ -7,17 +7,28 @@ go: license-header: MICROSOFT_APACHE_NO_VERSION namespace: mysql clear-output-folder: true + flexible-servers: flexible-servers ``` ### Go multi-api ``` 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) +output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/$(flexible-servers)/2020-07-01-privatepreview/$(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. diff --git a/specification/mysql/resource-manager/readme.md b/specification/mysql/resource-manager/readme.md index e0f51c557043..d14130278310 100644 --- a/specification/mysql/resource-manager/readme.md +++ b/specification/mysql/resource-manager/readme.md @@ -153,17 +153,7 @@ 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.python.md](./readme.csharp.md) ## Python 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..70052296042c 100644 --- a/specification/postgresql/resource-manager/readme.go.md +++ b/specification/postgresql/resource-manager/readme.go.md @@ -13,11 +13,21 @@ 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) +output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/$(flexible-servers)/2020-02-14-privatepreview/$(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. diff --git a/specification/postgresql/resource-manager/readme.md b/specification/postgresql/resource-manager/readme.md index 45bf2a56ed41..278011d245f4 100644 --- a/specification/postgresql/resource-manager/readme.md +++ b/specification/postgresql/resource-manager/readme.md @@ -143,18 +143,7 @@ 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.python.md](./readme.csharp.md) ## Python From 49461dd9c82a79f4f8ff84d2bd97fc501d066a90 Mon Sep 17 00:00:00 2001 From: Mollee Jain Date: Wed, 19 Aug 2020 11:51:05 -0700 Subject: [PATCH 17/40] updating readme with latest api for multiapi --- specification/postgresql/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/postgresql/resource-manager/readme.md b/specification/postgresql/resource-manager/readme.md index 45bf2a56ed41..df97dfe04e3a 100644 --- a/specification/postgresql/resource-manager/readme.md +++ b/specification/postgresql/resource-manager/readme.md @@ -180,6 +180,7 @@ require: $(this-folder)/../../../profiles/readme.md # all the input files across all versions input-file: + - $(this-folder)/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json - $(this-folder)/Microsoft.DBforPostgreSQL/preview/2020-01-01-privatepreview/DataEncryptionKeys.json - $(this-folder)/Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json - $(this-folder)/Microsoft.DBforPostgreSQL/stable/2018-06-01/PrivateEndpointConnections.json From 1cf7a296d42bba40428e19b0feb7a89cdd50ca5d Mon Sep 17 00:00:00 2001 From: George Christoglou Date: Fri, 21 Aug 2020 01:16:36 +0300 Subject: [PATCH 18/40] Fix go.md files --- specification/mysql/resource-manager/readme.go.md | 3 +-- specification/postgresql/resource-manager/readme.go.md | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/specification/mysql/resource-manager/readme.go.md b/specification/mysql/resource-manager/readme.go.md index 2573e3788882..e577ede6b34d 100644 --- a/specification/mysql/resource-manager/readme.go.md +++ b/specification/mysql/resource-manager/readme.go.md @@ -7,7 +7,6 @@ go: license-header: MICROSOFT_APACHE_NO_VERSION namespace: mysql clear-output-folder: true - flexible-servers: flexible-servers ``` ### Go multi-api @@ -26,7 +25,7 @@ These settings apply only when `--tag=package-2020-07-01-privatepreview --go` is Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2020-07-01-privatepreview' && $(go) -output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/$(flexible-servers)/2020-07-01-privatepreview/$(namespace) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/flexible-servers/2020-07-01-privatepreview/$(namespace) ``` ### Tag: package-2020-01-01 and go diff --git a/specification/postgresql/resource-manager/readme.go.md b/specification/postgresql/resource-manager/readme.go.md index 70052296042c..5212e88c6521 100644 --- a/specification/postgresql/resource-manager/readme.go.md +++ b/specification/postgresql/resource-manager/readme.go.md @@ -25,7 +25,7 @@ These settings apply only when `--tag=package-2020-02-14-privatepreview --go` is Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2020-02-14-privatepreview' && $(go) -output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/$(flexible-servers)/2020-02-14-privatepreview/$(namespace) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/flexible-servers/2020-02-14-privatepreview/$(namespace) ``` ### Tag: package-2020-01-01 and go From cbe04a2464f880a143dfa4b3c4e81b1d6ae66325 Mon Sep 17 00:00:00 2001 From: Mollee Jain Date: Mon, 24 Aug 2020 10:15:14 -0700 Subject: [PATCH 19/40] removing unnecessary after_scripts in mysql python --- specification/mysql/resource-manager/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/mysql/resource-manager/readme.md b/specification/mysql/resource-manager/readme.md index 42d9a586fe6e..58a371519dd1 100644 --- a/specification/mysql/resource-manager/readme.md +++ b/specification/mysql/resource-manager/readme.md @@ -141,8 +141,6 @@ 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 From 6f1e756b49bb194c9c54b9f45ff849d944741ebf Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 25 Aug 2020 13:04:41 -0700 Subject: [PATCH 20/40] PostgreSQL Flexible Server New API Swagger Changes --- .../examples/CapabilitiesByLocation.json | 180 +++++++ .../examples/ServerCreate.json | 19 +- .../ServerCreatePointInTimeRestore.json | 4 +- .../examples/ServerGetWithVnet.json | 7 +- .../examples/ServerKeyCreateOrUpdate.json | 43 ++ .../examples/ServerKeyDelete.json | 14 + .../examples/ServerKeyGet.json | 24 + .../examples/ServerKeyList.json | 27 + .../examples/ServerUpdate.json | 2 +- .../2020-02-14-privatepreview/postgresql.json | 495 +++++++++++++++++- 10 files changed, 773 insertions(+), 42 deletions(-) create mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CapabilitiesByLocation.json create mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyCreateOrUpdate.json create mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyDelete.json create mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyGet.json create mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyList.json 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..efe9cc7ea3cd --- /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/ServerCreate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreate.json index ebb30c443b02..c9660d93bb9e 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 @@ -15,11 +15,8 @@ "administratorLoginPassword": "password", "version": "12", "standbyCount": 0, - "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, @@ -48,10 +45,8 @@ "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", "standbyCount": 0, - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, "storageProfile": { "storageMB": 524288, @@ -83,10 +78,8 @@ "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", "standbyCount": 0, - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, "storageProfile": { "storageMB": 524288, 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..ce5c8e2e7675 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 @@ -29,7 +29,7 @@ "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", "standbyCount": 0, - "vnetInjArgs": {}, + "delegatedSubnetArguments": {}, "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 @@ -60,7 +60,7 @@ "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", "standbyCount": 0, - "vnetInjArgs": {}, + "delegatedSubnetArguments": {}, "storageProfile": { "storageMB": 524288, "backupRetentionDays": 7 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/ServerUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdate.json index 9be524337d1a..8cd9f7510092 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,7 @@ "storageMB": 524288, "backupRetentionDays": 20 }, - "vnetInjArgs": {}, + "delegatedSubnetArguments": {}, "availabilityZone": "1" }, "location": "westus", 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..0726b714992e 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 @@ -989,6 +989,214 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/flexibleServers/{serverName}/keys": { + "get": { + "tags": [ + "ServerKeys" + ], + "description": "Gets a list of Server keys.", + "operationId": "ServerKeys_List", + "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" + } + ], + "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" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "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/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": "Successfully updated the PostgreSQL Server key.", + "schema": { + "$ref": "#/definitions/ServerKey" + } + }, + "202": { + "description": "Operation in progress", + "schema": { + "$ref": "#/definitions/ServerKey" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Creates or updates a PostgreSQL Server key": { + "$ref": "./examples/ServerKeyCreateOrUpdate.json" + } + } + }, + "delete": { + "tags": [ + "ServerKeys" + ], + "description": "Deletes the PostgreSQL Server key with the given name.", + "operationId": "ServerKeys_Delete", + "parameters": [ + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "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/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "Successfully deleted the PostgreSQL Server key." + }, + "202": { + "description": "Operation in progress" + }, + "204": { + "description": "The specified PostgreSQL Server key does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "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": [ @@ -1034,6 +1242,42 @@ } } }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DBforPostgreSQL/locations/{locationName}/capabilities": { + "get": { + "tags": [ + "LocationBasedCapabilities" + ], + "operationId": "LocationBasedCapabilities", + "x-ms-examples": { + "CapabilitiesList": { + "$ref": "./examples/CapabilitiesByLocation.json" + } + }, + "description": "Get capabilities at specified location in a given subscription.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/LocationNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/CapabilitiesListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } + }, "/providers/Microsoft.DBForPostgreSql/operations": { "get": { "tags": [ @@ -1069,11 +1313,224 @@ } }, "definitions": { + "StorageMBCapability": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "storage MB name", + "readOnly": true + }, + "supportedIOPS": { + "type": "integer", + "description": "supported IOPS", + "readOnly": true + }, + "storageSizeMB": { + "type": "integer", + "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", + "description": "supported vCores", + "readOnly": true + }, + "supportedIOPS": { + "type": "integer", + "description": "supported IOPS", + "readOnly": true + }, + "supportedMemoryPerVcoreMB": { + "type": "integer", + "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" + }, + "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 + } + } + }, "ServerVersion": { "type": "string", "description": "The version of a server.", "enum": [ - "12" + "12", + "11" ], "x-ms-enum": { "name": "ServerVersion", @@ -1182,23 +1639,16 @@ "type": "string", "description": "availability Zone information of the server." }, - "vnetInjArgs": { + "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": { + "subnetArmResourceId": { "type": "string", - "description": "delegated vNet name" - }, - "delegatedVnetResourceGroup": { - "type": "string", - "description": "delegated vNet resource group name" + "description": "delegated subnet arm resource id." } } }, @@ -1257,11 +1707,6 @@ "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." @@ -1664,6 +2109,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", From 0ad6162c1a790c0d2774a23ad2e0f248e313a3d1 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 25 Aug 2020 16:13:58 -0700 Subject: [PATCH 21/40] Fixed LintDiff errors. --- .../examples/CapabilitiesByLocation.json | 36 +++++++++---------- .../2020-02-14-privatepreview/postgresql.json | 22 +++++++++--- 2 files changed, 35 insertions(+), 23 deletions(-) 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 index efe9cc7ea3cd..9921b8a4c681 100644 --- 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 @@ -19,17 +19,17 @@ "supportedStorageMB": [ { "name": "32768", - "supportedIOPS": 120, + "supportedIops": 120, "storageSizeMB": 32768 }, { "name": "65536", - "supportedIOPS": 240, + "supportedIops": 240, "storageSizeMB": 65536 }, { "name": "131072", - "supportedIOPS": 500, + "supportedIops": 500, "storageSizeMB": 131072 } ] @@ -42,19 +42,19 @@ { "name": "Standard_B1s", "vCores": 1, - "supportedIOPS": 320, + "supportedIops": 320, "supportedMemoryPerVcoreMB": 1024 }, { "name": "Standard_B1ms", "vCores": 1, - "supportedIOPS": 640, + "supportedIops": 640, "supportedMemoryPerVcoreMB": 2048 }, { "name": "Standard_B2s", "vCores": 2, - "supportedIOPS": 1280, + "supportedIops": 1280, "supportedMemoryPerVcoreMB": 2048 } ] @@ -74,17 +74,17 @@ "supportedStorageMB": [ { "name": "32768", - "supportedIOPS": 120, + "supportedIops": 120, "storageSizeMB": 32768 }, { "name": "65536", - "supportedIOPS": 240, + "supportedIops": 240, "storageSizeMB": 65536 }, { "name": "131072", - "supportedIOPS": 500, + "supportedIops": 500, "storageSizeMB": 131072 } ] @@ -97,19 +97,19 @@ { "name": "Standard_B1s", "vCores": 1, - "supportedIOPS": 320, + "supportedIops": 320, "supportedMemoryPerVcoreMB": 1024 }, { "name": "Standard_B1ms", "vCores": 1, - "supportedIOPS": 640, + "supportedIops": 640, "supportedMemoryPerVcoreMB": 2048 }, { "name": "Standard_B2s", "vCores": 2, - "supportedIOPS": 1280, + "supportedIops": 1280, "supportedMemoryPerVcoreMB": 2048 } ] @@ -129,17 +129,17 @@ "supportedStorageMB": [ { "name": "32768", - "supportedIOPS": 120, + "supportedIops": 120, "storageSizeMB": 32768 }, { "name": "65536", - "supportedIOPS": 240, + "supportedIops": 240, "storageSizeMB": 65536 }, { "name": "131072", - "supportedIOPS": 500, + "supportedIops": 500, "storageSizeMB": 131072 } ] @@ -152,19 +152,19 @@ { "name": "Standard_B1s", "vCores": 1, - "supportedIOPS": 320, + "supportedIops": 320, "supportedMemoryPerVcoreMB": 1024 }, { "name": "Standard_B1ms", "vCores": 1, - "supportedIOPS": 640, + "supportedIops": 640, "supportedMemoryPerVcoreMB": 2048 }, { "name": "Standard_B2s", "vCores": 2, - "supportedIOPS": 1280, + "supportedIops": 1280, "supportedMemoryPerVcoreMB": 2048 } ] 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 0726b714992e..f5cd4acf5e45 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 @@ -989,7 +989,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/flexibleServers/{serverName}/keys": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/keys": { "get": { "tags": [ "ServerKeys" @@ -1034,7 +1034,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/flexibleServers/{serverName}/keys/{keyName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/keys/{keyName}": { "get": { "tags": [ "ServerKeys" @@ -1242,7 +1242,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.DBforPostgreSQL/locations/{locationName}/capabilities": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForPostgreSql/locations/{locationName}/capabilities": { "get": { "tags": [ "LocationBasedCapabilities" @@ -1271,6 +1271,12 @@ "schema": { "$ref": "#/definitions/CapabilitiesListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-pageable": { @@ -1321,13 +1327,15 @@ "description": "storage MB name", "readOnly": true }, - "supportedIOPS": { + "supportedIops": { "type": "integer", + "format": "int64", "description": "supported IOPS", "readOnly": true }, "storageSizeMB": { "type": "integer", + "format": "int64", "description": "storage size in MB", "readOnly": true } @@ -1344,16 +1352,19 @@ }, "vCores": { "type": "integer", + "format": "int64", "description": "supported vCores", "readOnly": true }, - "supportedIOPS": { + "supportedIops": { "type": "integer", + "format": "int64", "description": "supported IOPS", "readOnly": true }, "supportedMemoryPerVcoreMB": { "type": "integer", + "format": "int64", "description": "supported memory per vCore in MB", "readOnly": true } @@ -1611,6 +1622,7 @@ }, "publicNetworkAccess": { "type": "string", + "readOnly": true, "description": "public network access is enabled or not", "enum": [ "Enabled", From 6e2e7204a6e869ee94df5f88031c05625634e939 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 25 Aug 2020 16:22:48 -0700 Subject: [PATCH 22/40] Added Pagination for Capabilities API --- .../preview/2020-02-14-privatepreview/postgresql.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index f5cd4acf5e45..cc712279252f 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 @@ -1280,7 +1280,7 @@ } }, "x-ms-pageable": { - "nextLinkName": null + "nextLinkName": "nextLink" } } }, From 5155652bcb0cba83b32855ba167e848ebf91c392 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 25 Aug 2020 18:14:52 -0700 Subject: [PATCH 23/40] Set Server Properties for Update as flatten. --- .../preview/2020-02-14-privatepreview/postgresql.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index cc712279252f..71eea5ac54db 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 @@ -1742,7 +1742,7 @@ }, "properties": { "$ref": "#/definitions/ServerPropertiesForUpdate", - "x-ms-client-flatten": false, + "x-ms-client-flatten": true, "description": "Properties of the server." }, "tags": { From 3d193d63c91dfaf04d82890715c009a8e71252b5 Mon Sep 17 00:00:00 2001 From: Mollee Jain Date: Thu, 27 Aug 2020 09:57:22 -0700 Subject: [PATCH 24/40] Adding track2 capability and removing mysql batch api not needed for multiapi --- .../mysql/resource-manager/readme.python.md | 33 +++++++++++++++++-- .../resource-manager/readme.python.md | 33 +++++++++++++++++-- 2 files changed, 61 insertions(+), 5 deletions(-) diff --git a/specification/mysql/resource-manager/readme.python.md b/specification/mysql/resource-manager/readme.python.md index c8483903d3f3..d67eeda77452 100644 --- a/specification/mysql/resource-manager/readme.python.md +++ b/specification/mysql/resource-manager/readme.python.md @@ -4,7 +4,7 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -``` yaml $(python) +``` yaml !$(track2) python: azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION @@ -14,21 +14,48 @@ python: 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) +```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-2018-06-01-privatepreview # commenting this out as there is an issue with 'ProxyResources' - 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. diff --git a/specification/postgresql/resource-manager/readme.python.md b/specification/postgresql/resource-manager/readme.python.md index 7629a8acbb46..22ac8e36995b 100644 --- a/specification/postgresql/resource-manager/readme.python.md +++ b/specification/postgresql/resource-manager/readme.python.md @@ -4,7 +4,7 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -``` yaml $(python) +``` yaml !$(track2) python: azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION @@ -14,11 +14,32 @@ python: 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) +```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 @@ -27,6 +48,14 @@ batch: - 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 From eccc7c7749a0373389cbb8d9747bdf65739c3a2b Mon Sep 17 00:00:00 2001 From: George Christoglou Date: Fri, 28 Aug 2020 02:09:17 +0300 Subject: [PATCH 25/40] Change namespace name for mysql, postgresql flexible server go packages --- specification/mysql/resource-manager/readme.go.md | 8 ++++++-- specification/postgresql/resource-manager/readme.go.md | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/specification/mysql/resource-manager/readme.go.md b/specification/mysql/resource-manager/readme.go.md index e577ede6b34d..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 ``` @@ -25,7 +24,9 @@ These settings apply only when `--tag=package-2020-07-01-privatepreview --go` is Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2020-07-01-privatepreview' && $(go) -output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/flexible-servers/2020-07-01-privatepreview/$(namespace) +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 @@ -34,6 +35,7 @@ These settings apply only when `--tag=package-2020-01-01 --go` is specified on t 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) ``` @@ -43,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) ``` @@ -52,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/postgresql/resource-manager/readme.go.md b/specification/postgresql/resource-manager/readme.go.md index 5212e88c6521..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 ``` @@ -25,7 +24,9 @@ These settings apply only when `--tag=package-2020-02-14-privatepreview --go` is Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2020-02-14-privatepreview' && $(go) -output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/flexible-servers/2020-02-14-privatepreview/$(namespace) +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 @@ -34,6 +35,7 @@ These settings apply only when `--tag=package-2020-01-01 --go` is specified on t 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) ``` @@ -43,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) ``` @@ -52,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 From b3ac497dce135125f788e30969f188c16a077afe Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Mon, 31 Aug 2020 11:55:18 -0700 Subject: [PATCH 26/40] Added sku properties as required. --- .../preview/2020-02-14-privatepreview/postgresql.json | 4 ++++ 1 file changed, 4 insertions(+) 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 71eea5ac54db..a568fc243659 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 @@ -1807,6 +1807,10 @@ } } }, + "required": [ + "name", + "tier" + ], "description": "Sku information related properties of a server." }, "FirewallRuleProperties": { From eb41ddc065bbeeb155c5298042bf985d2d0468e0 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Mon, 31 Aug 2020 13:59:37 -0700 Subject: [PATCH 27/40] Updated the HA enabled property and added new property --- .../examples/ServerCreate.json | 12 +++++++----- .../examples/ServerCreatePointInTimeRestore.json | 4 ++-- .../examples/ServerGet.json | 4 +++- .../examples/ServerList.json | 10 ++++++++-- .../examples/ServerListByResourceGroup.json | 6 +++++- .../examples/ServerUpdate.json | 1 + .../2020-02-14-privatepreview/postgresql.json | 12 ++++++++---- 7 files changed, 34 insertions(+), 15 deletions(-) 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 c9660d93bb9e..cebad8482bdc 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,7 +14,7 @@ "administratorLogin": "cloudsa", "administratorLoginPassword": "password", "version": "12", - "standbyCount": 0, + "haEnabled": "Enabled", "delegatedSubnetArguments": { "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, @@ -44,7 +44,7 @@ "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", - "standbyCount": 0, + "haEnabled": "Enabled", "delegatedSubnetArguments": { "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, @@ -52,7 +52,8 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "1" + "availabilityZone": "1", + "standByAvailabilityZone": "2" }, "location": "westus", "tags": { @@ -77,7 +78,7 @@ "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", - "standbyCount": 0, + "haEnabled": "Enabled", "delegatedSubnetArguments": { "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" }, @@ -85,7 +86,8 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "1" + "availabilityZone": "1", + "standByAvailabilityZone": "2" }, "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 ce5c8e2e7675..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,7 +28,7 @@ "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", - "standbyCount": 0, + "haEnabled": "Disabled", "delegatedSubnetArguments": {}, "storageProfile": { "storageMB": 524288, @@ -59,7 +59,7 @@ "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", "displayName": "demosingleserver", "publicNetworkAccess": "Enabled", - "standbyCount": 0, + "haEnabled": "Disabled", "delegatedSubnetArguments": {}, "storageProfile": { "storageMB": 524288, 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..1da6ef7f4dcb 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,9 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "1" + "haEnabled": "Enabled", + "availabilityZone": "1", + "standByAvailabilityZone": "2" }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerList.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerList.json index 494a116c5baa..a0920514be07 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,9 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "1" + "haEnabled": "Enabled", + "availabilityZone": "1", + "standByAvailabilityZone": "2" }, "location": "westus", "tags": { @@ -52,6 +54,7 @@ "storageMB": 524288, "backupRetentionDays": 7 }, + "haEnabled": "Disabled", "availabilityZone": "2" }, "location": "westus", @@ -79,6 +82,7 @@ "storageMB": 524288, "backupRetentionDays": 7 }, + "haEnabled": "Disabled", "availabilityZone": "3" }, "location": "westus", @@ -106,7 +110,9 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "1" + "haEnabled": "Enabled", + "availabilityZone": "1", + "standByAvailabilityZone": "2" }, "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..bb1e3032a671 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,9 @@ "storageMB": 524288, "backupRetentionDays": 7 }, - "availabilityZone": "1" + "haEnabled": "Enabled", + "availabilityZone": "1", + "standByAvailabilityZone": "2" }, "location": "westus", "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc1", @@ -50,6 +52,7 @@ "storageMB": 524288, "backupRetentionDays": 7 }, + "haEnabled": "Disabled", "availabilityZone": "2" }, "location": "westus", @@ -74,6 +77,7 @@ "storageMB": 524288, "backupRetentionDays": 7 }, + "haEnabled": "Disabled", "availabilityZone": "3" }, "location": "westus", 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 8cd9f7510092..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 @@ -39,6 +39,7 @@ "backupRetentionDays": 20 }, "delegatedSubnetArguments": {}, + "haEnabled": "Disabled", "availabilityZone": "1" }, "location": "westus", 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 a568fc243659..50d755098d31 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 @@ -1633,10 +1633,9 @@ "modelAsString": true } }, - "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" }, "sourceServerName": { "type": "string", @@ -1651,6 +1650,11 @@ "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.", From 922858285d7f058d1d4c93632368b1cf508b3fdc Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Mon, 31 Aug 2020 14:36:41 -0700 Subject: [PATCH 28/40] Added Virtual Network Subnet usage API changes --- .../examples/VirtualNetworkSubnetUsage.json | 26 ++++++ .../2020-02-14-privatepreview/postgresql.json | 88 +++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/VirtualNetworkSubnetUsage.json 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 50d755098d31..48f3936f1842 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 @@ -1284,6 +1284,54 @@ } } }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForPostgreSql/locations/{locationName}/checkVirtualNetworkSubnetUsage": { + "post": { + "tags": [ + "VirtualNetworkSubnetUsage" + ], + "operationId": "VirtualNetworkSubnetUsage", + "x-ms-examples": { + "CapabilitiesList": { + "$ref": "./examples/VirtualNetworkSubnetUsage.json" + } + }, + "description": "Get virtual network subnet usage for a given vNet resource id.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/LocationNameParameter" + }, + { + "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/VirtualNetworkSubnetUsageResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, "/providers/Microsoft.DBForPostgreSql/operations": { "get": { "tags": [ @@ -1319,6 +1367,46 @@ } }, "definitions": { + "VirtualNetworkSubnetUsageParameter": { + "type": "object", + "properties": { + "virtualNetworkArmResourceId": { + "type": "string", + "description": "Virtual network resource id." + } + }, + "description": "Virtual netowrk subnet usage parameter" + }, + "VirtualNetworkSubnetUsageResult": { + "type": "object", + "properties": { + "delegatedSubnetsUsage": { + "type": "array", + "items": { + "$ref": "#/definitions/DelegatedSubnetUsage" + }, + "readOnly": true + } + }, + "description": "Virtual netowrk 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 deleagted subnets" + } + }, + "description": "Delegated subnet usage data." + }, "StorageMBCapability": { "type": "object", "properties": { From a45c2fe3a6001ffb07f033887eb84ff4c36d3114 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Mon, 31 Aug 2020 17:17:48 -0700 Subject: [PATCH 29/40] Updated the CMW API Contracts --- .../CustomerMaintenanceWindowCreate.json | 46 ---- .../CustomerMaintenanceWindowDelete.json | 14 - .../CustomerMaintenanceWindowGet.json | 24 -- ...CustomerMaintenanceWindowListByServer.json | 27 -- .../examples/ServerCreate.json | 16 +- .../examples/ServerGet.json | 8 +- .../examples/ServerList.json | 32 ++- .../examples/ServerListByResourceGroup.json | 24 +- ...erUpdateWithCustomerMaintenanceWindow.json | 58 +++++ .../2020-02-14-privatepreview/postgresql.json | 239 +++--------------- 10 files changed, 168 insertions(+), 320 deletions(-) delete mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowCreate.json delete mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowDelete.json delete mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowGet.json delete mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/CustomerMaintenanceWindowListByServer.json create mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json 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 cebad8482bdc..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 @@ -53,7 +53,13 @@ "backupRetentionDays": 7 }, "availabilityZone": "1", - "standByAvailabilityZone": "2" + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + } }, "location": "westus", "tags": { @@ -87,7 +93,13 @@ "backupRetentionDays": 7 }, "availabilityZone": "1", - "standByAvailabilityZone": "2" + "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/ServerGet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGet.json index 1da6ef7f4dcb..911b3302ec50 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 @@ -26,7 +26,13 @@ }, "haEnabled": "Enabled", "availabilityZone": "1", - "standByAvailabilityZone": "2" + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 23, + "startMinute": 0, + "customWindow": "Disabled" + } }, "location": "westus", "tags": { diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerList.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerList.json index a0920514be07..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 @@ -27,7 +27,13 @@ }, "haEnabled": "Enabled", "availabilityZone": "1", - "standByAvailabilityZone": "2" + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + } }, "location": "westus", "tags": { @@ -55,7 +61,13 @@ "backupRetentionDays": 7 }, "haEnabled": "Disabled", - "availabilityZone": "2" + "availabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 10, + "startMinute": 30, + "customWindow": "Enabled" + } }, "location": "westus", "tags": { @@ -83,7 +95,13 @@ "backupRetentionDays": 7 }, "haEnabled": "Disabled", - "availabilityZone": "3" + "availabilityZone": "3", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + } }, "location": "westus", "tags": { @@ -112,7 +130,13 @@ }, "haEnabled": "Enabled", "availabilityZone": "1", - "standByAvailabilityZone": "2" + "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 bb1e3032a671..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 @@ -28,7 +28,13 @@ }, "haEnabled": "Enabled", "availabilityZone": "1", - "standByAvailabilityZone": "2" + "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", @@ -53,7 +59,13 @@ "backupRetentionDays": 7 }, "haEnabled": "Disabled", - "availabilityZone": "2" + "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", @@ -78,7 +90,13 @@ "backupRetentionDays": 7 }, "haEnabled": "Disabled", - "availabilityZone": "3" + "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/ServerUpdateWithCustomerMaintenanceWindow.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json new file mode 100644 index 000000000000..b142ec034311 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json @@ -0,0 +1,58 @@ +{ + "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 + } + } + } + }, + "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/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 48f3936f1842..9a8e85557fda 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,202 +796,6 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/maintenanceWindows/{maintenanceWindowName}": { - "put": { - "tags": [ - "CustomerMaintenanceWindow" - ], - "operationId": "CustomerMaintenanceWindow_CreateOrUpdate", - "x-ms-examples": { - "CustomerMaintenanceWindowCreate": { - "$ref": "./examples/CustomerMaintenanceWindowCreate.json" - } - }, - "description": "Creates a new customer 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/CustomerMaintenanceWindow" - }, - "description": "The required parameters for creating or updating a customer maintenance window." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" - } - }, - "201": { - "description": "Created", - "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" - } - }, - "202": { - "description": "Accepted" - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-long-running-operation": true - }, - "delete": { - "tags": [ - "CustomerMaintenanceWindow" - ], - "operationId": "CustomerMaintenanceWindow_Delete", - "x-ms-examples": { - "CustomerMaintenanceWindowDelete": { - "$ref": "./examples/CustomerMaintenanceWindowDelete.json" - } - }, - "description": "Deletes a PostgreSQL server Customer 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 - }, - "get": { - "tags": [ - "CustomerMaintenanceWindow" - ], - "operationId": "CustomerMaintenanceWindow_Get", - "x-ms-examples": { - "CustomerMaintenanceWindowGet": { - "$ref": "./examples/CustomerMaintenanceWindowGet.json" - } - }, - "description": "Get the Customer maintenance windows of a given PostgreSQL server.", - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "$ref": "#/parameters/MaintenanceWindowNameParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindow" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/maintenanceWindows": { - "get": { - "tags": [ - "CustomerMaintenanceWindow" - ], - "operationId": "CustomerMaintenanceWindow_ListByServer", - "x-ms-examples": { - "CustomerMaintenanceWindowList": { - "$ref": "./examples/CustomerMaintenanceWindowListByServer.json" - } - }, - "description": "List all the Customer Maintenance Windows in a given PostgreSQL flexible server.", - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/CustomerMaintenanceWindowListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/keys": { "get": { "tags": [ @@ -1375,7 +1182,7 @@ "description": "Virtual network resource id." } }, - "description": "Virtual netowrk subnet usage parameter" + "description": "Virtual network subnet usage parameter" }, "VirtualNetworkSubnetUsageResult": { "type": "object", @@ -1388,7 +1195,7 @@ "readOnly": true } }, - "description": "Virtual netowrk subnet usage data." + "description": "Virtual network subnet usage data." }, "DelegatedSubnetUsage": { "type": "object", @@ -1402,7 +1209,7 @@ "type": "integer", "format": "int64", "readOnly": true, - "description": "Number of used deleagted subnets" + "description": "Number of used delegated subnets" } }, "description": "Delegated subnet usage data." @@ -1721,6 +1528,10 @@ "modelAsString": true } }, + "maintenanceWindow": { + "$ref": "#/definitions/MaintenanceWindow", + "description": "Maintenance window of a server." + }, "haEnabled": { "type": "string", "description": "stand by count value can be either enabled or disabled" @@ -1804,6 +1615,32 @@ ], "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", + "readOnly": true + }, + "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": { @@ -1819,6 +1656,10 @@ "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." } } }, From 27d08b2ea78c17c142499570e22505210d23be77 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Mon, 31 Aug 2020 17:22:07 -0700 Subject: [PATCH 30/40] Removed CMK API changes --- .../examples/ServerGet.json | 2 +- .../examples/ServerKeyCreateOrUpdate.json | 43 --- .../examples/ServerKeyDelete.json | 14 - .../examples/ServerKeyGet.json | 24 -- .../examples/ServerKeyList.json | 27 -- .../2020-02-14-privatepreview/postgresql.json | 278 ------------------ 6 files changed, 1 insertion(+), 387 deletions(-) delete mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyCreateOrUpdate.json delete mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyDelete.json delete mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyGet.json delete mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyList.json 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 911b3302ec50..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 @@ -29,7 +29,7 @@ "standByAvailabilityZone": "2", "maintenanceWindow": { "dayOfWeek": 0, - "startHour": 23, + "startHour": 0, "startMinute": 0, "customWindow": "Disabled" } 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 deleted file mode 100644 index c42b5c076cc6..000000000000 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyCreateOrUpdate.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "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 deleted file mode 100644 index 769fa6985a14..000000000000 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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 deleted file mode 100644 index 87fdede04e58..000000000000 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyGet.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "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 deleted file mode 100644 index f0923ae1877b..000000000000 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyList.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "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/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 9a8e85557fda..a2cd8c44584a 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 @@ -796,214 +796,6 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/keys": { - "get": { - "tags": [ - "ServerKeys" - ], - "description": "Gets a list of Server keys.", - "operationId": "ServerKeys_List", - "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" - } - ], - "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" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "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/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": "Successfully updated the PostgreSQL Server key.", - "schema": { - "$ref": "#/definitions/ServerKey" - } - }, - "202": { - "description": "Operation in progress", - "schema": { - "$ref": "#/definitions/ServerKey" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-examples": { - "Creates or updates a PostgreSQL Server key": { - "$ref": "./examples/ServerKeyCreateOrUpdate.json" - } - } - }, - "delete": { - "tags": [ - "ServerKeys" - ], - "description": "Deletes the PostgreSQL Server key with the given name.", - "operationId": "ServerKeys_Delete", - "parameters": [ - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "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/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" - } - ], - "responses": { - "200": { - "description": "Successfully deleted the PostgreSQL Server key." - }, - "202": { - "description": "Operation in progress" - }, - "204": { - "description": "The specified PostgreSQL Server key does not exist." - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "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": [ @@ -1361,76 +1153,6 @@ }, "description": "location capability" }, - "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 - } - } - }, "ServerVersion": { "type": "string", "description": "The version of a server.", From 27f82d302e2199639648d9a87c7cc46b28613736 Mon Sep 17 00:00:00 2001 From: suna Liu Date: Tue, 1 Sep 2020 17:18:51 +0800 Subject: [PATCH 31/40] Update MySQL flexibleServer swagger to change some APIs --- .../examples/CapabilitiesByLocationList.json | 180 +++++++ .../CheckVirtualNetworkSubnetUsage.json | 26 + .../examples/MaintenanceWindowCreate.json | 46 -- .../examples/MaintenanceWindowDelete.json | 14 - .../examples/MaintenanceWindowGet.json | 24 - .../examples/ServerGet.json | 14 +- .../examples/ServerGetWithVnet.json | 8 +- .../examples/ServerUpdate.json | 13 +- ...erUpdateWithCustomerMaintenanceWindow.json | 59 +++ .../2020-07-01-privatepreview/mysql.json | 475 ++++++++++-------- 10 files changed, 565 insertions(+), 294 deletions(-) create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CapabilitiesByLocationList.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CheckVirtualNetworkSubnetUsage.json delete mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowCreate.json delete mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowDelete.json delete mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowGet.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json 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" } } From ff859895c068e594d93f464ed246aeb554ebf7ae Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 1 Sep 2020 08:46:22 -0700 Subject: [PATCH 32/40] Removed Unused Entities --- .../2020-02-14-privatepreview/postgresql.json | 60 ------------------- 1 file changed, 60 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index a2cd8c44584a..e5addd9f373c 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 @@ -1522,66 +1522,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": { From c0022f2280e290fddca325064167cc2cae3ec32d Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 1 Sep 2020 09:54:54 -0700 Subject: [PATCH 33/40] Resolved code review comments --- .../2020-02-14-privatepreview/postgresql.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index e5addd9f373c..0d08af14302e 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 @@ -888,7 +888,7 @@ "tags": [ "VirtualNetworkSubnetUsage" ], - "operationId": "VirtualNetworkSubnetUsage", + "operationId": "VirtualNetworkSubnetUsage_Execute", "x-ms-examples": { "CapabilitiesList": { "$ref": "./examples/VirtualNetworkSubnetUsage.json" @@ -1256,7 +1256,15 @@ }, "haEnabled": { "type": "string", - "description": "stand by count value can be either enabled or disabled" + "description": "stand by count value can be either enabled or disabled", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "HAEnabledEnum", + "modelAsString": false + } }, "sourceServerName": { "type": "string", From 68cfcf6486f9d5481496dc8300232bc289fa6f7a Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 1 Sep 2020 10:13:32 -0700 Subject: [PATCH 34/40] Fix prettier issues. --- .../preview/2020-02-14-privatepreview/postgresql.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 0d08af14302e..70d1d3ef1623 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 @@ -1260,7 +1260,7 @@ "enum": [ "Enabled", "Disabled" - ], + ], "x-ms-enum": { "name": "HAEnabledEnum", "modelAsString": false From c7bc07ec2be3f814b2cb4c1618bdb86008c32f2d Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Tue, 1 Sep 2020 12:43:33 -0700 Subject: [PATCH 35/40] Added CMK API's --- .../examples/ServerKeyCreateOrUpdate.json | 43 +++ .../examples/ServerKeyDelete.json | 14 + .../examples/ServerKeyGet.json | 24 ++ .../examples/ServerKeyList.json | 27 ++ .../2020-02-14-privatepreview/postgresql.json | 278 ++++++++++++++++++ 5 files changed, 386 insertions(+) create mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyCreateOrUpdate.json create mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyDelete.json create mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyGet.json create mode 100644 specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerKeyList.json 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/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 70d1d3ef1623..6a1310233c56 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 @@ -796,6 +796,214 @@ "x-ms-long-running-operation": true } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/flexibleServers/{serverName}/keys": { + "get": { + "tags": [ + "ServerKeys" + ], + "description": "Gets a list of Server keys.", + "operationId": "ServerKeys_List", + "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" + } + ], + "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" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "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/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": "Successfully updated the PostgreSQL Server key.", + "schema": { + "$ref": "#/definitions/ServerKey" + } + }, + "202": { + "description": "Operation in progress", + "schema": { + "$ref": "#/definitions/ServerKey" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Creates or updates a PostgreSQL Server key": { + "$ref": "./examples/ServerKeyCreateOrUpdate.json" + } + } + }, + "delete": { + "tags": [ + "ServerKeys" + ], + "description": "Deletes the PostgreSQL Server key with the given name.", + "operationId": "ServerKeys_Delete", + "parameters": [ + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "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/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "Successfully deleted the PostgreSQL Server key." + }, + "202": { + "description": "Operation in progress" + }, + "204": { + "description": "The specified PostgreSQL Server key does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "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": [ @@ -966,6 +1174,76 @@ } }, "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": { From a633dbd83c8f3e6789f36983ff388e16daaf0bcc Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Wed, 2 Sep 2020 17:51:07 -0700 Subject: [PATCH 36/40] remove readonly property for custom window property --- .../examples/ServerUpdateWithCustomerMaintenanceWindow.json | 3 ++- .../preview/2020-02-14-privatepreview/postgresql.json | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 index b142ec034311..0bf2308701ca 100644 --- 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 @@ -10,7 +10,8 @@ "maintenanceWindow": { "dayOfWeek": 0, "startHour": 8, - "startMinute": 0 + "startMinute": 0, + "customWindow": "Enabled" } } } 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 6a1310233c56..8c7e93bc28bd 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 @@ -1629,8 +1629,7 @@ "properties": { "customWindow": { "type": "string", - "description": "indicates whether custom window is enabled or disabled", - "readOnly": true + "description": "indicates whether custom window is enabled or disabled" }, "startHour": { "type": "integer", From a6ffeed3dbbabf76b2c14344a5a4428dcafde9b5 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Thu, 3 Sep 2020 08:33:29 -0700 Subject: [PATCH 37/40] Fixed lint diff errors --- .../preview/2020-02-14-privatepreview/postgresql.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 8c7e93bc28bd..bf0671a1a17d 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 @@ -796,7 +796,7 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/flexibleServers/{serverName}/keys": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/keys": { "get": { "tags": [ "ServerKeys" @@ -841,7 +841,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/flexibleServers/{serverName}/keys/{keyName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSql/flexibleServers/{serverName}/keys/{keyName}": { "get": { "tags": [ "ServerKeys" From e1f60135a41c12d7d52f69a361d7d2a16f4b403e Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Thu, 3 Sep 2020 11:24:25 -0700 Subject: [PATCH 38/40] Fixed server update for haEnabled property --- .../2020-02-14-privatepreview/postgresql.json | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index bf0671a1a17d..194eef0ea282 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 @@ -1659,10 +1659,17 @@ "$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", From dae57a362c4c961683e63981092ab40b37ae38df Mon Sep 17 00:00:00 2001 From: Mollee Jain Date: Thu, 3 Sep 2020 12:08:12 -0700 Subject: [PATCH 39/40] Adding minor fix to readme.md --- specification/mysql/resource-manager/readme.md | 4 +++- specification/postgresql/resource-manager/readme.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/specification/mysql/resource-manager/readme.md b/specification/mysql/resource-manager/readme.md index b62a4b7a7ada..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,7 +155,7 @@ swagger-to-sdk: ### C# -See configuration in [readme.python.md](./readme.csharp.md) +See configuration in [readme.csharp.md](./readme.csharp.md) ## Python diff --git a/specification/postgresql/resource-manager/readme.md b/specification/postgresql/resource-manager/readme.md index 843f17770def..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,7 +148,7 @@ swagger-to-sdk: ### C# -See configuration in [readme.python.md](./readme.csharp.md) +See configuration in [readme.csharp.md](./readme.csharp.md) ## Python From 256dd06fbe0ea77f914455584e646f2232346b85 Mon Sep 17 00:00:00 2001 From: Pradeep Kintali Date: Thu, 3 Sep 2020 16:35:39 -0700 Subject: [PATCH 40/40] Updated the Operation id for Location capabilities --- .../preview/2020-02-14-privatepreview/postgresql.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json index 194eef0ea282..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 @@ -1054,7 +1054,7 @@ "tags": [ "LocationBasedCapabilities" ], - "operationId": "LocationBasedCapabilities", + "operationId": "LocationBasedCapabilities_Execute", "x-ms-examples": { "CapabilitiesList": { "$ref": "./examples/CapabilitiesByLocation.json" @@ -1098,7 +1098,7 @@ ], "operationId": "VirtualNetworkSubnetUsage_Execute", "x-ms-examples": { - "CapabilitiesList": { + "VirtualNetworkSubnetUsageList": { "$ref": "./examples/VirtualNetworkSubnetUsage.json" } },