From 13c017056c924e148113e42786a511ed2fee7594 Mon Sep 17 00:00:00 2001 From: Martin Schimandl Date: Thu, 1 Oct 2020 12:40:32 +0200 Subject: [PATCH] Fix staticchecks in vendor/k8s.io/client-go --- hack/.staticcheck_failures | 4 ---- staging/src/k8s.io/client-go/dynamic/fake/simple.go | 6 ++++-- staging/src/k8s.io/client-go/metadata/fake/simple.go | 6 ++++-- .../src/k8s.io/client-go/restmapper/category_expansion.go | 2 +- staging/src/k8s.io/client-go/restmapper/shortcut.go | 2 +- .../k8s.io/client-go/tools/leaderelection/leaderelection.go | 3 --- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 237dec10fa8..d148fb9b4c9 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -50,12 +50,8 @@ vendor/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook vendor/k8s.io/apiserver/plugin/pkg/authorizer/webhook vendor/k8s.io/cli-runtime/pkg/printers vendor/k8s.io/client-go/discovery -vendor/k8s.io/client-go/dynamic/fake -vendor/k8s.io/client-go/metadata/fake vendor/k8s.io/client-go/rest vendor/k8s.io/client-go/rest/watch -vendor/k8s.io/client-go/restmapper -vendor/k8s.io/client-go/tools/leaderelection vendor/k8s.io/client-go/transport vendor/k8s.io/kubectl/pkg/cmd/scale vendor/k8s.io/metrics/pkg/client/custom_metrics diff --git a/staging/src/k8s.io/client-go/dynamic/fake/simple.go b/staging/src/k8s.io/client-go/dynamic/fake/simple.go index b2c5f6f3436..ec2042550ab 100644 --- a/staging/src/k8s.io/client-go/dynamic/fake/simple.go +++ b/staging/src/k8s.io/client-go/dynamic/fake/simple.go @@ -96,7 +96,8 @@ func (c *dynamicResourceClient) Create(ctx context.Context, obj *unstructured.Un Invokes(testing.NewRootCreateAction(c.resource, obj), obj) case len(c.namespace) == 0 && len(subresources) > 0: - accessor, err := meta.Accessor(obj) + var accessor metav1.Object // avoid shadowing err + accessor, err = meta.Accessor(obj) if err != nil { return nil, err } @@ -109,7 +110,8 @@ func (c *dynamicResourceClient) Create(ctx context.Context, obj *unstructured.Un Invokes(testing.NewCreateAction(c.resource, c.namespace, obj), obj) case len(c.namespace) > 0 && len(subresources) > 0: - accessor, err := meta.Accessor(obj) + var accessor metav1.Object // avoid shadowing err + accessor, err = meta.Accessor(obj) if err != nil { return nil, err } diff --git a/staging/src/k8s.io/client-go/metadata/fake/simple.go b/staging/src/k8s.io/client-go/metadata/fake/simple.go index f5f3f9460e4..adf0ce9a14e 100644 --- a/staging/src/k8s.io/client-go/metadata/fake/simple.go +++ b/staging/src/k8s.io/client-go/metadata/fake/simple.go @@ -114,7 +114,8 @@ func (c *metadataResourceClient) CreateFake(obj *metav1.PartialObjectMetadata, o Invokes(testing.NewRootCreateAction(c.resource, obj), obj) case len(c.namespace) == 0 && len(subresources) > 0: - accessor, err := meta.Accessor(obj) + var accessor metav1.Object // avoid shadowing err + accessor, err = meta.Accessor(obj) if err != nil { return nil, err } @@ -127,7 +128,8 @@ func (c *metadataResourceClient) CreateFake(obj *metav1.PartialObjectMetadata, o Invokes(testing.NewCreateAction(c.resource, c.namespace, obj), obj) case len(c.namespace) > 0 && len(subresources) > 0: - accessor, err := meta.Accessor(obj) + var accessor metav1.Object // avoid shadowing err + accessor, err = meta.Accessor(obj) if err != nil { return nil, err } diff --git a/staging/src/k8s.io/client-go/restmapper/category_expansion.go b/staging/src/k8s.io/client-go/restmapper/category_expansion.go index 2537a2b4e25..484e4c83932 100644 --- a/staging/src/k8s.io/client-go/restmapper/category_expansion.go +++ b/staging/src/k8s.io/client-go/restmapper/category_expansion.go @@ -58,7 +58,7 @@ func NewDiscoveryCategoryExpander(client discovery.DiscoveryInterface) CategoryE // Expand fulfills CategoryExpander func (e discoveryCategoryExpander) Expand(category string) ([]schema.GroupResource, bool) { // Get all supported resources for groups and versions from server, if no resource found, fallback anyway. - apiResourceLists, _ := e.discoveryClient.ServerResources() + _, apiResourceLists, _ := e.discoveryClient.ServerGroupsAndResources() if len(apiResourceLists) == 0 { return nil, false } diff --git a/staging/src/k8s.io/client-go/restmapper/shortcut.go b/staging/src/k8s.io/client-go/restmapper/shortcut.go index 6903ec8088d..73b317c1ca4 100644 --- a/staging/src/k8s.io/client-go/restmapper/shortcut.go +++ b/staging/src/k8s.io/client-go/restmapper/shortcut.go @@ -84,7 +84,7 @@ func (e shortcutExpander) getShortcutMappings() ([]*metav1.APIResourceList, []re res := []resourceShortcuts{} // get server resources // This can return an error *and* the results it was able to find. We don't need to fail on the error. - apiResList, err := e.discoveryClient.ServerResources() + _, apiResList, err := e.discoveryClient.ServerGroupsAndResources() if err != nil { klog.V(1).Infof("Error loading discovery information: %v", err) } diff --git a/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection.go b/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection.go index d1959fd717f..e44fb4736a1 100644 --- a/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection.go +++ b/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection.go @@ -188,9 +188,6 @@ type LeaderElector struct { clock clock.Clock metrics leaderMetricsAdapter - - // name is the name of the resource lock for debugging - name string } // Run starts the leader election loop. Run will not return