From 7cab7bd472204d63fd709a80014a7038469a204e Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 9 Feb 2016 13:20:31 -0800 Subject: [PATCH] fix a few go-vet errors --- .../persistentvolume_provisioner_controller.go | 6 +++--- pkg/probe/tcp/tcp_test.go | 2 +- pkg/util/iptables/iptables_test.go | 4 ++-- pkg/util/net/port_range.go | 2 +- pkg/util/validation/field/errors.go | 3 +-- pkg/volume/azure_file/azure_file_test.go | 2 +- pkg/volume/cephfs/cephfs_test.go | 4 ++-- pkg/volume/cinder/cinder_test.go | 10 +++++----- pkg/volume/fc/fc_test.go | 4 ++-- test/e2e/e2e.go | 4 ++-- 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go b/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go index 951a8442a22..ed50edf512e 100644 --- a/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go @@ -202,7 +202,7 @@ func (controller *PersistentVolumeProvisionerController) reconcileClaim(claim *a claim.Annotations[pvProvisioningRequiredAnnotationKey] = pvProvisioningCompletedAnnotationValue _, err = controller.client.UpdatePersistentVolumeClaim(claim) if err != nil { - glog.Error("error updating persistent volume claim: %v", err) + glog.Errorf("error updating persistent volume claim: %v", err) } return nil @@ -246,7 +246,7 @@ func (controller *PersistentVolumeProvisionerController) reconcileVolume(pv *api glog.V(5).Infof("PersistentVolume[%s] provisioning in progress", pv.Name) err := provisionVolume(pv, controller) if err != nil { - return fmt.Errorf("Error provisioning PersistentVolume[%s]: %v", err) + return fmt.Errorf("Error provisioning PersistentVolume[%s]: %v", pv.Name, err) } return nil @@ -283,7 +283,7 @@ func provisionVolume(pv *api.PersistentVolume, controller *PersistentVolumeProvi if pv, apiErr := controller.client.UpdatePersistentVolumeStatus(pv); apiErr != nil { return fmt.Errorf("PersistentVolume[%s] failed provisioning and also failed status update: %v - %v", pv.Name, err, apiErr) } - return fmt.Errorf("PersistentVolume[%s] failed provisioning : %v", pv.Name, err, err) + return fmt.Errorf("PersistentVolume[%s] failed provisioning: %v", pv.Name, err) } clone, err := conversion.NewCloner().DeepCopy(pv) diff --git a/pkg/probe/tcp/tcp_test.go b/pkg/probe/tcp/tcp_test.go index 1268585be14..298de5acf7f 100644 --- a/pkg/probe/tcp/tcp_test.go +++ b/pkg/probe/tcp/tcp_test.go @@ -79,7 +79,7 @@ func TestTcpHealthChecker(t *testing.T) { t.Errorf("#%d: expected error=%v, get=%v", i, tt.expectedError, err) } if !containsAny(output, tt.expectedOutputs) { - t.Errorf("#%d: expected output=one of %#v, get=%s", tt.expectedOutputs, output) + t.Errorf("#%d: expected output=one of %#v, get=%s", i, tt.expectedOutputs, output) } } } diff --git a/pkg/util/iptables/iptables_test.go b/pkg/util/iptables/iptables_test.go index 6c18372cec0..d5bb346910a 100644 --- a/pkg/util/iptables/iptables_test.go +++ b/pkg/util/iptables/iptables_test.go @@ -673,7 +673,7 @@ func TestReload(t *testing.T) { // EnsureChain func() ([]byte, error) { return []byte{}, nil }, // EnsureRule abc check - func() ([]byte, error) { return []byte{}, &exec.FakeExitError{1} }, + func() ([]byte, error) { return []byte{}, &exec.FakeExitError{Status: 1} }, // EnsureRule abc func() ([]byte, error) { return []byte{}, nil }, @@ -681,7 +681,7 @@ func TestReload(t *testing.T) { // EnsureChain func() ([]byte, error) { return []byte{}, nil }, // EnsureRule abc check - func() ([]byte, error) { return []byte{}, &exec.FakeExitError{1} }, + func() ([]byte, error) { return []byte{}, &exec.FakeExitError{Status: 1} }, // EnsureRule abc func() ([]byte, error) { return []byte{}, nil }, }, diff --git a/pkg/util/net/port_range.go b/pkg/util/net/port_range.go index c9ade51a0ef..527552571e0 100644 --- a/pkg/util/net/port_range.go +++ b/pkg/util/net/port_range.go @@ -102,7 +102,7 @@ func ParsePortRange(value string) (*PortRange, error) { func ParsePortRangeOrDie(value string) *PortRange { pr, err := ParsePortRange(value) if err != nil { - panic(fmt.Sprintf("couldn't parse port range: %v")) + panic(fmt.Sprintf("couldn't parse port range %q: %v", value, err)) } return pr } diff --git a/pkg/util/validation/field/errors.go b/pkg/util/validation/field/errors.go index 0a8ed1e8565..203f7cc8f5c 100644 --- a/pkg/util/validation/field/errors.go +++ b/pkg/util/validation/field/errors.go @@ -120,8 +120,7 @@ func (t ErrorType) String() string { case ErrorTypeInternal: return "Internal error" default: - panic(fmt.Sprintf("unrecognized validation error: %q", t)) - return "" + panic(fmt.Sprintf("unrecognized validation error: %q", string(t))) } } diff --git a/pkg/volume/azure_file/azure_file_test.go b/pkg/volume/azure_file/azure_file_test.go index bbe5f1c3e7c..4d3a30273a7 100644 --- a/pkg/volume/azure_file/azure_file_test.go +++ b/pkg/volume/azure_file/azure_file_test.go @@ -83,7 +83,7 @@ func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeA func TestPlugin(t *testing.T) { tmpDir, err := ioutil.TempDir(os.TempDir(), "azurefileTest") if err != nil { - t.Fatalf("can't make a temp dir: %v") + t.Fatalf("can't make a temp dir: %v", err) } defer os.RemoveAll(tmpDir) plugMgr := volume.VolumePluginMgr{} diff --git a/pkg/volume/cephfs/cephfs_test.go b/pkg/volume/cephfs/cephfs_test.go index 8fc8d16d2a4..d2bc201c235 100644 --- a/pkg/volume/cephfs/cephfs_test.go +++ b/pkg/volume/cephfs/cephfs_test.go @@ -81,7 +81,7 @@ func TestPlugin(t *testing.T) { t.Errorf("Failed to make a new Builder: %v", err) } if builder == nil { - t.Errorf("Got a nil Builder: %v") + t.Errorf("Got a nil Builder") } volpath := path.Join(tmpDir, "pods/poduid/volumes/kubernetes.io~cephfs/vol1") path := builder.GetPath() @@ -103,7 +103,7 @@ func TestPlugin(t *testing.T) { t.Errorf("Failed to make a new Cleaner: %v", err) } if cleaner == nil { - t.Errorf("Got a nil Cleaner: %v") + t.Errorf("Got a nil Cleaner") } if err := cleaner.TearDown(); err != nil { t.Errorf("Expected success, got: %v", err) diff --git a/pkg/volume/cinder/cinder_test.go b/pkg/volume/cinder/cinder_test.go index d138ae920dc..a3727ec42de 100644 --- a/pkg/volume/cinder/cinder_test.go +++ b/pkg/volume/cinder/cinder_test.go @@ -158,7 +158,7 @@ func TestPlugin(t *testing.T) { t.Errorf("Failed to make a new Builder: %v", err) } if builder == nil { - t.Errorf("Got a nil Builder: %v") + t.Errorf("Got a nil Builder") } volPath := path.Join(tmpDir, "pods/poduid/volumes/kubernetes.io~cinder/vol1") path := builder.GetPath() @@ -189,7 +189,7 @@ func TestPlugin(t *testing.T) { t.Errorf("Failed to make a new Cleaner: %v", err) } if cleaner == nil { - t.Errorf("Got a nil Cleaner: %v") + t.Errorf("Got a nil Cleaner") } if err := cleaner.TearDown(); err != nil { @@ -274,7 +274,7 @@ func TestAttachDetachRace(t *testing.T) { t.Errorf("Failed to make a new Builder: %v", err) } if builder == nil { - t.Errorf("Got a nil Builder: %v") + t.Errorf("Got a nil Builder") } if err := builder.SetUp(nil); err != nil { @@ -288,7 +288,7 @@ func TestAttachDetachRace(t *testing.T) { t.Errorf("Failed to make a new Builder: %v", err) } if builder == nil { - t.Errorf("Got a nil Builder: %v") + t.Errorf("Got a nil Builder") } cleaner, err := plug.(*cinderPlugin).newCleanerInternal("vol1", types.UID("poduid"), &fakePDManager{time.Second}, fakeMounter) @@ -337,7 +337,7 @@ func TestAttachDetachRace(t *testing.T) { t.Errorf("Failed to make a new Cleaner: %v", err) } if cleaner == nil { - t.Errorf("Got a nil Cleaner: %v") + t.Errorf("Got a nil Cleaner") } if err := cleaner.TearDown(); err != nil { diff --git a/pkg/volume/fc/fc_test.go b/pkg/volume/fc/fc_test.go index 606d89a7b9d..f7598989c00 100644 --- a/pkg/volume/fc/fc_test.go +++ b/pkg/volume/fc/fc_test.go @@ -144,7 +144,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) { t.Errorf("Failed to make a new Builder: %v", err) } if builder == nil { - t.Errorf("Got a nil Builder: %v") + t.Errorf("Got a nil Builder: %v", err) } path := builder.GetPath() @@ -181,7 +181,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) { t.Errorf("Failed to make a new Cleaner: %v", err) } if cleaner == nil { - t.Errorf("Got a nil Cleaner: %v") + t.Errorf("Got a nil Cleaner: %v", err) } if err := cleaner.TearDown(); err != nil { diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index 2a9c8c28b11..58a010eea52 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -119,7 +119,7 @@ func setupProviderConfig() error { managedZones := []string{zone} // Only single-zone for now cloudConfig.Provider, err = gcecloud.CreateGCECloud(testContext.CloudConfig.ProjectID, region, zone, managedZones, "" /* networkUrl */, tokenSource, false /* useMetadataServer */) if err != nil { - return fmt.Errorf("Error building GCE/GKE provider: ", err) + return fmt.Errorf("Error building GCE/GKE provider: %v", err) } case "aws": @@ -137,7 +137,7 @@ func setupProviderConfig() error { var err error cloudConfig.Provider, err = cloudprovider.GetCloudProvider(testContext.Provider, strings.NewReader(awsConfig)) if err != nil { - return fmt.Errorf("Error building AWS provider: ", err) + return fmt.Errorf("Error building AWS provider: %v", err) } }