schema: Add field name to ValidateFunc
This commit is contained in:
parent
0e73dbc506
commit
92db4802b6
|
@ -154,17 +154,17 @@ func resourceAwsDbInstance() *schema.Resource {
|
||||||
"final_snapshot_identifier": &schema.Schema{
|
"final_snapshot_identifier": &schema.Schema{
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Optional: true,
|
Optional: true,
|
||||||
ValidateFunc: func(v interface{}) (ws []string, es []error) {
|
ValidateFunc: func(v interface{}, k string) (ws []string, es []error) {
|
||||||
fsi := v.(string)
|
fsi := v.(string)
|
||||||
if !regexp.MustCompile(`^[0-9A-Za-z-]+$`).MatchString(fsi) {
|
if !regexp.MustCompile(`^[0-9A-Za-z-]+$`).MatchString(fsi) {
|
||||||
es = append(es, fmt.Errorf(
|
es = append(es, fmt.Errorf(
|
||||||
"only alphanumeric characters and hyphens allowed"))
|
"only alphanumeric characters and hyphens allowed in %s", k))
|
||||||
}
|
}
|
||||||
if regexp.MustCompile(`--`).MatchString(fsi) {
|
if regexp.MustCompile(`--`).MatchString(fsi) {
|
||||||
es = append(es, fmt.Errorf("cannot contain two consecutive hyphens"))
|
es = append(es, fmt.Errorf("%s cannot contain two consecutive hyphens", k))
|
||||||
}
|
}
|
||||||
if regexp.MustCompile(`-$`).MatchString(fsi) {
|
if regexp.MustCompile(`-$`).MatchString(fsi) {
|
||||||
es = append(es, fmt.Errorf("cannot end in a hyphen"))
|
es = append(es, fmt.Errorf("%s cannot end in a hyphen", k))
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
},
|
},
|
||||||
|
|
|
@ -183,7 +183,7 @@ type SchemaStateFunc func(interface{}) string
|
||||||
|
|
||||||
// SchemaValidateFunc is a function used to validate a single field in the
|
// SchemaValidateFunc is a function used to validate a single field in the
|
||||||
// schema.
|
// schema.
|
||||||
type SchemaValidateFunc func(interface{}) ([]string, []error)
|
type SchemaValidateFunc func(interface{}, string) ([]string, []error)
|
||||||
|
|
||||||
func (s *Schema) GoString() string {
|
func (s *Schema) GoString() string {
|
||||||
return fmt.Sprintf("*%#v", *s)
|
return fmt.Sprintf("*%#v", *s)
|
||||||
|
@ -1172,7 +1172,7 @@ func (m schemaMap) validatePrimitive(
|
||||||
}
|
}
|
||||||
|
|
||||||
if schema.ValidateFunc != nil {
|
if schema.ValidateFunc != nil {
|
||||||
return schema.ValidateFunc(decoded)
|
return schema.ValidateFunc(decoded, k)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, nil
|
return nil, nil
|
||||||
|
|
|
@ -2803,7 +2803,7 @@ func TestSchemaMap_InternalValidate(t *testing.T) {
|
||||||
"foo": &Schema{
|
"foo": &Schema{
|
||||||
Type: TypeMap,
|
Type: TypeMap,
|
||||||
Required: true,
|
Required: true,
|
||||||
ValidateFunc: func(v interface{}) (ws []string, es []error) {
|
ValidateFunc: func(v interface{}, k string) (ws []string, es []error) {
|
||||||
return
|
return
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -3422,7 +3422,7 @@ func TestSchemaMap_Validate(t *testing.T) {
|
||||||
"validate_me": &Schema{
|
"validate_me": &Schema{
|
||||||
Type: TypeString,
|
Type: TypeString,
|
||||||
Required: true,
|
Required: true,
|
||||||
ValidateFunc: func(v interface{}) (ws []string, es []error) {
|
ValidateFunc: func(v interface{}, k string) (ws []string, es []error) {
|
||||||
return
|
return
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -3438,7 +3438,7 @@ func TestSchemaMap_Validate(t *testing.T) {
|
||||||
"validate_me": &Schema{
|
"validate_me": &Schema{
|
||||||
Type: TypeString,
|
Type: TypeString,
|
||||||
Required: true,
|
Required: true,
|
||||||
ValidateFunc: func(v interface{}) (ws []string, es []error) {
|
ValidateFunc: func(v interface{}, k string) (ws []string, es []error) {
|
||||||
es = append(es, fmt.Errorf("something is not right here"))
|
es = append(es, fmt.Errorf("something is not right here"))
|
||||||
return
|
return
|
||||||
},
|
},
|
||||||
|
@ -3458,7 +3458,7 @@ func TestSchemaMap_Validate(t *testing.T) {
|
||||||
"number": &Schema{
|
"number": &Schema{
|
||||||
Type: TypeInt,
|
Type: TypeInt,
|
||||||
Required: true,
|
Required: true,
|
||||||
ValidateFunc: func(v interface{}) (ws []string, es []error) {
|
ValidateFunc: func(v interface{}, k string) (ws []string, es []error) {
|
||||||
t.Fatalf("Should not have gotten validate call")
|
t.Fatalf("Should not have gotten validate call")
|
||||||
return
|
return
|
||||||
},
|
},
|
||||||
|
@ -3475,7 +3475,7 @@ func TestSchemaMap_Validate(t *testing.T) {
|
||||||
"maybe": &Schema{
|
"maybe": &Schema{
|
||||||
Type: TypeBool,
|
Type: TypeBool,
|
||||||
Required: true,
|
Required: true,
|
||||||
ValidateFunc: func(v interface{}) (ws []string, es []error) {
|
ValidateFunc: func(v interface{}, k string) (ws []string, es []error) {
|
||||||
if _, ok := v.(bool); !ok {
|
if _, ok := v.(bool); !ok {
|
||||||
t.Fatalf("Expected bool, got: %#v", v)
|
t.Fatalf("Expected bool, got: %#v", v)
|
||||||
}
|
}
|
||||||
|
@ -3493,7 +3493,7 @@ func TestSchemaMap_Validate(t *testing.T) {
|
||||||
"validate_me": &Schema{
|
"validate_me": &Schema{
|
||||||
Type: TypeString,
|
Type: TypeString,
|
||||||
Required: true,
|
Required: true,
|
||||||
ValidateFunc: func(v interface{}) (ws []string, es []error) {
|
ValidateFunc: func(v interface{}, k string) (ws []string, es []error) {
|
||||||
es = append(es, fmt.Errorf("something is not right here"))
|
es = append(es, fmt.Errorf("something is not right here"))
|
||||||
return
|
return
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue