change regex to support 1-63 and add new test cases

GoogleCloudPlatform · Oct 11, 2024 · 34f96b1 · 34f96b1
1 parent e1cc8ed
commit 34f96b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/mmv1/third_party/terraform/verify/validation.go b/mmv1/third_party/terraform/verify/validation.go
@@ -22,7 +22,7 @@ const (
 
 	SubnetworkLinkRegex = "projects/(" + ProjectRegex + ")/regions/(" + RegionRegex + ")/subnetworks/(" + SubnetworkRegex + ")$"
 
-	RFC1035NameTemplate = "[a-z](?:[-a-z0-9]%v[a-z0-9])"
+	RFC1035NameTemplate = "[a-z]([-a-z0-9]%v[a-z0-9])?"
 	CloudIoTIdRegex     = "^[a-zA-Z][-a-zA-Z0-9._+~%]{2,254}$"
 
 	// Format of default Compute service accounts created by Google

diff --git a/mmv1/third_party/terraform/verify/validation_test.go b/mmv1/third_party/terraform/verify/validation_test.go
@@ -169,6 +169,8 @@ func TestValidateRFC1035Name(t *testing.T) {
 		{TestName: "valid", Min: 6, Max: 30, Value: "a-valid-name0"},
 		{TestName: "valid lower bound", Min: 12, Max: 30, Value: "a-valid-name"},
 		{TestName: "valid upper bound", Min: 6, Max: 12, Value: "a-valid-name"},
+		{TestName: "valid shortest possible", Min: 1, Max: 63, Value: "a"},
+		{TestName: "valid longest possible", Min: 1, Max: 63, Value: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
 		{TestName: "valid with numbers", Min: 6, Max: 30, Value: "valid000-name"},
 		{TestName: "must start with a letter", Min: 6, Max: 10, Value: "0invalid", ExpectError: true},
 		{TestName: "cannot end with a dash", Min: 6, Max: 10, Value: "invalid-", ExpectError: true},