Merge pull request kubernetes#81947 from RainbowMango/pr_cleanup_staticcheck_for_client_p1

Cleanup client-go static analysis issues-phase 1

Author: k8s-ci-robot

hack/.staticcheck_failures

@@ -213,14 +213,9 @@ 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/testing
 vendor/k8s.io/client-go/tools/cache
-vendor/k8s.io/client-go/tools/clientcmd
 vendor/k8s.io/client-go/tools/leaderelection
-vendor/k8s.io/client-go/tools/portforward
-vendor/k8s.io/client-go/tools/watch
 vendor/k8s.io/client-go/transport
-vendor/k8s.io/client-go/util/jsonpath
 vendor/k8s.io/cloud-provider/service/helpers
 vendor/k8s.io/code-generator/cmd/client-gen/generators/fake
 vendor/k8s.io/code-generator/cmd/client-gen/generators/util

staging/src/k8s.io/client-go/testing/actions.go

@@ -439,8 +439,8 @@ func (a ActionImpl) GetSubresource() string {
 	return a.Subresource
 }
 func (a ActionImpl) Matches(verb, resource string) bool {
-	return strings.ToLower(verb) == strings.ToLower(a.Verb) &&
-		strings.ToLower(resource) == strings.ToLower(a.Resource.Resource)
+	return strings.EqualFold(verb, a.Verb) &&
+		strings.EqualFold(resource, a.Resource.Resource)
 }
 func (a ActionImpl) DeepCopy() Action {
 	ret := a

staging/src/k8s.io/client-go/testing/fixture_test.go

@@ -204,7 +204,8 @@ func TestWatchCallMultipleInvocation(t *testing.T) {
 					event := <-w.ResultChan()
 					accessor, err := meta.Accessor(event.Object)
 					if err != nil {
-						t.Fatalf("unexpected error: %v", err)
+						t.Errorf("unexpected error: %v", err)
+						break
 					}
 					assert.Equal(t, c.op, event.Type, "watch event mismatched")
 					assert.Equal(t, c.name, accessor.GetName(), "watched object mismatch")

staging/src/k8s.io/client-go/tools/clientcmd/client_config_test.go

@@ -458,7 +458,6 @@ func TestCreateCleanDefaultCluster(t *testing.T) {
 }
 
 func TestCreateMissingContextNoDefault(t *testing.T) {
-	const expectedErrorContains = "Context was not found for specified context"
 	config := createValidTestConfig()
 	clientBuilder := NewNonInteractiveClientConfig(*config, "not-present", &ConfigOverrides{}, nil)
 

staging/src/k8s.io/client-go/tools/clientcmd/merged_client_builder_test.go

@@ -24,19 +24,6 @@ import (
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 )
 
-type testLoader struct {
-	ClientConfigLoader
-
-	called bool
-	config *clientcmdapi.Config
-	err    error
-}
-
-func (l *testLoader) Load() (*clientcmdapi.Config, error) {
-	l.called = true
-	return l.config, l.err
-}
-
 type testClientConfig struct {
 	rawconfig          *clientcmdapi.Config
 	config             *restclient.Config

staging/src/k8s.io/client-go/tools/clientcmd/validation.go

@@ -185,9 +185,10 @@ func validateClusterInfo(clusterName string, clusterInfo clientcmdapi.Cluster) [
 	}
 	if len(clusterInfo.CertificateAuthority) != 0 {
 		clientCertCA, err := os.Open(clusterInfo.CertificateAuthority)
-		defer clientCertCA.Close()
 		if err != nil {
 			validationErrors = append(validationErrors, fmt.Errorf("unable to read certificate-authority %v for %v due to %v", clusterInfo.CertificateAuthority, clusterName, err))
+		} else {
+			defer clientCertCA.Close()
 		}
 	}
 
@@ -223,16 +224,18 @@ func validateAuthInfo(authInfoName string, authInfo clientcmdapi.AuthInfo) []err
 
 		if len(authInfo.ClientCertificate) != 0 {
 			clientCertFile, err := os.Open(authInfo.ClientCertificate)
-			defer clientCertFile.Close()
 			if err != nil {
 				validationErrors = append(validationErrors, fmt.Errorf("unable to read client-cert %v for %v due to %v", authInfo.ClientCertificate, authInfoName, err))
+			} else {
+				defer clientCertFile.Close()
 			}
 		}
 		if len(authInfo.ClientKey) != 0 {
 			clientKeyFile, err := os.Open(authInfo.ClientKey)
-			defer clientKeyFile.Close()
 			if err != nil {
 				validationErrors = append(validationErrors, fmt.Errorf("unable to read client-key %v for %v due to %v", authInfo.ClientKey, authInfoName, err))
+			} else {
+				defer clientKeyFile.Close()
 			}
 		}
 	}

staging/src/k8s.io/client-go/tools/portforward/portforward_test.go

@@ -376,6 +376,9 @@ func TestGetPortsReturnsDynamicallyAssignedLocalPort(t *testing.T) {
 	<-pf.Ready
 
 	ports, err := pf.GetPorts()
+	if err != nil {
+		t.Fatalf("Failed to get ports. error: %v", err)
+	}
 
 	if len(ports) != 1 {
 		t.Fatalf("expected 1 port, got %d", len(ports))

staging/src/k8s.io/client-go/tools/watch/until_test.go

@@ -35,7 +35,6 @@ import (
 )
 
 type fakePod struct {
-	name string
 }
 
 func (obj *fakePod) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }

staging/src/k8s.io/client-go/util/jsonpath/parser.go

@@ -37,7 +37,6 @@ type Parser struct {
 	Name  string
 	Root  *ListNode
 	input string
-	cur   *ListNode
 	pos   int
 	start int
 	width int
@@ -186,8 +185,7 @@ func (p *Parser) parseInsideAction(cur *ListNode) error {
 func (p *Parser) parseRightDelim(cur *ListNode) error {
 	p.pos += len(rightDelim)
 	p.consumeText()
-	cur = p.Root
-	return p.parseText(cur)
+	return p.parseText(p.Root)
 }
 
 // parseIdentifier scans build-in keywords, like "range" "end"
@@ -231,7 +229,7 @@ func (p *Parser) parseRecursive(cur *ListNode) error {
 func (p *Parser) parseNumber(cur *ListNode) error {
 	r := p.peek()
 	if r == '+' || r == '-' {
-		r = p.next()
+		p.next()
 	}
 	for {
 		r = p.next()