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..62db23931cc0 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 @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "title": "MySQLServerManagementClient", + "title": "MySQLManagementClient", "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" }, @@ -70,7 +70,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" }, "description": "The required parameters for creating or updating a server." } @@ -79,13 +79,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" } }, "202": { @@ -129,7 +129,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ServerForUpdate" + "$ref": "#/definitions/FlexibleServerForUpdate" }, "description": "The required parameters for updating a server." } @@ -138,7 +138,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" } }, "202": { @@ -229,7 +229,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" } }, "default": { @@ -268,7 +268,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerListResult" + "$ref": "#/definitions/FlexibleServerListResult" } }, "default": { @@ -307,7 +307,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerListResult" + "$ref": "#/definitions/FlexibleServerListResult" } }, "default": { @@ -481,7 +481,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerListResult" + "$ref": "#/definitions/FlexibleServerListResult" } }, "default": { @@ -529,7 +529,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" }, "description": "The required parameters for creating or updating a firewall rule." } @@ -538,13 +538,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" } }, "202": { @@ -638,7 +638,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FirewallRule" + "$ref": "#/definitions/FlexibleServerFirewallRule" } }, "default": { @@ -680,7 +680,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/FirewallRuleListResult" + "$ref": "#/definitions/FlexibleServerFirewallRuleListResult" } }, "default": { @@ -728,7 +728,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/Database" + "$ref": "#/definitions/FlexibleServerDatabase" }, "description": "The required parameters for creating or updating a database." } @@ -737,13 +737,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Database" + "$ref": "#/definitions/FlexibleServerDatabase" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/Database" + "$ref": "#/definitions/FlexibleServerDatabase" } }, "202": { @@ -837,7 +837,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Database" + "$ref": "#/definitions/FlexibleServerDatabase" } }, "default": { @@ -879,7 +879,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/DatabaseListResult" + "$ref": "#/definitions/FlexibleServerDatabaseListResult" } }, "default": { @@ -927,7 +927,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/Configuration" + "$ref": "#/definitions/FlexibleServerConfiguration" }, "description": "The required parameters for updating a server configuration." } @@ -936,7 +936,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Configuration" + "$ref": "#/definitions/FlexibleServerConfiguration" } }, "202": { @@ -983,7 +983,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Configuration" + "$ref": "#/definitions/FlexibleServerConfiguration" } }, "default": { @@ -1025,7 +1025,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ConfigurationListResult" + "$ref": "#/definitions/FlexibleServerConfigurationListResult" } }, "default": { @@ -1073,7 +1073,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/MaintenanceWindow" + "$ref": "#/definitions/FlexibleServerMaintenanceWindow" }, "description": "The required parameters for creating or updating a customer maintenance window." } @@ -1082,13 +1082,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/MaintenanceWindow" + "$ref": "#/definitions/FlexibleServerMaintenanceWindow" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/MaintenanceWindow" + "$ref": "#/definitions/FlexibleServerMaintenanceWindow" } }, "202": { @@ -1182,7 +1182,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/MaintenanceWindow" + "$ref": "#/definitions/FlexibleServerMaintenanceWindow" } }, "default": { @@ -1224,7 +1224,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/MaintenanceWindowListResult" + "$ref": "#/definitions/FlexibleServerMaintenanceWindowListResult" } }, "default": { @@ -1263,7 +1263,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/NameAvailabilityRequest" + "$ref": "#/definitions/FlexibleServerNameAvailabilityRequest" }, "description": "The required parameters for checking if server name is available." } @@ -1272,7 +1272,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/NameAvailability" + "$ref": "#/definitions/FlexibleServerNameAvailability" } }, "default": { @@ -1289,7 +1289,7 @@ "tags": [ "Operations" ], - "operationId": "Operations_List", + "operationId": "FlexibleServersOperations_List", "x-ms-examples": { "OperationList": { "$ref": "./examples/OperationsList.json" @@ -1305,7 +1305,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/OperationListResult" + "$ref": "#/definitions/FlexibleServerOperationListResult" } }, "default": { @@ -1326,43 +1326,19 @@ "5.7" ], "x-ms-enum": { - "name": "ServerVersion", + "name": "FlexibleServerVersion", "modelAsString": true } }, - "SslEnforcement": { + "EnablementState": { "type": "string", - "description": "Enable ssl enforcement or not when connect to server.", + "description": "Enabled or Disabled.", "enum": [ "Enabled", "Disabled" ], "x-ms-enum": { - "name": "SslEnforcementEnum", - "modelAsString": true - } - }, - "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": "InfrastructureEncryptionEnum", - "modelAsString": true - } - }, - "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", + "name": "EnablementState", "modelAsString": true } }, @@ -1383,7 +1359,7 @@ }, "description": "Vnet properties of a server" }, - "StorageProfile": { + "FlexibleServerStorageProfile": { "properties": { "backupRetentionDays": { "type": "integer", @@ -1400,22 +1376,14 @@ "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 - } + "storageAutoGrow": { + "$ref": "#/definitions/EnablementState", + "description": "Enable Storage Auto Grow." } }, "description": "Storage Profile properties of a server" }, - "Sku": { + "FlexibleServerSku": { "properties": { "name": { "type": "string", @@ -1430,14 +1398,14 @@ "MemoryOptimized" ], "x-ms-enum": { - "name": "SkuTier", + "name": "FlexibleServerSkuTier", "modelAsString": true } } }, "description": "Billing information related properties of a server." }, - "ServerProperties": { + "FlexibleServerProperties": { "properties": { "administratorLogin": { "type": "string", @@ -1462,11 +1430,11 @@ "description": "Server version." }, "sslEnforcement": { - "$ref": "#/definitions/SslEnforcement", + "$ref": "#/definitions/EnablementState", "description": "Enable ssl enforcement or not when connect to server." }, "infrastructureEncryption": { - "$ref": "#/definitions/InfrastructureEncryption", + "$ref": "#/definitions/EnablementState", "description": "Status showing whether the server enabled infrastructure encryption.", "x-ms-mutability": [ "create" @@ -1486,7 +1454,7 @@ "Updating" ], "x-ms-enum": { - "name": "ServerState", + "name": "FlexibleServerState", "modelAsString": true } }, @@ -1503,7 +1471,7 @@ "RemovingStandby" ], "x-ms-enum": { - "name": "ServerHAState", + "name": "FlexibleServerHAState", "modelAsString": true } }, @@ -1517,8 +1485,14 @@ "description": "The fully qualified domain name of a server.", "readOnly": true }, + "earliestRestoreDate": { + "type": "string", + "readOnly": true, + "format": "date-time", + "description": "Earliest restore point creation time (ISO8601 format)" + }, "storageProfile": { - "$ref": "#/definitions/StorageProfile", + "$ref": "#/definitions/FlexibleServerStorageProfile", "description": "Storage profile of a server." }, "replicationRole": { @@ -1537,7 +1511,7 @@ "description": "The maximum number of replicas that a primary server can have." }, "publicNetworkAccess": { - "$ref": "#/definitions/PublicNetworkAccess", + "$ref": "#/definitions/EnablementState", "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'" }, "sourceServerId": { @@ -1568,7 +1542,7 @@ "Replica" ], "x-ms-enum": { - "name": "CreateMode", + "name": "FlexibleServerCreateMode", "modelAsString": true }, "x-ms-mutability": [ @@ -1585,18 +1559,18 @@ }, "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." } @@ -1608,10 +1582,10 @@ ], "description": "Represents a server." }, - "ServerPropertiesForUpdate": { + "FlexibleServerPropertiesForUpdate": { "properties": { "storageProfile": { - "$ref": "#/definitions/StorageProfile", + "$ref": "#/definitions/FlexibleServerStorageProfile", "description": "Storage profile of a server." }, "administratorLoginPassword": { @@ -1621,7 +1595,7 @@ "description": "The password of the administrator login." }, "sslEnforcement": { - "$ref": "#/definitions/SslEnforcement", + "$ref": "#/definitions/EnablementState", "description": "Enable ssl enforcement or not when connect to server." }, "vnetInjArgs": { @@ -1634,7 +1608,7 @@ "description": "stand by count value can be either 0 or 1" }, "publicNetworkAccess": { - "$ref": "#/definitions/PublicNetworkAccess", + "$ref": "#/definitions/EnablementState", "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": { @@ -1644,14 +1618,14 @@ }, "description": "The properties that can be updated for a server." }, - "ServerForUpdate": { + "FlexibleServerForUpdate": { "properties": { "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": true, "description": "The properties that can be updated for a server." }, @@ -1665,13 +1639,13 @@ }, "description": "Parameters allowed to update for a server." }, - "ServerListResult": { + "FlexibleServerListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/Server" + "$ref": "#/definitions/FlexibleServer" }, "description": "The list of servers" }, @@ -1682,7 +1656,7 @@ }, "description": "A list of servers." }, - "FirewallRuleProperties": { + "FlexibleServerFirewallRuleProperties": { "properties": { "startIpAddress": { "type": "string", @@ -1701,10 +1675,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." } @@ -1719,13 +1693,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." }, @@ -1736,7 +1710,7 @@ }, "description": "A list of firewall rules." }, - "DatabaseProperties": { + "FlexibleServerDatabaseProperties": { "properties": { "charset": { "type": "string", @@ -1749,10 +1723,10 @@ }, "description": "The properties of a database." }, - "Database": { + "FlexibleServerDatabase": { "properties": { "properties": { - "$ref": "#/definitions/DatabaseProperties", + "$ref": "#/definitions/FlexibleServerDatabaseProperties", "x-ms-client-flatten": true, "description": "The properties of a database." } @@ -1764,13 +1738,13 @@ ], "description": "Represents a Database." }, - "DatabaseListResult": { + "FlexibleServerDatabaseListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/Database" + "$ref": "#/definitions/FlexibleServerDatabase" }, "description": "The list of databases housed in a server" }, @@ -1781,7 +1755,7 @@ }, "description": "A List of databases." }, - "ConfigurationProperties": { + "FlexibleServerConfigurationProperties": { "properties": { "value": { "type": "string", @@ -1853,10 +1827,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." } @@ -1868,13 +1842,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." }, @@ -1885,7 +1859,7 @@ }, "description": "A list of server configurations." }, - "MaintenanceWindowProperties": { + "FlexibleServerMaintenanceWindowProperties": { "properties": { "dayOfWeek": { "type": "integer", @@ -1915,10 +1889,10 @@ ], "description": "The properties of a server maintenance window." }, - "MaintenanceWindow": { + "FlexibleServerMaintenanceWindow": { "properties": { "properties": { - "$ref": "#/definitions/MaintenanceWindowProperties", + "$ref": "#/definitions/FlexibleServerMaintenanceWindowProperties", "x-ms-client-flatten": true, "description": "The properties of a customer maintenance window." } @@ -1933,13 +1907,13 @@ ], "description": "Represents a server maintenance window." }, - "MaintenanceWindowListResult": { + "FlexibleServerMaintenanceWindowListResult": { "type": "object", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/MaintenanceWindow" + "$ref": "#/definitions/FlexibleServerMaintenanceWindow" }, "description": "The list of server maintenance window." }, @@ -1950,7 +1924,7 @@ }, "description": "A list of maintenance windows for a MySQL server." }, - "OperationDisplay": { + "FlexibleServerOperationDisplay": { "properties": { "provider": { "type": "string", @@ -1975,7 +1949,7 @@ }, "description": "Display metadata associated with the operation." }, - "Operation": { + "FlexibleServerOperation": { "properties": { "name": { "type": "string", @@ -1983,7 +1957,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." }, @@ -1997,7 +1971,7 @@ "system" ], "x-ms-enum": { - "name": "OperationOrigin", + "name": "FlexibleServerOperationOrigin", "modelAsString": true } }, @@ -2013,19 +1987,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" ], @@ -2041,7 +2015,7 @@ }, "description": "Request from client to check resource name availability." }, - "NameAvailability": { + "FlexibleServerNameAvailability": { "properties": { "message": { "type": "string", @@ -2062,8 +2036,7 @@ "x-ms-external": true, "properties": { "error": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse", - "description": "The resource management error response." + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } }, "description": "An error response from the Batch service." diff --git a/specification/mysql/resource-manager/readme.md b/specification/mysql/resource-manager/readme.md index cb35a0c056fa..24b88cd1f0b9 100644 --- a/specification/mysql/resource-manager/readme.md +++ b/specification/mysql/resource-manager/readme.md @@ -111,6 +111,14 @@ These settings apply only when `--tag=package-2020-07-01-privatepreview` is spec ``` yaml $(tag) == 'package-2020-07-01-privatepreview' input-file: +- Microsoft.DBforMySQL/stable/2017-12-01/mysql.json +- Microsoft.DBforMySQL/stable/2018-06-01/QueryPerformanceInsights.json +- Microsoft.DBforMySQL/stable/2018-06-01/PerformanceRecommendations.json +- Microsoft.DBforMySQL/stable/2018-06-01/PrivateEndpointConnections.json +- Microsoft.DBforMySQL/stable/2018-06-01/PrivateLinkResources.json +- Microsoft.DBforMySQL/stable/2020-01-01/DataEncryptionKeys.json +- Microsoft.DBforMySQL/stable/2020-01-01/ServerSecurityAlertPolicies.json +- Microsoft.DBforMySQL/stable/2020-01-01/Servers.json - Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json ``` @@ -221,6 +229,7 @@ input-file: - $(this-folder)/Microsoft.DBforMySQL/stable/2020-01-01/DataEncryptionKeys.json - $(this-folder)/Microsoft.DBforMySQL/stable/2020-01-01/ServerSecurityAlertPolicies.json - $(this-folder)/Microsoft.DBforMySQL/stable/2020-01-01/Servers.json + - $(this-folder)/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json ```