Merge pull request kubernetes#95230 from Git-Jiro/fix_vendor_client_go

k8s-ci-robot · web-flow · commit 297b021f49e3 · 2020-10-15T06:04:37.000-07:00
Fix staticchecks in vendor/k8s.io/client-go
diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
@@ -49,12 +49,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func NewDiscoveryCategoryExpander(client discovery.DiscoveryInterface) CategoryE`
`58`	`58`	`// Expand fulfills CategoryExpander`
`59`	`59`	`func (e discoveryCategoryExpander) Expand(category string) ([]schema.GroupResource, bool) {`
`60`	`60`	`// Get all supported resources for groups and versions from server, if no resource found, fallback anyway.`
`61`		`- apiResourceLists, _ := e.discoveryClient.ServerResources()`
	`61`	`+ _, apiResourceLists, _ := e.discoveryClient.ServerGroupsAndResources()`
`62`	`62`	`if len(apiResourceLists) == 0 {`
`63`	`63`	`return nil, false`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func (e shortcutExpander) getShortcutMappings() ([]*metav1.APIResourceList, []re`
`84`	`84`	`res := []resourceShortcuts{}`
`85`	`85`	`// get server resources`
`86`	`86`	`// This can return an error and the results it was able to find. We don't need to fail on the error.`
`87`		`- apiResList, err := e.discoveryClient.ServerResources()`
	`87`	`+ _, apiResList, err := e.discoveryClient.ServerGroupsAndResources()`
`88`	`88`	`if err != nil {`
`89`	`89`	`klog.V(1).Infof("Error loading discovery information: %v", err)`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,6 @@ type LeaderElector struct {`
`188`	`188`	`clock clock.Clock`
`189`	`189`
`190`	`190`	`metrics leaderMetricsAdapter`
`191`		`-`
`192`		`- // name is the name of the resource lock for debugging`
`193`		`- name string`
`194`	`191`	`}`
`195`	`192`
`196`	`193`	`// Run starts the leader election loop. Run will not return`