From de9a1c146c57b1326b4d3a48f5ac4135f28f6fee Mon Sep 17 00:00:00 2001
From: Alexander Hellbom <alexander.hellbom@gmail.com>
Date: Mon, 17 Oct 2016 23:20:23 +0200
Subject: [PATCH] Allowed values in error message

---
 .../providers/pagerduty/resource_pagerduty_user.go | 14 ++++++++++----
 builtin/providers/pagerduty/util.go                |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/builtin/providers/pagerduty/resource_pagerduty_user.go b/builtin/providers/pagerduty/resource_pagerduty_user.go
index 33b7e80c8..8bf8470f7 100644
--- a/builtin/providers/pagerduty/resource_pagerduty_user.go
+++ b/builtin/providers/pagerduty/resource_pagerduty_user.go
@@ -31,10 +31,16 @@ func resourcePagerDutyUser() *schema.Resource {
 				Computed: true,
 			},
 			"role": &schema.Schema{
-				Type:         schema.TypeString,
-				Optional:     true,
-				Default:      "user",
-				ValidateFunc: validateValueFunc([]string{"admin", "limited_user", "owner", "read_only_user", "user"}),
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "user",
+				ValidateFunc: validateValueFunc([]string{
+					"admin",
+					"limited_user",
+					"owner",
+					"read_only_user",
+					"user",
+				}),
 			},
 			"job_title": &schema.Schema{
 				Type:     schema.TypeString,
diff --git a/builtin/providers/pagerduty/util.go b/builtin/providers/pagerduty/util.go
index 661b7f9e6..541c914f8 100644
--- a/builtin/providers/pagerduty/util.go
+++ b/builtin/providers/pagerduty/util.go
@@ -19,7 +19,7 @@ func validateValueFunc(values []string) schema.SchemaValidateFunc {
 		}
 
 		if !valid {
-			errors = append(errors, fmt.Errorf("%s is an invalid value for argument %s", value, k))
+			errors = append(errors, fmt.Errorf("%s is an invalid value for argument %s. Must be one of %v", value, k, values))
 		}
 		return
 	}