update per comments

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>
hashicorp · Sep 27, 2023 · 6c0bf1d · 6c0bf1d
1 parent 1f1c3e2
commit 6c0bf1d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/internal/services/servicenetworking/application_load_balancer_resource.go b/internal/services/servicenetworking/application_load_balancer_resource.go
@@ -3,6 +3,7 @@ package servicenetworking
 import (
 	"context"
 	"fmt"
+	"regexp"
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
@@ -35,7 +36,7 @@ func (t ApplicationLoadBalancerResource) Arguments() map[string]*schema.Schema {
 			Type:         pluginsdk.TypeString,
 			Required:     true,
 			ForceNew:     true,
-			ValidateFunc: validation.StringIsNotEmpty,
+			ValidateFunc: validation.StringMatch(regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_.-]{0,62}[a-zA-Z0-9]$`), "the name must begin with a letter or number, end with a letter, number or underscore, and may contain only letters, numbers, underscores, periods, or hyphens. The value must be 1-64 characters long."),
 		},
 
 		"resource_group_name": commonschema.ResourceGroupName(),

diff --git a/internal/services/servicenetworking/application_load_balancer_resource_test.go b/internal/services/servicenetworking/application_load_balancer_resource_test.go
@@ -115,6 +115,11 @@ resource "azurerm_resource_group" "test" {
 
 func (r ApplicationLoadBalancerResource) basic(data acceptance.TestData) string {
 	return fmt.Sprintf(`
+provider "azurerm" {
+  features {
+  }
+}
+
 	%s
 
 resource "azurerm_application_load_balancer" "test" {
@@ -127,6 +132,11 @@ resource "azurerm_application_load_balancer" "test" {
 
 func (r ApplicationLoadBalancerResource) complete(data acceptance.TestData) string {
 	return fmt.Sprintf(`
+provider "azurerm" {
+  features {
+  }
+}
+
 	%s
 
 resource "azurerm_application_load_balancer" "test" {
@@ -142,6 +152,11 @@ resource "azurerm_application_load_balancer" "test" {
 
 func (r ApplicationLoadBalancerResource) requiresImport(data acceptance.TestData) string {
 	return fmt.Sprintf(`
+provider "azurerm" {
+  features {
+  }
+}
+
 	%s
 
 resource "azurerm_application_load_balancer" "import" {