Merge pull request #299 from hashicorp/kt/ensure_value_is_returned

validation - ensure all validators return the failing value

Author: appilon

helper/validation/meta.go

@@ -14,9 +14,9 @@ func NoZeroValues(i interface{}, k string) (s []string, es []error) {
 	if reflect.ValueOf(i).Interface() == reflect.Zero(reflect.TypeOf(i)).Interface() {
 		switch reflect.TypeOf(i).Kind() {
 		case reflect.String:
-			es = append(es, fmt.Errorf("%s must not be empty", k))
+			es = append(es, fmt.Errorf("%s must not be empty, got %v", k, i))
 		case reflect.Int, reflect.Float64:
-			es = append(es, fmt.Errorf("%s must not be zero", k))
+			es = append(es, fmt.Errorf("%s must not be zero, got %v", k, i))
 		default:
 			// this validator should only ever be applied to TypeString, TypeInt and TypeFloat
 			panic(fmt.Errorf("can't use NoZeroValues with %T attribute %s", i, k))

helper/validation/strings.go

@@ -18,7 +18,7 @@ func StringIsNotEmpty(i interface{}, k string) ([]string, []error) {
 	}
 
 	if v == "" {
-		return nil, []error{fmt.Errorf("expected %q to not be an empty string", k)}
+		return nil, []error{fmt.Errorf("expected %q to not be an empty string, got %v", k, i)}
 	}
 
 	return nil, nil
@@ -97,7 +97,7 @@ func StringMatch(r *regexp.Regexp, message string) schema.SchemaValidateFunc {
 				return nil, []error{fmt.Errorf("invalid value for %s (%s)", k, message)}
 
 			}
-			return nil, []error{fmt.Errorf("expected value of %s to match regular expression %q", k, r)}
+			return nil, []error{fmt.Errorf("expected value of %s to match regular expression %q, got %v", k, r, i)}
 		}
 		return nil, nil
 	}
@@ -118,7 +118,7 @@ func StringDoesNotMatch(r *regexp.Regexp, message string) schema.SchemaValidateF
 				return nil, []error{fmt.Errorf("invalid value for %s (%s)", k, message)}
 
 			}
-			return nil, []error{fmt.Errorf("expected value of %s to not match regular expression %q", k, r)}
+			return nil, []error{fmt.Errorf("expected value of %s to not match regular expression %q, got %v", k, r, i)}
 		}
 		return nil, nil
 	}
@@ -157,7 +157,7 @@ func StringDoesNotContainAny(chars string) schema.SchemaValidateFunc {
 		}
 
 		if strings.ContainsAny(v, chars) {
-			es = append(es, fmt.Errorf("expected value of %s to not contain any of %q", k, chars))
+			es = append(es, fmt.Errorf("expected value of %s to not contain any of %q, got %v", k, chars, i))
 			return
 		}
 

helper/validation/web.go

@@ -28,18 +28,18 @@ func IsURLWithScheme(validSchemes []string) schema.SchemaValidateFunc {
 		}
 
 		if v == "" {
-			errors = append(errors, fmt.Errorf("expected %q url to not be empty", k))
+			errors = append(errors, fmt.Errorf("expected %q url to not be empty, got %v", k, i))
 			return
 		}
 
 		u, err := url.Parse(v)
 		if err != nil {
-			errors = append(errors, fmt.Errorf("%q url is in an invalid format: %q (%+v)", k, v, err))
+			errors = append(errors, fmt.Errorf("expected %q to be a valid url, got %v: %+v", k, v, err))
 			return
 		}
 
 		if u.Host == "" {
-			errors = append(errors, fmt.Errorf("%q url has no host: %q", k, v))
+			errors = append(errors, fmt.Errorf("expected %q to have a host, got %v", k, v))
 			return
 		}
 
@@ -49,7 +49,7 @@ func IsURLWithScheme(validSchemes []string) schema.SchemaValidateFunc {
 			}
 		}
 
-		errors = append(errors, fmt.Errorf("expected %q url %q to have a schema of: %q", k, v, strings.Join(validSchemes, ",")))
+		errors = append(errors, fmt.Errorf("expected %q to have a url with schema of: %q, got %v", k, strings.Join(validSchemes, ","), v))
 		return
 	}
 }