Fixing several (but not all) go vet errors. Most are around string formatting, or unreachable code.

Author: goltermann

cluster/addons/dns/kube2sky/kube2sky.go

@@ -377,7 +377,7 @@ func (ks *kube2sky) mutateEtcdOrDie(mutator func() error) {
 	for {
 		select {
 		case <-timeout:
-			glog.Fatalf("Failed to mutate etcd for %v using mutator: %v", ks.etcdMutationTimeout, mutator)
+			glog.Fatalf("Failed to mutate etcd for %v using mutator: %v", ks.etcdMutationTimeout, mutator())
 		default:
 			if err := mutator(); err != nil {
 				delay := 50 * time.Millisecond

cmd/kube-apiserver/app/server_test.go

@@ -211,13 +211,13 @@ func TestParseRuntimeConfig(t *testing.T) {
 		apiGroupVersionOverrides, err := parseRuntimeConfig(s)
 
 		if err == nil && test.err {
-			t.Fatalf("expected error for test: %q", test)
+			t.Fatalf("expected error for test: %v", test)
 		} else if err != nil && !test.err {
-			t.Fatalf("unexpected error: %s, for test: %q", err, test)
+			t.Fatalf("unexpected error: %s, for test: %v", err, test)
 		}
 
 		if err == nil && !reflect.DeepEqual(apiGroupVersionOverrides, test.apiGroupVersionOverrides) {
-			t.Fatalf("unexpected apiGroupVersionOverrides. Actual: %q, expected: %q", apiGroupVersionOverrides, test.apiGroupVersionOverrides)
+			t.Fatalf("unexpected apiGroupVersionOverrides. Actual: %v, expected: %v", apiGroupVersionOverrides, test.apiGroupVersionOverrides)
 		}
 	}
 

cmd/kube-proxy/app/server.go

@@ -337,11 +337,11 @@ func getProxyMode(proxyMode string, client nodeGetter, hostname string, iptver i
 	}
 	node, err := client.Get(hostname)
 	if err != nil {
-		glog.Errorf("Can't get Node %q, assuming iptables proxy: %v", hostname, err)
+		glog.Errorf("Can't get Node %q, assuming iptables proxy, err: %v", hostname, err)
 		return tryIptablesProxy(iptver, kcompat)
 	}
 	if node == nil {
-		glog.Errorf("Got nil Node %q, assuming iptables proxy: %v", hostname)
+		glog.Errorf("Got nil Node %q, assuming iptables proxy", hostname)
 		return tryIptablesProxy(iptver, kcompat)
 	}
 	proxyMode, found := node.Annotations[betaProxyModeAnnotation]

pkg/api/rest/resttest/resttest.go

@@ -574,7 +574,7 @@ func (t *Tester) testDeleteGracefulHasDefault(obj runtime.Object, setFn SetFunc,
 		t.Errorf("unexpected error: %v", err)
 	}
 	if _, err := getFn(ctx, foo); err != nil {
-		t.Fatalf("did not gracefully delete resource", err)
+		t.Fatalf("did not gracefully delete resource: %v", err)
 	}
 
 	object, err := t.storage.(rest.Getter).Get(ctx, objectMeta.Name)
@@ -601,7 +601,7 @@ func (t *Tester) testDeleteGracefulWithValue(obj runtime.Object, setFn SetFunc,
 		t.Errorf("unexpected error: %v", err)
 	}
 	if _, err := getFn(ctx, foo); err != nil {
-		t.Fatalf("did not gracefully delete resource", err)
+		t.Fatalf("did not gracefully delete resource: %v", err)
 	}
 
 	object, err := t.storage.(rest.Getter).Get(ctx, objectMeta.Name)
@@ -628,7 +628,7 @@ func (t *Tester) testDeleteGracefulExtend(obj runtime.Object, setFn SetFunc, get
 		t.Errorf("unexpected error: %v", err)
 	}
 	if _, err := getFn(ctx, foo); err != nil {
-		t.Fatalf("did not gracefully delete resource", err)
+		t.Fatalf("did not gracefully delete resource: %v", err)
 	}
 
 	// second delete duration is ignored
@@ -660,7 +660,7 @@ func (t *Tester) testDeleteGracefulImmediate(obj runtime.Object, setFn SetFunc,
 		t.Errorf("unexpected error: %v", err)
 	}
 	if _, err := getFn(ctx, foo); err != nil {
-		t.Fatalf("did not gracefully delete resource", err)
+		t.Fatalf("did not gracefully delete resource: %v", err)
 	}
 
 	// second delete is immediate, resource is deleted

pkg/apiserver/proxy_test.go

@@ -212,7 +212,7 @@ func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
 		// Dial the proxy server
 		conn, err := net.Dial(server.Listener.Addr().Network(), server.Listener.Addr().String())
 		if err != nil {
-			t.Errorf("%s: unexpected error %v", err)
+			t.Errorf("%s: unexpected error %v", k, err)
 			continue
 		}
 		defer conn.Close()
@@ -228,28 +228,28 @@ func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
 		// Write the request headers
 		post := fmt.Sprintf("POST /%s/%s/%s/proxy/namespaces/default/foo/id/some/dir HTTP/1.1\r\n", prefix, newGroupVersion.Group, newGroupVersion.Version)
 		if _, err := fmt.Fprint(conn, post); err != nil {
-			t.Fatalf("%s: unexpected error %v", err)
+			t.Fatalf("%s: unexpected error %v", k, err)
 		}
 		for header, values := range item.reqHeaders {
 			for _, value := range values {
 				if _, err := fmt.Fprintf(conn, "%s: %s\r\n", header, value); err != nil {
-					t.Fatalf("%s: unexpected error %v", err)
+					t.Fatalf("%s: unexpected error %v", k, err)
 				}
 			}
 		}
 		// Header separator
 		if _, err := fmt.Fprint(conn, "\r\n"); err != nil {
-			t.Fatalf("%s: unexpected error %v", err)
+			t.Fatalf("%s: unexpected error %v", k, err)
 		}
 		// Body
 		if _, err := conn.Write(item.reqBody); err != nil {
-			t.Fatalf("%s: unexpected error %v", err)
+			t.Fatalf("%s: unexpected error %v", k, err)
 		}
 
 		// Read response
 		response, err := ioutil.ReadAll(conn)
 		if err != nil {
-			t.Errorf("%s: unexpected error %v", err)
+			t.Errorf("%s: unexpected error %v", k, err)
 			continue
 		}
 		if !strings.HasSuffix(string(response), successfulResponse) {

pkg/client/testing/core/fixture.go

@@ -97,8 +97,6 @@ func ObjectReaction(o ObjectRetriever, mapper meta.RESTMapper) ReactionFunc {
 		default:
 			return false, nil, fmt.Errorf("no reaction implemented for %s", action)
 		}
-
-		return true, nil, nil
 	}
 }
 

pkg/cloudprovider/providers/aws/aws.go

@@ -1486,7 +1486,7 @@ func (s *AWSCloud) describeLoadBalancer(name string) (*elb.LoadBalancerDescripti
 func (self *AWSCloud) findVPCID() (string, error) {
 	macs, err := self.metadata.GetMetadata("network/interfaces/macs/")
 	if err != nil {
-		return "", fmt.Errorf("Could not list interfaces of the instance", err)
+		return "", fmt.Errorf("Could not list interfaces of the instance: %v", err)
 	}
 
 	// loop over interfaces, first vpc id returned wins

pkg/cloudprovider/providers/aws/aws_routes.go

@@ -149,7 +149,7 @@ func (s *AWSCloud) CreateRoute(clusterName string, nameHint string, route *cloud
 
 		_, err = s.ec2.DeleteRoute(request)
 		if err != nil {
-			return fmt.Errorf("error deleting blackholed AWS route (%s): %v", deleteRoute.DestinationCidrBlock, err)
+			return fmt.Errorf("error deleting blackholed AWS route (%s): %v", aws.StringValue(deleteRoute.DestinationCidrBlock), err)
 		}
 	}
 

pkg/cloudprovider/providers/aws/aws_test.go

@@ -723,7 +723,7 @@ func TestFindVPCID(t *testing.T) {
 	}
 	vpcID, err := c.findVPCID()
 	if err != nil {
-		t.Errorf("Unexpected error:", err)
+		t.Errorf("Unexpected error: %v", err)
 	}
 	if vpcID != "vpc-mac0" {
 		t.Errorf("Unexpected vpcID: %s", vpcID)

pkg/controller/job/controller_test.go

@@ -234,7 +234,7 @@ func TestControllerSyncJob(t *testing.T) {
 		// run
 		err := manager.syncJob(getKey(job, t))
 		if err != nil {
-			t.Errorf("%s: unexpected error when syncing jobs %v", err)
+			t.Errorf("%s: unexpected error when syncing jobs %v", name, err)
 		}
 
 		// validate created/deleted pods
@@ -332,7 +332,7 @@ func TestSyncJobPastDeadline(t *testing.T) {
 		// run
 		err := manager.syncJob(getKey(job, t))
 		if err != nil {
-			t.Errorf("%s: unexpected error when syncing jobs %v", err)
+			t.Errorf("%s: unexpected error when syncing jobs %v", name, err)
 		}
 
 		// validate created/deleted pods