fix: Fix EKS cluster name regex

hashicorp · Feb 20, 2024 · 8822a47 · 8822a47
1 parent c7623b0
commit 8822a47
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.changelog/35874.txt b/.changelog/35874.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_eks_cluster: Fix cluster name regex that incorrectly disallowed single-character names
+```
diff --git a/internal/service/eks/validate.go b/internal/service/eks/validate.go
@@ -17,7 +17,7 @@ func validClusterName(v interface{}, k string) (ws []string, errors []error) {
 	}
 
 	// https://docs.aws.amazon.com/eks/latest/APIReference/API_CreateCluster.html#API_CreateCluster_RequestSyntax
-	pattern := `^[0-9A-Za-z][0-9A-Za-z_-]+$`
+	pattern := `^[0-9A-Za-z][0-9A-Za-z_-]*$`
 	if !regexache.MustCompile(pattern).MatchString(value) {
 		errors = append(errors, fmt.Errorf(
 			"%q doesn't comply with restrictions (%q): %q",

diff --git a/internal/service/eks/validate_test.go b/internal/service/eks/validate_test.go
@@ -20,6 +20,10 @@ func TestValidClusterName(t *testing.T) {
 			Value:    "my-valid-eks-cluster_1_dev",
 			ErrCount: 0,
 		},
+		{
+			Value:    "a",
+			ErrCount: 0,
+		},
 		{
 			Value:    `_invalid`,
 			ErrCount: 1,