#24134: Revert accidental changes pushed to linux_function_app_resour…

…ce.go
hashicorp · Dec 19, 2023 · f9672bf · f9672bf
1 parent 6613b8d
commit f9672bf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/internal/services/appservice/linux_function_app_resource.go b/internal/services/appservice/linux_function_app_resource.go
@@ -15,6 +15,7 @@ import (
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/features"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/appservice/helpers"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/appservice/parse"
@@ -235,9 +236,14 @@ func (r LinuxFunctionAppResource) Arguments() map[string]*pluginsdk.Schema {
 		},
 
 		"functions_extension_version": {
-			Type:        pluginsdk.TypeString,
-			Optional:    true,
-			Default:     "~4",
+			Type:     pluginsdk.TypeString,
+			Optional: true,
+			Default: func() interface{} {
+				if !features.FourPointOhBeta() {
+					return "~3"
+				}
+				return "~4"
+			},
 			Description: "The runtime version associated with the Function App.",
 		},
 

diff --git a/internal/services/logic/logic_app_standard_resource.go b/internal/services/logic/logic_app_standard_resource.go
@@ -18,6 +18,7 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/features"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/appservice/helpers"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/logic/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/logic/validate"
@@ -177,7 +178,12 @@ func resourceLogicAppStandard() *pluginsdk.Resource {
 			"version": {
 				Type:     pluginsdk.TypeString,
 				Optional: true,
-				Default:  "~4",
+				Default: func() interface{} {
+					if !features.FourPointOhBeta() {
+						return "~3"
+					}
+					return "~4"
+				},
 			},
 
 			"tags": tags.Schema(),