From b7f0606d2adbafc7b98b3dca4535c6de105a49e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maksymilian=20Bogu=C5=84?= Date: Fri, 14 Jun 2019 08:50:47 +0200 Subject: [PATCH] read IsXenon property correctly --- azurerm/data_source_app_service_plan.go | 3 ++- azurerm/resource_arm_app_service_plan.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/azurerm/data_source_app_service_plan.go b/azurerm/data_source_app_service_plan.go index e4026083e954..66a4bb5c6d6e 100644 --- a/azurerm/data_source_app_service_plan.go +++ b/azurerm/data_source_app_service_plan.go @@ -110,7 +110,6 @@ func dataSourceAppServicePlanRead(d *schema.ResourceData, meta interface{}) erro d.Set("name", name) d.Set("resource_group_name", resourceGroup) d.Set("kind", resp.Kind) - d.Set("is_xenon", resp.IsXenon) if location := resp.Location; location != nil { d.Set("location", azure.NormalizeLocation(*location)) @@ -128,6 +127,8 @@ func dataSourceAppServicePlanRead(d *schema.ResourceData, meta interface{}) erro if props.MaximumElasticWorkerCount != nil { d.Set("maximum_elastic_worker_count", int(*props.MaximumElasticWorkerCount)) } + + d.Set("is_xenon", props.IsXenon) } if err := d.Set("sku", flattenAppServicePlanSku(resp.Sku)); err != nil { diff --git a/azurerm/resource_arm_app_service_plan.go b/azurerm/resource_arm_app_service_plan.go index f863e38fd383..2adafa682ca1 100644 --- a/azurerm/resource_arm_app_service_plan.go +++ b/azurerm/resource_arm_app_service_plan.go @@ -285,7 +285,6 @@ func resourceArmAppServicePlanRead(d *schema.ResourceData, meta interface{}) err d.Set("location", azure.NormalizeLocation(*location)) } d.Set("kind", resp.Kind) - d.Set("is_xenon", resp.IsXenon) if props := resp.AppServicePlanProperties; props != nil { if err := d.Set("properties", flattenAppServiceProperties(props)); err != nil { @@ -306,6 +305,7 @@ func resourceArmAppServicePlanRead(d *schema.ResourceData, meta interface{}) err d.Set("per_site_scaling", props.PerSiteScaling) d.Set("reserved", props.Reserved) + d.Set("is_xenon", props.IsXenon) } if err := d.Set("sku", flattenAppServicePlanSku(resp.Sku)); err != nil {