From 7e855f6861abafebbec0f4172fe6033f3e6076f4 Mon Sep 17 00:00:00 2001 From: Daniel Morinigo Date: Fri, 23 Feb 2018 09:53:06 +0800 Subject: [PATCH] Fix registry flunder and fisher strategy method names to a standard --- .../pkg/registry/wardle/fischer/strategy.go | 11 +++++++---- .../pkg/registry/wardle/flunder/strategy.go | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/fischer/strategy.go b/staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/fischer/strategy.go index 27659a9bb3a..3f739c3dab4 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/fischer/strategy.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/fischer/strategy.go @@ -31,16 +31,19 @@ import ( "k8s.io/sample-apiserver/pkg/apis/wardle" ) +// NewStrategy creates and returns a fischerStrategy instance func NewStrategy(typer runtime.ObjectTyper) fischerStrategy { return fischerStrategy{typer, names.SimpleNameGenerator} } +// GetAttrs returns labels.Set, fields.Set, the presence of Initializers if any +// and error in case the given runtime.Object is not a Fischer func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, bool, error) { apiserver, ok := obj.(*wardle.Fischer) if !ok { - return nil, nil, false, fmt.Errorf("given object is not a Fischer.") + return nil, nil, false, fmt.Errorf("given object is not a Fischer") } - return labels.Set(apiserver.ObjectMeta.Labels), fischerToSelectableFields(apiserver), apiserver.Initializers != nil, nil + return labels.Set(apiserver.ObjectMeta.Labels), SelectableFields(apiserver), apiserver.Initializers != nil, nil } // MatchFischer is the filter used by the generic etcd backend to watch events @@ -53,8 +56,8 @@ func MatchFischer(label labels.Selector, field fields.Selector) storage.Selectio } } -// fischerToSelectableFields returns a field set that represents the object. -func fischerToSelectableFields(obj *wardle.Fischer) fields.Set { +// SelectableFields returns a field set that represents the object. +func SelectableFields(obj *wardle.Fischer) fields.Set { return generic.ObjectMetaFieldsSet(&obj.ObjectMeta, true) } diff --git a/staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder/strategy.go b/staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder/strategy.go index 3034667f57a..b20b909d724 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder/strategy.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder/strategy.go @@ -31,16 +31,19 @@ import ( "k8s.io/sample-apiserver/pkg/apis/wardle" ) +// NewStrategy creates and returns a flunderStrategy instance func NewStrategy(typer runtime.ObjectTyper) flunderStrategy { return flunderStrategy{typer, names.SimpleNameGenerator} } +// GetAttrs returns labels.Set, fields.Set, the presence of Initializers if any +// and error in case the given runtime.Object is not a Flunder func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, bool, error) { apiserver, ok := obj.(*wardle.Flunder) if !ok { - return nil, nil, false, fmt.Errorf("given object is not a Flunder.") + return nil, nil, false, fmt.Errorf("given object is not a Flunder") } - return labels.Set(apiserver.ObjectMeta.Labels), FlunderToSelectableFields(apiserver), apiserver.Initializers != nil, nil + return labels.Set(apiserver.ObjectMeta.Labels), SelectableFields(apiserver), apiserver.Initializers != nil, nil } // MatchFlunder is the filter used by the generic etcd backend to watch events @@ -53,8 +56,8 @@ func MatchFlunder(label labels.Selector, field fields.Selector) storage.Selectio } } -// FlunderToSelectableFields returns a field set that represents the object. -func FlunderToSelectableFields(obj *wardle.Flunder) fields.Set { +// SelectableFields returns a field set that represents the object. +func SelectableFields(obj *wardle.Flunder) fields.Set { return generic.ObjectMetaFieldsSet(&obj.ObjectMeta, true) }