github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 06:15:45 +00:00
Code Issues Projects Releases Wiki Activity

Remove unused matcher

Browse Source
This commit is contained in:
Tim Hockin 2015-11-03 13:41:23 -08:00
parent 48b49a5cae
commit bca3780b7f
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/util/validation/errors.go
View File

@ -172,7 +172,7 @@ func (list ErrorList) PrefixIndex(index int) ErrorList {
return list.Prefix(fmt.Sprintf("[%d]", index)) return list.Prefix(fmt.Sprintf("[%d]", index))
} }
// NewValidationErrorFieldPrefixMatcher returns an errors.Matcher that returns true // NewErrorTypeMatcher returns an errors.Matcher that returns true
// if the provided error is a Error and has the provided ErrorType. // if the provided error is a Error and has the provided ErrorType.
func NewErrorTypeMatcher(t ErrorType) utilerrors.Matcher { func NewErrorTypeMatcher(t ErrorType) utilerrors.Matcher {
return func(err error) bool { return func(err error) bool {
@ -183,18 +183,6 @@ func NewErrorTypeMatcher(t ErrorType) utilerrors.Matcher {
} }
} }
// NewValidationErrorFieldPrefixMatcher returns an errors.Matcher that returns true
// if the provided error is a Error and has a field with the provided
// prefix.
func NewValidationErrorFieldPrefixMatcher(prefix string) utilerrors.Matcher {
return func(err error) bool {
if e, ok := err.(*Error); ok {
return strings.HasPrefix(e.Field, prefix)
}
return false
}
}
// Filter removes items from the ErrorList that match the provided fns. // Filter removes items from the ErrorList that match the provided fns.
func (list ErrorList) Filter(fns ...utilerrors.Matcher) ErrorList { func (list ErrorList) Filter(fns ...utilerrors.Matcher) ErrorList {
err := utilerrors.FilterOut(utilerrors.NewAggregate(list), fns...) err := utilerrors.FilterOut(utilerrors.NewAggregate(list), fns...)

12
pkg/util/validation/errors_test.go
View File

@ -105,18 +105,6 @@ func TestErrListFilter(t *testing.T) {
if len(list.Filter(NewErrorTypeMatcher(ErrorTypeInvalid))) != 1 { if len(list.Filter(NewErrorTypeMatcher(ErrorTypeInvalid))) != 1 {
t.Errorf("should filter") t.Errorf("should filter")
} }
if len(list.Filter(NewValidationErrorFieldPrefixMatcher("test"))) != 1 {
t.Errorf("should filter")
}
if len(list.Filter(NewValidationErrorFieldPrefixMatcher("test."))) != 2 {
t.Errorf("should filter")
}
if len(list.Filter(NewValidationErrorFieldPrefixMatcher(""))) != 0 {
t.Errorf("should filter")
}
if len(list.Filter(NewValidationErrorFieldPrefixMatcher("field."), NewErrorTypeMatcher(ErrorTypeDuplicate))) != 1 {
t.Errorf("should filter")
}
} }
func TestErrListPrefix(t *testing.T) { func TestErrListPrefix(t *testing.T) {