Merge pull request #17621 from dortort/patch-1

hashicorp · Feb 19, 2021 · 59c72cd · 59c72cd
2 parents 962ebd5 + ab2c862
commit 59c72cd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.changelog/17621.txt b/.changelog/17621.txt
@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_transfer_ssh_key: Corrects user_name validation
+```
+
+```release-note:bug
+resource/aws_transfer_user: Corrects user_name validation
+```
diff --git a/aws/resource_aws_transfer_user_test.go b/aws/resource_aws_transfer_user_test.go
@@ -134,11 +134,11 @@ func TestAccAWSTransferUser_UserName_Validation(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config:      testAccAWSTransferUserName_validation("!@#$%^"),
-				ExpectError: regexp.MustCompile(`Invalid "user_name": must be between 3 and 100 alphanumeric or special characters hyphen and underscore. However, "user_name" cannot begin with a hyphen`),
+				ExpectError: regexp.MustCompile(`Invalid "user_name": `),
 			},
 			{
 				Config:      testAccAWSTransferUserName_validation(acctest.RandString(2)),
-				ExpectError: regexp.MustCompile(`Invalid "user_name": must be between 3 and 100 alphanumeric or special characters hyphen and underscore. However, "user_name" cannot begin with a hyphen`),
+				ExpectError: regexp.MustCompile(`Invalid "user_name": `),
 			},
 			{
 				Config:             testAccAWSTransferUserName_validation(acctest.RandString(33)),
@@ -147,11 +147,11 @@ func TestAccAWSTransferUser_UserName_Validation(t *testing.T) {
 			},
 			{
 				Config:      testAccAWSTransferUserName_validation(acctest.RandString(101)),
-				ExpectError: regexp.MustCompile(`Invalid "user_name": must be between 3 and 100 alphanumeric or special characters hyphen and underscore. However, "user_name" cannot begin with a hyphen`),
+				ExpectError: regexp.MustCompile(`Invalid "user_name": `),
 			},
 			{
 				Config:      testAccAWSTransferUserName_validation("-abcdef"),
-				ExpectError: regexp.MustCompile(`Invalid "user_name": must be between 3 and 100 alphanumeric or special characters hyphen and underscore. However, "user_name" cannot begin with a hyphen`),
+				ExpectError: regexp.MustCompile(`Invalid "user_name": `),
 			},
 			{
 				Config:             testAccAWSTransferUserName_validation("valid_username"),

diff --git a/aws/validators.go b/aws/validators.go
@@ -97,8 +97,8 @@ func validateTransferServerID(v interface{}, k string) (ws []string, errors []er
 func validateTransferUserName(v interface{}, k string) (ws []string, errors []error) {
 	value := v.(string)
 	// https://docs.aws.amazon.com/transfer/latest/userguide/API_CreateUser.html
-	if !regexp.MustCompile(`^[a-zA-Z0-9_][a-zA-Z0-9_-]{2,99}$`).MatchString(value) {
-		errors = append(errors, fmt.Errorf("Invalid %q: must be between 3 and 100 alphanumeric or special characters hyphen and underscore. However, %q cannot begin with a hyphen", k, k))
+	if !regexp.MustCompile(`^[\w][\w@.-]{2,99}$`).MatchString(value) {
+		errors = append(errors, fmt.Errorf("Invalid %q: must be between 3 and 100 alphanumeric characters, special characters, hyphens, or underscores. However, it cannot begin with a hyphen, period, or at sign", k))
 	}
 	return
 }