Merge pull request #20 from 90poe/fix/19-rule-name-regex

Fix/19 rule name regex
alexkappa · Jun 11, 2018 · 920318a · 920318a
2 parents 9ccc29f + 98a8083
commit 920318a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/auth0/resource_auth0_rule.go b/auth0/resource_auth0_rule.go
@@ -24,7 +24,7 @@ func newRule() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 				ValidateFunc: validation.StringMatch(
-					regexp.MustCompile("^[a-z|A-Z]+[a-z|A-Z\\-\\s]+[a-z|A-Z]+$"),
+					regexp.MustCompile("^[^\\s-][\\w-]+[^\\s-]$"),
 					"Can only contain alphanumeric characters, spaces and '-'. "+
 						"Can neither start nor end with '-' or spaces."),
 			},

diff --git a/auth0/resource_auth0_rule_test.go b/auth0/resource_auth0_rule_test.go
@@ -17,7 +17,7 @@ func TestAccRule(t *testing.T) {
 			resource.TestStep{
 				Config: testAccRule,
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("auth0_rule.my_rule", "name", "Acceptance-Test-Rule"),
+					resource.TestCheckResourceAttr("auth0_rule.my_rule", "name", "auth0-authorization-extension"),
 					resource.TestCheckResourceAttr("auth0_rule.my_rule", "script", "function (user, context, callback) { callback(null, user, context); }"),
 					resource.TestCheckResourceAttr("auth0_rule.my_rule", "enabled", "true"),
 				),
@@ -30,7 +30,7 @@ const testAccRule = `
 provider "auth0" {}
 
 resource "auth0_rule" "my_rule" {
-  name = "Acceptance-Test-Rule"
+  name = "auth0-authorization-extension"
   script = "function (user, context, callback) { callback(null, user, context); }"
   enabled = true
 }