github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix golint failures of pkg/registry/core/event

Browse Source
This commit is contained in:
Mark Janssen 2019-05-20 14:49:27 +02:00
parent 6049253aae
commit 231d2a9617
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.golint_failures
View File

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

2
pkg/registry/core/configmap/strategy.go
View File

@ -95,7 +95,7 @@ func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
return labels.Set(configMap.Labels), SelectableFields(configMap), nil 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 { func Matcher(label labels.Selector, field fields.Selector) pkgstorage.SelectionPredicate {
return pkgstorage.SelectionPredicate{ return pkgstorage.SelectionPredicate{
Label: label, Label: label,

2
pkg/registry/core/event/storage/storage.go
View File

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

11
pkg/registry/core/event/strategy.go
View File

@ -38,7 +38,7 @@ type eventStrategy struct {
names.NameGenerator 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. // Event objects via the REST API.
var Strategy = eventStrategy{legacyscheme.Scheme, names.SimpleNameGenerator} var Strategy = eventStrategy{legacyscheme.Scheme, names.SimpleNameGenerator}
@ -84,10 +84,11 @@ func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
if !ok { if !ok {
return nil, nil, fmt.Errorf("not an event") 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{ return storage.SelectionPredicate{
Label: label, Label: label,
Field: field, Field: field,
@ -95,8 +96,8 @@ func MatchEvent(label labels.Selector, field fields.Selector) storage.SelectionP
} }
} }
// EventToSelectableFields returns a field set that represents the object // ToSelectableFields returns a field set that represents the object.
func EventToSelectableFields(event *api.Event) fields.Set { func ToSelectableFields(event *api.Event) fields.Set {
objectMetaFieldsSet := generic.ObjectMetaFieldsSet(&event.ObjectMeta, true) objectMetaFieldsSet := generic.ObjectMetaFieldsSet(&event.ObjectMeta, true)
specificFieldsSet := fields.Set{ specificFieldsSet := fields.Set{
"involvedObject.kind": event.InvolvedObject.Kind, "involvedObject.kind": event.InvolvedObject.Kind,

4
pkg/registry/core/event/strategy_test.go
View File

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

2
pkg/registry/core/secret/strategy.go
View File

@ -106,7 +106,7 @@ func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
return labels.Set(secret.Labels), SelectableFields(secret), nil 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 { func Matcher(label labels.Selector, field fields.Selector) pkgstorage.SelectionPredicate {
return pkgstorage.SelectionPredicate{ return pkgstorage.SelectionPredicate{
Label: label, Label: label,