Merge pull request #10693 from kangaechu/add-validation-to-ElbName

Add validation to the name of aws_elb resource.
hashicorp · Nov 24, 2021 · dc7cabb · dc7cabb
2 parents 1e6d287 + 09e1b78
commit dc7cabb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/.changelog/10693.txt b/.changelog/10693.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_lb: Update `name` and `name_prefix` plan-time validation to exclude `"internal-"`
+```
diff --git a/internal/service/elbv2/validate.go b/internal/service/elbv2/validate.go
@@ -29,6 +29,10 @@ func validName(v interface{}, k string) (ws []string, errors []error) {
 		errors = append(errors, fmt.Errorf(
 			"%q cannot end with a hyphen: %q", k, value))
 	}
+	if regexp.MustCompile(`^internal-`).MatchString(value) {
+		errors = append(errors, fmt.Errorf(
+			`%q cannot begin with "internal-": %q`, k, value))
+	}
 	return
 }
 
@@ -47,6 +51,10 @@ func validNamePrefix(v interface{}, k string) (ws []string, errors []error) {
 		errors = append(errors, fmt.Errorf(
 			"%q cannot begin with a hyphen: %q", k, value))
 	}
+	if regexp.MustCompile(`^internal-`).MatchString(value) {
+		errors = append(errors, fmt.Errorf(
+			`%q cannot begin with "internal-": %q`, k, value))
+	}
 	return
 }
 

diff --git a/internal/service/elbv2/validate_test.go b/internal/service/elbv2/validate_test.go
@@ -23,6 +23,7 @@ func TestValidName(t *testing.T) {
 		"tf-test-elb-tf-test-elb-tf-test-elb",
 		"-tf-test-elb",
 		"tf-test-elb-",
+		"internal-tf-test-elb",
 	}
 
 	for _, s := range invalidNames {
@@ -49,6 +50,7 @@ func TestValidNamePrefix(t *testing.T) {
 		"tf.test.elb.",
 		"tf-test",
 		"-test",
+		"internal-",
 	}
 
 	for _, s := range invalidNamePrefixes {