From 87a90a9a3328d1dda3c8a337da736c2431198d3b Mon Sep 17 00:00:00 2001 From: Anthony Martin Date: Fri, 18 Jun 2021 23:19:27 +0000 Subject: [PATCH] Fix references to deleted 2014-06-01 schema --- generator/resources.json | 3 - schemas/2014-06-01/Microsoft.Web.json | 404 ------------------ .../2019-03-01-hybrid/deploymentTemplate.json | 9 - .../Template_1.2014-01-01-preview.json | 12 +- .../templateTests/Template_1.2015-01-01.json | 14 +- .../templateTests/Template_1.2019-04-01.json | 14 +- 6 files changed, 20 insertions(+), 436 deletions(-) delete mode 100644 schemas/2014-06-01/Microsoft.Web.json diff --git a/generator/resources.json b/generator/resources.json index f21713ec62..2b55e88302 100644 --- a/generator/resources.json +++ b/generator/resources.json @@ -7175,7 +7175,6 @@ "2020-02-14" ], "Microsoft.Web/certificates": [ - "2014-06-01", "2015-08-01", "2016-03-01", "2018-02-01", @@ -7206,7 +7205,6 @@ "2018-02-01" ], "Microsoft.Web/serverfarms": [ - "2014-06-01", "2015-08-01", "2016-09-01", "2018-02-01" @@ -7220,7 +7218,6 @@ "2018-02-01" ], "Microsoft.Web/sites": [ - "2014-06-01", "2015-08-01", "2016-08-01", "2018-02-01", diff --git a/schemas/2014-06-01/Microsoft.Web.json b/schemas/2014-06-01/Microsoft.Web.json deleted file mode 100644 index dc18d06731..0000000000 --- a/schemas/2014-06-01/Microsoft.Web.json +++ /dev/null @@ -1,404 +0,0 @@ -{ - "id": "https://schema.management.azure.com/schemas/2014-06-01/Microsoft.Web.json", - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Microsoft.Web", - "description": "Microsoft Web Resource Types", - "resourceDefinitions": { - "serverfarms": { - "type": "object", - "properties": { - "type": { - "enum": [ - "Microsoft.Web/serverfarms" - ] - }, - "apiVersion": { - "enum": [ - "2014-06-01" - ] - }, - "properties": { - "type": "object", - "properties": { - "name": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/serverfarms: Name of the server farm." - }, - "sku": { - "oneOf": [ - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - }, - { - "enum": [ - "Free", - "Shared", - "Basic", - "Standard" - ] - } - ], - "description": "Microsoft.Web/serverfarms: Server farm sku." - }, - "workerSize": { - "oneOf": [ - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - }, - { - "enum": [ - "Small", - "Medium", - "Large" - ] - }, - { - "type": "integer", - "minimum": 0, - "maximum": 2 - } - ], - "description": "Microsoft.Web/serverfarms: The instance size." - }, - "numberOfWorkers": { - "oneOf": [ - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - }, - { - "type": "integer", - "minimum": 0, - "maximum": 10 - } - ], - "description": "Microsoft.Web/serverfarms: The instance count, which is the number of virtual machines dedicated to the farm. Supported values are 1-10." - } - } - } - }, - "required": [ - "type", - "apiVersion", - "properties", - "location" - ], - "description": "Microsoft.Web/serverfarms" - }, - "config": { - "type": "object", - "properties": { - "type": { - "enum": [ - "Microsoft.Web/sites/config", - "config" - ] - }, - "apiVersion": { - "enum": [ - "2014-06-01" - ] - }, - "properties": { - "type": "object", - "properties": { - "connectionStrings": { - "oneOf": [ - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - }, - { - "type": "array", - "items": { - "type": "object", - "properties": { - "ConnectionString": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/sites/config: connection string" - }, - "Name": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/sites/config: connection string name" - }, - "Type": { - "oneOf": [ - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - }, - { - "type": "integer", - "minLength": 1 - } - ], - "description": "Microsoft.Web/sites/config: connection string type" - } - } - }, - "uniqueItems": true, - "description": "Microsoft.Web/sites/config: Connection strings for database and other external resources." - } - ], - "description": "Microsoft.Web/sites/config: Connection strings" - }, - "phpVersion": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/sites/config: PHP version (an empty string disables PHP)." - }, - "netFrameworkVersion": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/sites/config: The .Net Framework version." - } - } - } - }, - "description": "Microsoft.Web/sites: Configuration settings for a web site.", - "required": [ - "type", - "apiVersion", - "properties" - ] - }, - "extensions": { - "type": "object", - "properties": { - "type": { - "enum": [ - "Microsoft.Web/sites/extensions", - "extensions" - ] - }, - "apiVersion": { - "enum": [ - "2014-06-01" - ] - }, - "properties": { - "type": "object", - "properties": { - "packageUri": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/sites/extensions: uri of package" - }, - "dbType": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/sites/extensions: type of database" - }, - "connectionString": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/sites/extensions: connection string" - }, - "setParameters": { - "oneOf": [ - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - }, - { - "type": "object" - } - ], - "description": "Microsoft.Web/sites/extensions: parameters" - } - } - } - }, - "required": [ - "type", - "apiVersion", - "properties" - ], - "description": "Microsoft.Web/sites/extensions" - }, - "sites": { - "type": "object", - "properties": { - "type": { - "enum": [ - "Microsoft.Web/sites" - ] - }, - "apiVersion": { - "enum": [ - "2014-06-01" - ] - }, - "properties": { - "type": "object", - "properties": { - "name": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/sites: The name of web site." - }, - "serverFarm": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/sites: The name of server farm site belongs to." - }, - "hostnames": { - "oneOf": [ - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - }, - { - "type": "array", - "items": { - "type": "string", - "minLength": 1 - } - } - ], - "description": "Microsoft.Web/sites: An array of strings that contains the public hostnames for the site, including custom domains." - }, - "enabledHostnames": { - "oneOf": [ - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - }, - { - "type": "array", - "items": { - "type": "string", - "minLength": 1 - } - } - ], - "description": "Microsoft.Web/sites: An array of strings that contains enabled hostnames for the site. By default, these are .azurewebsites.net and .scm.azurewebsites.net." - }, - "hostNameSslStates": { - "oneOf": [ - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - }, - { - "type": "array", - "items": { - "type": "object", - "properties": { - "name": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/sites/hostNameSslStates: The URL of the web site." - }, - "sslState": { - "oneOf": [ - { - "enum": [ - "Disabled", - "IpBasedEnabled", - "SniEnabled" - ] - }, - { - "type": "integer", - "minimum": 0, - "maximum": 2 - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Microsoft.Web/sites/hostNameSslStates. The SSL state." - }, - "thumbprint": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/sites/hostNameSslStates: A string that contains the thumbprint of the SSL certificate." - }, - "ipBasedSslState": { - "oneOf": [ - { - "enum": [ - "Disabled", - "IpBasedEnabled", - "SniEnabled" - ] - }, - { - "type": "integer", - "minimum": 0, - "maximum": 2 - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Microsoft.Web/sites/hostNameSslStates: IP Based SSL state" - } - } - } - } - ], - "description": "Microsoft.Web/sites: Container for SSL states." - } - } - }, - "resources": { - "type": "array", - "items": { - "allOf": [ - { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/resourceBase" }, - { - "oneOf": [ - { "$ref": "#/resourceDefinitions/config" }, - { "$ref": "#/resourceDefinitions/extensions" } - ] - } - ] - }, - "description": "Microsoft.Web/sites: Child resources to define configuration and extensions." - } - }, - "required": [ - "type", - "apiVersion", - "properties", - "location" - ], - "description": "Microsoft.Web/sites" - }, - "certificates": { - "type": "object", - "properties": { - "type": { - "enum": [ - "Microsoft.Web/certificates" - ] - }, - "apiVersion": { - "enum": [ - "2014-06-01" - ] - }, - "properties": { - "type": "object", - "properties": { - "pfxBlob": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/certificates: A base64Binary value that contains the PfxBlob of the certificate." - }, - "password": { - "type": "string", - "minLength": 1, - "description": "Microsoft.Web/certficates: A string that contains the password for the certificate." - } - } - } - }, - "required": [ - "type", - "apiVersion", - "properties", - "location" - ], - "description": "Microsoft.Web/certificates" - } - } -} \ No newline at end of file diff --git a/schemas/2019-03-01-hybrid/deploymentTemplate.json b/schemas/2019-03-01-hybrid/deploymentTemplate.json index 3e2018b01b..075d36dd12 100644 --- a/schemas/2019-03-01-hybrid/deploymentTemplate.json +++ b/schemas/2019-03-01-hybrid/deploymentTemplate.json @@ -426,12 +426,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2015-05-21-preview/Microsoft.DevTestLab.json#/resourceDefinitions/labs_virtualmachines" }, - { - "$ref": "https://schema.management.azure.com/schemas/2014-06-01/Microsoft.Web.json#/resourceDefinitions/certificates" - }, - { - "$ref": "https://schema.management.azure.com/schemas/2014-06-01/Microsoft.Web.json#/resourceDefinitions/serverfarms" - }, { "$ref": "https://schema.management.azure.com/schemas/2015-08-01/Microsoft.Web.json#/resourceDefinitions/certificates" }, @@ -684,9 +678,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2016-10-01/Microsoft.KeyVault.json#/resourceDefinitions/vaults" }, - { - "$ref": "https://schema.management.azure.com/schemas/2014-06-01/Microsoft.Web.json#/resourceDefinitions/sites" - }, { "$ref": "https://schema.management.azure.com/schemas/2015-08-01/Microsoft.Web.json#/resourceDefinitions/sites" }, diff --git a/tools/templateTests/Template_1.2014-01-01-preview.json b/tools/templateTests/Template_1.2014-01-01-preview.json index d1f242e132..b694529ef0 100644 --- a/tools/templateTests/Template_1.2014-01-01-preview.json +++ b/tools/templateTests/Template_1.2014-01-01-preview.json @@ -262,7 +262,7 @@ ] }, { - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "name": "[parameters('hostingPlanName')]", "type": "Microsoft.Web/serverfarms", "location": "[parameters('siteLocation')]", @@ -275,7 +275,7 @@ } }, { - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "name": "[parameters('siteName')]", "type": "Microsoft.Web/sites", "location": "[parameters('siteLocation')]", @@ -292,7 +292,7 @@ }, "resources": [ { - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "type": "config", "name": "web", "dependsOn": [ @@ -526,7 +526,7 @@ "name": "[parameters('planName')]", "type": "Microsoft.Web/serverfarms", "location": "[parameters('planLocation')]", - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "dependsOn": [], "tags": { "displayName": "plan" @@ -850,7 +850,7 @@ "name": "[parameters('app2Name')]", "type": "Microsoft.Web/sites", "location": "[parameters('planLocation')]", - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "dependsOn": [ "[concat('Microsoft.Web/serverfarms/', parameters('planName'))]" ], @@ -868,7 +868,7 @@ "name": "MSDeploy", "type": "extensions", "location": "[parameters('planLocation')]", - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "dependsOn": [ "[concat('Microsoft.Web/sites/', parameters('app2Name'))]" ], diff --git a/tools/templateTests/Template_1.2015-01-01.json b/tools/templateTests/Template_1.2015-01-01.json index cba3207b8b..7288430e5e 100644 --- a/tools/templateTests/Template_1.2015-01-01.json +++ b/tools/templateTests/Template_1.2015-01-01.json @@ -262,7 +262,7 @@ ] }, { - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "name": "[parameters('hostingPlanName')]", "type": "Microsoft.Web/serverfarms", "location": "[parameters('siteLocation')]", @@ -275,7 +275,7 @@ } }, { - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "name": "Free", "type": "Microsoft.Web/serverfarms", "location": "East Asia", @@ -287,7 +287,7 @@ } }, { - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "name": "[parameters('siteName')]", "type": "Microsoft.Web/sites", "location": "[parameters('siteLocation')]", @@ -304,7 +304,7 @@ }, "resources": [ { - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "type": "config", "name": "web", "dependsOn": [ @@ -538,7 +538,7 @@ "name": "[parameters('planName')]", "type": "Microsoft.Web/serverfarms", "location": "[parameters('planLocation')]", - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "dependsOn": [], "tags": { "displayName": "plan" @@ -862,7 +862,7 @@ "name": "[parameters('app2Name')]", "type": "Microsoft.Web/sites", "location": "[parameters('planLocation')]", - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "dependsOn": [ "[concat('Microsoft.Web/serverfarms/', parameters('planName'))]" ], @@ -880,7 +880,7 @@ "name": "MSDeploy", "type": "extensions", "location": "[parameters('planLocation')]", - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "dependsOn": [ "[concat('Microsoft.Web/sites/', parameters('app2Name'))]" ], diff --git a/tools/templateTests/Template_1.2019-04-01.json b/tools/templateTests/Template_1.2019-04-01.json index f7722fcca6..82b88f7a0b 100644 --- a/tools/templateTests/Template_1.2019-04-01.json +++ b/tools/templateTests/Template_1.2019-04-01.json @@ -259,7 +259,7 @@ ] }, { - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "name": "[parameters('hostingPlanName')]", "type": "Microsoft.Web/serverfarms", "location": "[parameters('siteLocation')]", @@ -272,7 +272,7 @@ } }, { - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "name": "Free", "type": "Microsoft.Web/serverfarms", "location": "East Asia", @@ -284,7 +284,7 @@ } }, { - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "name": "[parameters('siteName')]", "type": "Microsoft.Web/sites", "location": "[parameters('siteLocation')]", @@ -301,7 +301,7 @@ }, "resources": [ { - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "type": "config", "name": "web", "dependsOn": [ @@ -535,7 +535,7 @@ "name": "[parameters('planName')]", "type": "Microsoft.Web/serverfarms", "location": "[parameters('planLocation')]", - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "dependsOn": [], "tags": { "displayName": "plan" @@ -845,7 +845,7 @@ "name": "[parameters('app2Name')]", "type": "Microsoft.Web/sites", "location": "[parameters('planLocation')]", - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "dependsOn": [ "[concat('Microsoft.Web/serverfarms/', parameters('planName'))]" ], @@ -863,7 +863,7 @@ "name": "MSDeploy", "type": "extensions", "location": "[parameters('planLocation')]", - "apiVersion": "2014-06-01", + "apiVersion": "2020-12-01", "dependsOn": [ "[concat('Microsoft.Web/sites/', parameters('app2Name'))]" ],