From ecea1a4fea48dbdc28de1c884634389d09c6e07e Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Tue, 24 Apr 2018 11:59:23 +0200 Subject: [PATCH] Adding in a reference for the older "App" App Service Plans --- azurerm/resource_arm_app_service_plan.go | 3 +++ website/docs/r/app_service_plan.html.markdown | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_app_service_plan.go b/azurerm/resource_arm_app_service_plan.go index a3609a7f6686..da0247c72d3a 100644 --- a/azurerm/resource_arm_app_service_plan.go +++ b/azurerm/resource_arm_app_service_plan.go @@ -39,6 +39,9 @@ func resourceArmAppServicePlan() *schema.Resource { Default: "Windows", ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ + // @tombuildsstuff: I believe `app` is the older representation of `Windows` + // thus we need to support it to be able to import resources without recreating them. + "App", "FunctionApp", "Linux", "Windows", diff --git a/website/docs/r/app_service_plan.html.markdown b/website/docs/r/app_service_plan.html.markdown index 2402cdb7f574..f122baa1c8a3 100644 --- a/website/docs/r/app_service_plan.html.markdown +++ b/website/docs/r/app_service_plan.html.markdown @@ -83,7 +83,7 @@ The following arguments are supported: * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `kind` - (Optional) The kind of the App Service Plan to create. Possible values are `Windows`, `Linux` and `FunctionApp` (for a Consumption Plan). Defaults to `Windows`. Changing this forces a new resource to be created. +* `kind` - (Optional) The kind of the App Service Plan to create. Possible values are `Windows` (also available as `App`), `Linux` and `FunctionApp` (for a Consumption Plan). Defaults to `Windows`. Changing this forces a new resource to be created. ~> **NOTE:** When creating a `Linux` App Service Plan, the `reserved` field must be set to `true`.