From 9f81a046445e142c08367ad30e9ae6128b32bd06 Mon Sep 17 00:00:00 2001 From: sinbai Date: Mon, 18 Apr 2022 16:49:55 +0800 Subject: [PATCH 1/2] fix issue 16401 --- internal/services/appservice/service_plan_data_source.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/services/appservice/service_plan_data_source.go b/internal/services/appservice/service_plan_data_source.go index f31ffa5cd60e..a59fd42df140 100644 --- a/internal/services/appservice/service_plan_data_source.go +++ b/internal/services/appservice/service_plan_data_source.go @@ -131,6 +131,7 @@ func (r ServicePlanDataSource) Read() sdk.ResourceFunc { } servicePlan.Location = location.NormalizeNilable(existing.Location) + servicePlan.Kind = *existing.Kind if sku := existing.Sku; sku != nil { if sku.Name != nil { @@ -142,6 +143,7 @@ func (r ServicePlanDataSource) Read() sdk.ResourceFunc { } if props := existing.AppServicePlanProperties; props != nil { + servicePlan.OSType = OSTypeWindows if props.HyperV != nil && *props.HyperV { servicePlan.OSType = OSTypeWindowsContainer } From d85095211ff790ef8f848787e2324bfb803c66f6 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 4 May 2022 23:39:19 -0700 Subject: [PATCH 2/2] Update internal/services/appservice/service_plan_data_source.go Co-authored-by: jackofallops <11830746+jackofallops@users.noreply.github.com> --- internal/services/appservice/service_plan_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/services/appservice/service_plan_data_source.go b/internal/services/appservice/service_plan_data_source.go index a59fd42df140..4cd955e5f965 100644 --- a/internal/services/appservice/service_plan_data_source.go +++ b/internal/services/appservice/service_plan_data_source.go @@ -131,7 +131,7 @@ func (r ServicePlanDataSource) Read() sdk.ResourceFunc { } servicePlan.Location = location.NormalizeNilable(existing.Location) - servicePlan.Kind = *existing.Kind + servicePlan.Kind = utils.NormalizeNilableString(existing.Kind) if sku := existing.Sku; sku != nil { if sku.Name != nil {