diff --git a/helper/schema/schema.go b/helper/schema/schema.go index c94b694ff7..560d366835 100644 --- a/helper/schema/schema.go +++ b/helper/schema/schema.go @@ -1270,9 +1270,9 @@ func (m schemaMap) validateConflictingAttributes( } for _, conflicting_key := range schema.ConflictsWith { - if value, ok := c.Get(conflicting_key); ok { + if _, ok := c.Get(conflicting_key); ok { return fmt.Errorf( - "%q: conflicts with %s (%#v)", k, conflicting_key, value) + "%q: conflicts with %s", k, conflicting_key) } } diff --git a/helper/schema/schema_test.go b/helper/schema/schema_test.go index 4f50f9215b..4b0d5afb84 100644 --- a/helper/schema/schema_test.go +++ b/helper/schema/schema_test.go @@ -4790,7 +4790,7 @@ func TestSchemaMap_Validate(t *testing.T) { Err: true, Errors: []error{ - fmt.Errorf("\"blacklist\": conflicts with whitelist (\"white-val\")"), + fmt.Errorf("\"blacklist\": conflicts with whitelist"), }, }, @@ -4834,7 +4834,7 @@ func TestSchemaMap_Validate(t *testing.T) { Err: true, Errors: []error{ - fmt.Errorf(`"optional_att": conflicts with required_att ("required-val")`), + fmt.Errorf(`"optional_att": conflicts with required_att`), }, }, @@ -4861,8 +4861,8 @@ func TestSchemaMap_Validate(t *testing.T) { Err: true, Errors: []error{ - fmt.Errorf(`"foo_att": conflicts with bar_att ("bar-val")`), - fmt.Errorf(`"bar_att": conflicts with foo_att ("foo-val")`), + fmt.Errorf(`"foo_att": conflicts with bar_att`), + fmt.Errorf(`"bar_att": conflicts with foo_att`), }, },