From 97244d8ccb5921e9fb92659da2925cde1ad21364 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 13 Mar 2018 17:16:34 -0500 Subject: [PATCH 1/3] Web: adding support for `computeMode` to App Service plans --- .../stable/2016-03-01/CommonDefinitions.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/CommonDefinitions.json index b5fad40b666f..60fb4417e3de 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/CommonDefinitions.json @@ -2228,6 +2228,19 @@ "description": "Family code of the resource SKU.", "type": "string" }, + "computeMode": { + "description": "Shared or dedicated app hosting.", + "enum": [ + "Shared", + "Dedicated", + "Dynamic" + ], + "type": "string", + "x-ms-enum": { + "name": "ComputeModeOptions", + "modelAsString": false + } + }, "capacity": { "format": "int32", "description": "Current number of instances assigned to the resource.", @@ -2792,4 +2805,4 @@ ] } ] -} \ No newline at end of file +} From 39f94983a463b7521bba41cb5730d5c92a333100 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 13 Mar 2018 18:09:09 -0500 Subject: [PATCH 2/3] Updating `modelAsString` to true --- .../Microsoft.Web/stable/2016-03-01/CommonDefinitions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/CommonDefinitions.json index 60fb4417e3de..46a9316a7199 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/CommonDefinitions.json @@ -2238,7 +2238,7 @@ "type": "string", "x-ms-enum": { "name": "ComputeModeOptions", - "modelAsString": false + "modelAsString": true } }, "capacity": { @@ -2393,7 +2393,7 @@ "type": "string", "x-ms-enum": { "name": "ComputeModeOptions", - "modelAsString": false + "modelAsString": true } }, "workerSize": { @@ -2764,7 +2764,7 @@ "type": "string", "x-ms-enum": { "name": "ComputeModeOptions", - "modelAsString": false + "modelAsString": true } }, "workerSize": { From 372c1a56f37e05f88617e3ea287a020878dcc8b9 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 13 Mar 2018 18:46:11 -0500 Subject: [PATCH 3/3] Creating a single definition for ComputeModeOptions --- .../stable/2016-03-01/CommonDefinitions.json | 52 +++++++------------ 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/CommonDefinitions.json index 46a9316a7199..2d77832a3e93 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/CommonDefinitions.json @@ -557,6 +557,19 @@ } } }, + "ComputeModeOptions": { + "description": "Shared or dedicated app hosting.", + "enum": [ + "Shared", + "Dedicated", + "Dynamic" + ], + "type": "string", + "x-ms-enum": { + "name": "ComputeModeOptions", + "modelAsString": true + } + }, "ConnStringInfo": { "description": "Database connection string information.", "type": "object", @@ -2229,17 +2242,8 @@ "type": "string" }, "computeMode": { - "description": "Shared or dedicated app hosting.", - "enum": [ - "Shared", - "Dedicated", - "Dynamic" - ], - "type": "string", - "x-ms-enum": { - "name": "ComputeModeOptions", - "modelAsString": true - } + "$ref": "#/definitions/ComputeModeOptions", + "description": "Shared or dedicated app hosting." }, "capacity": { "format": "int32", @@ -2384,17 +2388,8 @@ "type": "string" }, "computeMode": { - "description": "Shared/dedicated workers.", - "enum": [ - "Shared", - "Dedicated", - "Dynamic" - ], - "type": "string", - "x-ms-enum": { - "name": "ComputeModeOptions", - "modelAsString": true - } + "$ref": "#/definitions/ComputeModeOptions", + "description": "Shared or dedicated app hosting." }, "workerSize": { "description": "Size of the machines.", @@ -2755,17 +2750,8 @@ "type": "integer" }, "computeMode": { - "description": "Shared or dedicated app hosting.", - "enum": [ - "Shared", - "Dedicated", - "Dynamic" - ], - "type": "string", - "x-ms-enum": { - "name": "ComputeModeOptions", - "modelAsString": true - } + "$ref": "#/definitions/ComputeModeOptions", + "description": "Shared or dedicated app hosting." }, "workerSize": { "description": "VM size of the worker pool instances.",