Merge pull request kubernetes#78113 from praseodym/fix-golint-pkg/registry/core/event

Fix golint failures of pkg/registry/core/event

Author: k8s-ci-robot

hack/.golint_failures

@@ -170,7 +170,6 @@ pkg/registry/certificates/rest
 pkg/registry/coordination/rest
 pkg/registry/core/componentstatus
 pkg/registry/core/endpoint/storage
-pkg/registry/core/event
 pkg/registry/core/event/storage
 pkg/registry/core/limitrange/storage
 pkg/registry/core/namespace

pkg/registry/core/configmap/strategy.go

@@ -95,7 +95,7 @@ func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
 	return labels.Set(configMap.Labels), SelectableFields(configMap), nil
 }
 
-// Matcher returns a generic matcher for a given label and field selector.
+// Matcher returns a selection predicate for a given label and field selector.
 func Matcher(label labels.Selector, field fields.Selector) pkgstorage.SelectionPredicate {
 	return pkgstorage.SelectionPredicate{
 		Label:       label,

pkg/registry/core/event/storage/storage.go

@@ -43,7 +43,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter, ttl uint64) *REST {
 	store := &genericregistry.Store{
 		NewFunc:       func() runtime.Object { return &api.Event{} },
 		NewListFunc:   func() runtime.Object { return &api.EventList{} },
-		PredicateFunc: event.MatchEvent,
+		PredicateFunc: event.Matcher,
 		TTLFunc: func(runtime.Object, uint64, bool) (uint64, error) {
 			return ttl, nil
 		},

pkg/registry/core/event/strategy.go

@@ -38,7 +38,7 @@ type eventStrategy struct {
 	names.NameGenerator
 }
 
-// Strategy is the default logic that pplies when creating and updating
+// Strategy is the default logic that applies when creating and updating
 // Event objects via the REST API.
 var Strategy = eventStrategy{legacyscheme.Scheme, names.SimpleNameGenerator}
 
@@ -84,19 +84,20 @@ func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
 	if !ok {
 		return nil, nil, fmt.Errorf("not an event")
 	}
-	return labels.Set(event.Labels), EventToSelectableFields(event), nil
+	return labels.Set(event.Labels), ToSelectableFields(event), nil
 }
 
-func MatchEvent(label labels.Selector, field fields.Selector) storage.SelectionPredicate {
+// Matcher returns a selection predicate for a given label and field selector.
+func Matcher(label labels.Selector, field fields.Selector) storage.SelectionPredicate {
 	return storage.SelectionPredicate{
 		Label:    label,
 		Field:    field,
 		GetAttrs: GetAttrs,
 	}
 }
 
-// EventToSelectableFields returns a field set that represents the object
-func EventToSelectableFields(event *api.Event) fields.Set {
+// ToSelectableFields returns a field set that represents the object.
+func ToSelectableFields(event *api.Event) fields.Set {
 	objectMetaFieldsSet := generic.ObjectMetaFieldsSet(&event.ObjectMeta, true)
 	specificFieldsSet := fields.Set{
 		"involvedObject.kind":            event.InvolvedObject.Kind,

pkg/registry/core/event/strategy_test.go

@@ -49,7 +49,7 @@ func TestGetAttrs(t *testing.T) {
 		Source: api.EventSource{Component: "test"},
 		Type:   api.EventTypeNormal,
 	}
-	field := EventToSelectableFields(eventA)
+	field := ToSelectableFields(eventA)
 	expect := fields.Set{
 		"metadata.name":                  "f0118",
 		"metadata.namespace":             "default",
@@ -70,7 +70,7 @@ func TestGetAttrs(t *testing.T) {
 }
 
 func TestSelectableFieldLabelConversions(t *testing.T) {
-	fset := EventToSelectableFields(&api.Event{})
+	fset := ToSelectableFields(&api.Event{})
 	apitesting.TestSelectableFieldLabelConversionsOfKind(t,
 		"v1",
 		"Event",

pkg/registry/core/secret/strategy.go

@@ -106,7 +106,7 @@ func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
 	return labels.Set(secret.Labels), SelectableFields(secret), nil
 }
 
-// Matcher returns a generic matcher for a given label and field selector.
+// Matcher returns a selection predicate for a given label and field selector.
 func Matcher(label labels.Selector, field fields.Selector) pkgstorage.SelectionPredicate {
 	return pkgstorage.SelectionPredicate{
 		Label:       label,