New Beta resource: azurerm_windows_function_app

internal/services/appservice/helpers/fx_strings.go

@@ -72,6 +72,9 @@ func EncodeFunctionAppLinuxFxVersion(input []ApplicationStackLinuxFunctionApp) *
 	case appStack.JavaVersion != "":
 		appType = "Java"
 		appString = appStack.JavaVersion
+	case appStack.PowerShellCoreVersion != "":
+		appType = "PowerShell"
+		appString = appStack.PowerShellCoreVersion
 	case len(appStack.Docker) > 0 && appStack.Docker[0].ImageName != "":
 		appType = "Docker"
 		dockerCfg := appStack.Docker[0]
@@ -115,6 +118,10 @@ func DecodeFunctionAppLinuxFxVersion(input string) ([]ApplicationStackLinuxFunct
 		appStack := ApplicationStackLinuxFunctionApp{JavaVersion: parts[1]}
 		result = append(result, appStack)
 
+	case "powershell":
+		appStack := ApplicationStackLinuxFunctionApp{PowerShellCoreVersion: parts[1]}
+		result = append(result, appStack)
+
 	case "docker":
 		// This is handled as part of unpacking the app_settings using DecodeFunctionAppDockerFxString but included here for signposting as this is not intuitive.
 	}
@@ -147,3 +154,62 @@ func DecodeFunctionAppDockerFxString(input string, partial ApplicationStackDocke
 
 	return []ApplicationStackDocker{partial}, nil
 }
+
+func EncodeFunctionAppWindowsFxVersion(input []ApplicationStackWindowsFunctionApp) *string {
+	if len(input) == 0 {
+		return utils.String("")
+	}
+
+	appStack := input[0]
+	var appType, appString string
+	switch {
+	case appStack.NodeVersion != "":
+		appType = "Node"
+		appString = appStack.NodeVersion
+	case appStack.DotNetVersion != "":
+		appType = "DotNet"
+		appString = appStack.DotNetVersion
+	case appStack.JavaVersion != "":
+		appType = "Java"
+		appString = appStack.JavaVersion
+	case appStack.PowerShellCoreVersion != "":
+		appType = "PowerShell"
+		appString = appStack.PowerShellCoreVersion
+	}
+
+	return utils.String(fmt.Sprintf("%s|%s", appType, appString))
+}
+
+func DecodeFunctionAppWindowsFxVersion(input string) ([]ApplicationStackWindowsFunctionApp, error) {
+	if input == "" {
+		// This is a valid string for "Custom" stack which we picked up earlier, so we can skip here
+		return nil, nil
+	}
+
+	parts := strings.Split(input, "|")
+	if len(parts) != 2 {
+		return nil, fmt.Errorf("unrecognised WindowsFxVersion format received, got %s", input)
+	}
+
+	result := make([]ApplicationStackWindowsFunctionApp, 0)
+
+	switch strings.ToLower(parts[0]) {
+	case "dotnet":
+		appStack := ApplicationStackWindowsFunctionApp{DotNetVersion: parts[1]}
+		result = append(result, appStack)
+
+	case "node":
+		appStack := ApplicationStackWindowsFunctionApp{NodeVersion: parts[1]}
+		result = append(result, appStack)
+
+	case "java":
+		appStack := ApplicationStackWindowsFunctionApp{JavaVersion: parts[1]}
+		result = append(result, appStack)
+
+	case "powershell":
+		appStack := ApplicationStackWindowsFunctionApp{PowerShellCoreVersion: parts[1]}
+		result = append(result, appStack)
+	}
+
+	return result, nil
+}

internal/services/appservice/helpers/web_app_schema.go

@@ -10,7 +10,6 @@ import (
 	"github.com/Azure/go-autorest/autorest/date"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
 	apimValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/apimanagement/validate"
-	msiValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
 	"github.com/hashicorp/terraform-provider-azurerm/utils"
@@ -145,7 +144,7 @@ func SiteConfigSchemaWindows() *pluginsdk.Schema {
 				"container_registry_managed_identity_client_id": {
 					Type:         pluginsdk.TypeString,
 					Optional:     true,
-					ValidateFunc: msiValidate.UserAssignedIdentityID,
+					ValidateFunc: validation.IsUUID,
 				},
 
 				"default_documents": {
@@ -540,7 +539,7 @@ func SiteConfigSchemaLinux() *pluginsdk.Schema {
 				"container_registry_managed_identity_client_id": {
 					Type:         pluginsdk.TypeString,
 					Optional:     true,
-					ValidateFunc: msiValidate.UserAssignedIdentityID,
+					ValidateFunc: validation.IsUUID,
 				},
 
 				"default_documents": {
@@ -3487,6 +3486,7 @@ func FlattenSiteConfigWindows(appSiteConfig *web.SiteConfig, currentStack string
 		UseManagedIdentityACR:    utils.NormaliseNilableBool(appSiteConfig.AcrUseManagedIdentityCreds),
 		VirtualApplications:      flattenVirtualApplications(appSiteConfig.VirtualApplications),
 		WebSockets:               utils.NormaliseNilableBool(appSiteConfig.WebSocketsEnabled),
+		VnetRouteAllEnabled:      utils.NormaliseNilableBool(appSiteConfig.VnetRouteAllEnabled),
 	}
 
 	if appSiteConfig.APIManagementConfig != nil && appSiteConfig.APIManagementConfig.ID != nil {
@@ -3682,6 +3682,7 @@ func FlattenAppSettings(input web.StringDictionary) (map[string]string, *int) {
 		"DIAGNOSTICS_AZUREBLOBRETENTIONINDAYS",
 		"WEBSITE_HTTPLOGGING_CONTAINER_URL",
 		"WEBSITE_HTTPLOGGING_RETENTION_DAYS",
+		"WEBSITE_VNET_ROUTE_ALL",
 		maxPingFailures,
 	}
 
@@ -3692,7 +3693,7 @@ func FlattenAppSettings(input web.StringDictionary) (map[string]string, *int) {
 		healthCheckCount = &h
 	}
 
-	// Remove the settings the service adds for legacy reasons when logging settings are specified.
+	// Remove the settings the service adds for legacy reasons.
 	for _, v := range unmanagedSettings { //nolint:typecheck
 		delete(appSettings, v)
 	}