update per comment

hashicorp · Nov 20, 2023 · 24ff0e0 · 24ff0e0
1 parent 6db2907
commit 24ff0e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/internal/services/servicenetworking/application_load_balancer_resource_test.go b/internal/services/servicenetworking/application_load_balancer_resource_test.go
@@ -153,11 +153,6 @@ 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" {

diff --git a/.../services/servicenetworking/validate/application_load_balancer_subnet_association_name.go b/.../services/servicenetworking/validate/application_load_balancer_subnet_association_name.go
@@ -8,7 +8,10 @@ import (
 )
 
 func ApplicationLoadBalancerSubnetAssociationName() pluginsdk.SchemaValidateFunc {
-	return 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.",
+	return validation.All(
+		validation.StringLenBetween(1, 64),
+		validation.StringMatch(regexp.MustCompile(`^[a-zA-Z0-9]`), "the name must begin with a letter or number."),
+		validation.StringMatch(regexp.MustCompile(`[a-zA-Z0-9]$`), "the name must end with a letter or number."),
+		validation.StringMatch(regexp.MustCompile(`[a-zA-Z0-9_.-]{0,64}`), "the name may contain only letters, numbers, underscores, periods, or hyphens."),
 	)
 }