knative
/
pkg
mirror of https://github.com/knative/pkg.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flipped the error text around. fixed. (#36)

This commit is contained in:
Scott Nichols 2018-08-02 13:13:38 -07:00 committed by Google Prow Robot
parent c1e9219cee
commit 5182837041
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/field_error.go
View File

@ -116,7 +116,7 @@ func ErrInvalidValue(value, fieldPath string) *FieldError {
// not having at least one field in a mutually exclusive field group. // not having at least one field in a mutually exclusive field group.
func ErrMissingOneOf(fieldPaths ...string) *FieldError { func ErrMissingOneOf(fieldPaths ...string) *FieldError {
return &FieldError{ return &FieldError{
Message: "expected exactly one, got both", Message: "expected exactly one, got neither",
Paths: fieldPaths, Paths: fieldPaths,
} }
} }
@ -125,7 +125,7 @@ func ErrMissingOneOf(fieldPaths ...string) *FieldError {
// for having more than one field set in a mutually exclusive field group. // for having more than one field set in a mutually exclusive field group.
func ErrMultipleOneOf(fieldPaths ...string) *FieldError { func ErrMultipleOneOf(fieldPaths ...string) *FieldError {
return &FieldError{ return &FieldError{
Message: "expected exactly one, got neither", Message: "expected exactly one, got both",
Paths: fieldPaths, Paths: fieldPaths,
} }
} }

4
apis/field_error_test.go
View File

@ -105,12 +105,12 @@ Body.`,
name: "missing mutually exclusive fields", name: "missing mutually exclusive fields",
err: ErrMissingOneOf("foo", "bar"), err: ErrMissingOneOf("foo", "bar"),
prefixes: [][]string{{"baz"}}, prefixes: [][]string{{"baz"}},
want: `expected exactly one, got both: baz.foo, baz.bar`, want: `expected exactly one, got neither: baz.foo, baz.bar`,
}, { }, {
name: "multiple mutually exclusive fields", name: "multiple mutually exclusive fields",
err: ErrMultipleOneOf("foo", "bar"), err: ErrMultipleOneOf("foo", "bar"),
prefixes: [][]string{{"baz"}}, prefixes: [][]string{{"baz"}},
want: `expected exactly one, got neither: baz.foo, baz.bar`, want: `expected exactly one, got both: baz.foo, baz.bar`,
},{ },{
name: "invalid key name", name: "invalid key name",
err: ErrInvalidKeyName("b@r", "foo[0].name", err: ErrInvalidKeyName("b@r", "foo[0].name",