From bfd5a781f5ee08b27eb314ff444483925c9b466e Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Fri, 4 Sep 2020 03:04:38 +0000 Subject: [PATCH] Generated from 52f210af9f7a0c2020464da65b3cbabde96d15e9 Fix 202 response for ServerKey PUT API --- .../Microsoft.DBforMySQL.json | 4 +- schemas/2017-12-01/Microsoft.DBforMySQL.json | 313 +++--------------- 2 files changed, 42 insertions(+), 275 deletions(-) diff --git a/schemas/2017-12-01-preview/Microsoft.DBforMySQL.json b/schemas/2017-12-01-preview/Microsoft.DBforMySQL.json index fddda4ba4b..840b33248c 100644 --- a/schemas/2017-12-01-preview/Microsoft.DBforMySQL.json +++ b/schemas/2017-12-01-preview/Microsoft.DBforMySQL.json @@ -275,7 +275,7 @@ "oneOf": [ { "type": "string", - "pattern": "^.*/Default$" + "pattern": "^.*/default$" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -889,7 +889,7 @@ "name": { "type": "string", "enum": [ - "Default" + "default" ], "description": "The name of the threat detection policy." }, diff --git a/schemas/2017-12-01/Microsoft.DBforMySQL.json b/schemas/2017-12-01/Microsoft.DBforMySQL.json index bc0597da88..1da5c7e7f4 100644 --- a/schemas/2017-12-01/Microsoft.DBforMySQL.json +++ b/schemas/2017-12-01/Microsoft.DBforMySQL.json @@ -112,72 +112,6 @@ }, "servers_Administrators": { "type": "object", - "oneOf": [ - { - "type": "object", - "properties": { - "name": { - "oneOf": [ - { - "type": "string", - "pattern": "^.*/activeDirectory$" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ] - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/ServerAdministratorProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The properties of an server Administrator." - } - }, - "required": [ - "name", - "properties" - ], - "description": "Microsoft.DBforMySQL/servers/Administrators" - }, - { - "type": "object", - "properties": { - "name": { - "oneOf": [ - { - "type": "string", - "pattern": "^.*/activeDirectory$" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ] - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/ServerAdministratorProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The properties of an server Administrator." - } - }, - "required": [ - "name", - "properties" - ], - "description": "Microsoft.DBforMySQL/servers/Administrators" - } - ], "properties": { "apiVersion": { "type": "string", @@ -185,6 +119,28 @@ "2017-12-01" ] }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^.*/activeDirectory$" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/ServerAdministratorProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The properties of an server Administrator." + }, "type": { "type": "string", "enum": [ @@ -194,6 +150,8 @@ }, "required": [ "apiVersion", + "name", + "properties", "type" ], "description": "Microsoft.DBforMySQL/servers/Administrators" @@ -730,68 +688,6 @@ }, "description": "The properties used to create a new server." }, - "ServerPropertiesForCreateModel": { - "type": "object", - "oneOf": [ - { - "$ref": "#/definitions/ServerPropertiesForDefaultCreateModel" - }, - { - "$ref": "#/definitions/ServerPropertiesForRestoreModel" - }, - { - "$ref": "#/definitions/ServerPropertiesForGeoRestoreModel" - }, - { - "$ref": "#/definitions/ServerPropertiesForReplicaModel" - } - ], - "properties": { - "sslEnforcement": { - "oneOf": [ - { - "type": "string", - "enum": [ - "Enabled", - "Disabled" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Enable ssl enforcement or not when connect to server." - }, - "storageProfile": { - "oneOf": [ - { - "$ref": "#/definitions/StorageProfile" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Storage Profile properties of a server" - }, - "version": { - "oneOf": [ - { - "type": "string", - "enum": [ - "5.6", - "5.7", - "8.0" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Server version." - } - }, - "description": "The properties used to create a new server." - }, "ServerPropertiesForDefaultCreate": { "type": "object", "properties": { @@ -818,32 +714,6 @@ ], "description": "The properties used to create a new server." }, - "ServerPropertiesForDefaultCreateModel": { - "type": "object", - "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", - "format": "password", - "description": "The password of the administrator login." - }, - "createMode": { - "type": "string", - "enum": [ - "Default" - ] - } - }, - "required": [ - "administratorLogin", - "administratorLoginPassword", - "createMode" - ], - "description": "The properties used to create a new server." - }, "ServerPropertiesForGeoRestore": { "type": "object", "properties": { @@ -864,26 +734,6 @@ ], "description": "The properties used to create a new server by restoring to a different region from a geo replicated backup." }, - "ServerPropertiesForGeoRestoreModel": { - "type": "object", - "properties": { - "createMode": { - "type": "string", - "enum": [ - "GeoRestore" - ] - }, - "sourceServerId": { - "type": "string", - "description": "The source server id to restore from." - } - }, - "required": [ - "createMode", - "sourceServerId" - ], - "description": "The properties used to create a new server by restoring to a different region from a geo replicated backup." - }, "ServerPropertiesForReplica": { "type": "object", "properties": { @@ -904,26 +754,6 @@ ], "description": "The properties to create a new replica." }, - "ServerPropertiesForReplicaModel": { - "type": "object", - "properties": { - "createMode": { - "type": "string", - "enum": [ - "Replica" - ] - }, - "sourceServerId": { - "type": "string", - "description": "The master server id to create replica from." - } - }, - "required": [ - "createMode", - "sourceServerId" - ], - "description": "The properties to create a new replica." - }, "ServerPropertiesForRestore": { "type": "object", "properties": { @@ -950,96 +780,31 @@ ], "description": "The properties used to create a new server by restoring from a backup." }, - "ServerPropertiesForRestoreModel": { + "servers_Administrators_childResource": { "type": "object", "properties": { - "createMode": { + "apiVersion": { "type": "string", "enum": [ - "PointInTimeRestore" + "2017-12-01" ] }, - "restorePointInTime": { - "type": "string", - "format": "date-time", - "description": "Restore point creation time (ISO8601 format), specifying the time to restore from." - }, - "sourceServerId": { + "name": { "type": "string", - "description": "The source server id to restore from." - } - }, - "required": [ - "createMode", - "restorePointInTime", - "sourceServerId" - ], - "description": "The properties used to create a new server by restoring from a backup." - }, - "servers_Administrators_childResource": { - "type": "object", - "oneOf": [ - { - "type": "object", - "properties": { - "name": { - "type": "string", - "enum": [ - "activeDirectory" - ] - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/ServerAdministratorProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The properties of an server Administrator." - } - }, - "required": [ - "name", - "properties" - ], - "description": "Microsoft.DBforMySQL/servers/Administrators" + "enum": [ + "activeDirectory" + ] }, - { - "type": "object", - "properties": { - "name": { - "type": "string", - "enum": [ - "activeDirectory" - ] + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/ServerAdministratorProperties" }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/ServerAdministratorProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The properties of an server Administrator." + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } - }, - "required": [ - "name", - "properties" ], - "description": "Microsoft.DBforMySQL/servers/Administrators" - } - ], - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2017-12-01" - ] + "description": "The properties of an server Administrator." }, "type": { "type": "string", @@ -1050,6 +815,8 @@ }, "required": [ "apiVersion", + "name", + "properties", "type" ], "description": "Microsoft.DBforMySQL/servers/Administrators"