Merge pull request #11383 from brad-larson/brad-fix-regexp-validation

Fix: Incorrect AWS Lambda Qualifier Regexp
hashicorp · Jan 26, 2017 · e3c89da · e3c89da
2 parents cae907b + c5c2d27
commit e3c89da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/builtin/providers/aws/validators.go b/builtin/providers/aws/validators.go
@@ -251,7 +251,7 @@ func validateLambdaQualifier(v interface{}, k string) (ws []string, errors []err
 			"%q cannot be longer than 128 characters: %q", k, value))
 	}
 	// http://docs.aws.amazon.com/lambda/latest/dg/API_AddPermission.html
-	pattern := `^[a-zA-Z0-9$_]+$`
+	pattern := `^[a-zA-Z0-9$_-]+$`
 	if !regexp.MustCompile(pattern).MatchString(value) {
 		errors = append(errors, fmt.Errorf(
 			"%q doesn't comply with restrictions (%q): %q",

diff --git a/builtin/providers/aws/validators_test.go b/builtin/providers/aws/validators_test.go
@@ -111,6 +111,8 @@ func TestValidateLambdaQualifier(t *testing.T) {
 		"prod",
 		"PROD",
 		"MyTestEnv",
+		"contains-dashes",
+		"contains_underscores",
 		"$LATEST",
 	}
 	for _, v := range validNames {