Skip to content

Commit 231d2a9

Browse files
committed
Fix golint failures of pkg/registry/core/event
1 parent 6049253 commit 231d2a9

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

hack/.golint_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ pkg/registry/certificates/rest
171171
pkg/registry/coordination/rest
172172
pkg/registry/core/componentstatus
173173
pkg/registry/core/endpoint/storage
174-
pkg/registry/core/event
175174
pkg/registry/core/event/storage
176175
pkg/registry/core/limitrange/storage
177176
pkg/registry/core/namespace

pkg/registry/core/configmap/strategy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
9595
return labels.Set(configMap.Labels), SelectableFields(configMap), nil
9696
}
9797

98-
// Matcher returns a generic matcher for a given label and field selector.
98+
// Matcher returns a selection predicate for a given label and field selector.
9999
func Matcher(label labels.Selector, field fields.Selector) pkgstorage.SelectionPredicate {
100100
return pkgstorage.SelectionPredicate{
101101
Label: label,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter, ttl uint64) *REST {
4343
store := &genericregistry.Store{
4444
NewFunc: func() runtime.Object { return &api.Event{} },
4545
NewListFunc: func() runtime.Object { return &api.EventList{} },
46-
PredicateFunc: event.MatchEvent,
46+
PredicateFunc: event.Matcher,
4747
TTLFunc: func(runtime.Object, uint64, bool) (uint64, error) {
4848
return ttl, nil
4949
},

pkg/registry/core/event/strategy.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type eventStrategy struct {
3838
names.NameGenerator
3939
}
4040

41-
// Strategy is the default logic that pplies when creating and updating
41+
// Strategy is the default logic that applies when creating and updating
4242
// Event objects via the REST API.
4343
var Strategy = eventStrategy{legacyscheme.Scheme, names.SimpleNameGenerator}
4444

@@ -84,19 +84,20 @@ func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
8484
if !ok {
8585
return nil, nil, fmt.Errorf("not an event")
8686
}
87-
return labels.Set(event.Labels), EventToSelectableFields(event), nil
87+
return labels.Set(event.Labels), ToSelectableFields(event), nil
8888
}
8989

90-
func MatchEvent(label labels.Selector, field fields.Selector) storage.SelectionPredicate {
90+
// Matcher returns a selection predicate for a given label and field selector.
91+
func Matcher(label labels.Selector, field fields.Selector) storage.SelectionPredicate {
9192
return storage.SelectionPredicate{
9293
Label: label,
9394
Field: field,
9495
GetAttrs: GetAttrs,
9596
}
9697
}
9798

98-
// EventToSelectableFields returns a field set that represents the object
99-
func EventToSelectableFields(event *api.Event) fields.Set {
99+
// ToSelectableFields returns a field set that represents the object.
100+
func ToSelectableFields(event *api.Event) fields.Set {
100101
objectMetaFieldsSet := generic.ObjectMetaFieldsSet(&event.ObjectMeta, true)
101102
specificFieldsSet := fields.Set{
102103
"involvedObject.kind": event.InvolvedObject.Kind,

pkg/registry/core/event/strategy_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestGetAttrs(t *testing.T) {
4949
Source: api.EventSource{Component: "test"},
5050
Type: api.EventTypeNormal,
5151
}
52-
field := EventToSelectableFields(eventA)
52+
field := ToSelectableFields(eventA)
5353
expect := fields.Set{
5454
"metadata.name": "f0118",
5555
"metadata.namespace": "default",
@@ -70,7 +70,7 @@ func TestGetAttrs(t *testing.T) {
7070
}
7171

7272
func TestSelectableFieldLabelConversions(t *testing.T) {
73-
fset := EventToSelectableFields(&api.Event{})
73+
fset := ToSelectableFields(&api.Event{})
7474
apitesting.TestSelectableFieldLabelConversionsOfKind(t,
7575
"v1",
7676
"Event",

pkg/registry/core/secret/strategy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
106106
return labels.Set(secret.Labels), SelectableFields(secret), nil
107107
}
108108

109-
// Matcher returns a generic matcher for a given label and field selector.
109+
// Matcher returns a selection predicate for a given label and field selector.
110110
func Matcher(label labels.Selector, field fields.Selector) pkgstorage.SelectionPredicate {
111111
return pkgstorage.SelectionPredicate{
112112
Label: label,

0 commit comments

Comments
 (0)