update

hashicorp · Nov 9, 2022 · 705f9b0 · 705f9b0
1 parent cff8ae1
commit 705f9b0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/internal/services/appservice/linux_function_app_resource.go b/internal/services/appservice/linux_function_app_resource.go
@@ -751,18 +751,19 @@ func (r LinuxFunctionAppResource) Update() sdk.ResourceFunc {
 				existing.SiteProperties.ServerFarmID = utils.String(serviceFarmId)
 			}
 
-			_, planSku, err := helpers.ServicePlanInfoForApp(ctx, metadata, *id)
-
-			_, updatedPlanSKU, err := helpers.GetServicePlanSku(ctx, metadata, *id, serviceFarmId)
+			_, planSKU, err := helpers.GetServicePlanSku(ctx, metadata, *id, serviceFarmId)
 			if err != nil {
 				return err
 			}
 
-			if updatedPlanSKU != nil {
-				planSku = updatedPlanSKU
+			if planSKU == nil {
+				_, planSKU, err = helpers.ServicePlanInfoForApp(ctx, metadata, *id)
+				if err != nil {
+					return err
+				}
 			}
 			// Only send for ElasticPremium and consumption plan
-			sendContentSettings := (helpers.PlanIsConsumption(planSku) || helpers.PlanIsElastic(planSku)) && !state.ForceDisableContentShare
+			sendContentSettings := (helpers.PlanIsConsumption(planSKU) || helpers.PlanIsElastic(planSKU)) && !state.ForceDisableContentShare
 
 			if metadata.ResourceData.HasChange("enabled") {
 				existing.SiteProperties.Enabled = utils.Bool(state.Enabled)

diff --git a/internal/services/appservice/windows_function_app_resource.go b/internal/services/appservice/windows_function_app_resource.go
@@ -749,18 +749,19 @@ func (r WindowsFunctionAppResource) Update() sdk.ResourceFunc {
 				existing.SiteProperties.ServerFarmID = utils.String(serviceFarmId)
 			}
 
-			_, planSku, err := helpers.ServicePlanInfoForApp(ctx, metadata, *id)
-
-			_, updatedPlanSKU, err := helpers.GetServicePlanSku(ctx, metadata, *id, serviceFarmId)
+			_, planSKU, err := helpers.GetServicePlanSku(ctx, metadata, *id, serviceFarmId)
 			if err != nil {
 				return err
 			}
 
-			if updatedPlanSKU != nil {
-				planSku = updatedPlanSKU
+			if planSKU == nil {
+				_, planSKU, err = helpers.ServicePlanInfoForApp(ctx, metadata, *id)
+				if err != nil {
+					return err
+				}
 			}
 			// Only send for ElasticPremium and consumption plan
-			sendContentSettings := (helpers.PlanIsConsumption(planSku) || helpers.PlanIsElastic(planSku)) && !state.ForceDisableContentShare
+			sendContentSettings := (helpers.PlanIsConsumption(planSKU) || helpers.PlanIsElastic(planSKU)) && !state.ForceDisableContentShare
 
 			// Some service plan updates are allowed - see customiseDiff for exceptions
 			if metadata.ResourceData.HasChange("service_plan_id") {