Add ValidateFunc for name to r/tfe_policy_set to catch errors at plan…

… time (#168)

tfe/resource_tfe_policy_set.go

@@ -3,9 +3,11 @@ package tfe
 import (
 	"fmt"
 	"log"
+	"regexp"
 
 	tfe "github.com/hashicorp/go-tfe"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )
 
 func resourceTFEPolicySet() *schema.Resource {
@@ -20,8 +22,9 @@ func resourceTFEPolicySet() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"name": {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validation.StringMatch(regexp.MustCompile(`\A[\w\_\-]+\z`), "can only include letters, numbers, -, and _."),
 			},
 
 			"description": {

tfe/resource_tfe_policy_set_test.go

@@ -2,6 +2,7 @@ package tfe
 
 import (
 	"fmt"
+	"regexp"
 	"testing"
 
 	tfe "github.com/hashicorp/go-tfe"
@@ -732,6 +733,20 @@ func testAccCheckTFEPolicySetDestroy(s *terraform.State) error {
 	return nil
 }
 
+func TestAccTFEPolicySet_invalidName(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckTFEPolicySetDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config:      testAccTFEPolicySet_invalidName,
+				ExpectError: regexp.MustCompile(`can only include letters, numbers, -, and _.`),
+			},
+		},
+	})
+}
+
 const testAccTFEPolicySet_basic = `
 resource "tfe_organization" "foobar" {
   name  = "tst-terraform"
@@ -970,3 +985,22 @@ resource "tfe_policy_set" "foobar" {
 	GITHUB_POLICY_SET_BRANCH,
 	GITHUB_POLICY_SET_PATH,
 )
+
+const testAccTFEPolicySet_invalidName = `
+resource "tfe_organization" "foobar" {
+  name  = "tst-terraform"
+  email = "[email protected]"
+}
+
+resource "tfe_sentinel_policy" "foo" {
+  name         = "policy-foo"
+  policy       = "main = rule { true }"
+  organization = "${tfe_organization.foobar.id}"
+}
+
+resource "tfe_policy_set" "foobar" {
+  name         = "not the right format"
+  description  = "Policy Set"
+  organization = "${tfe_organization.foobar.id}"
+  policy_ids   = ["${tfe_sentinel_policy.foo.id}"]
+}`