From b7529970364e70eaf74b19eede80869ff76c4e2c Mon Sep 17 00:00:00 2001
From: haoshuwei <haoshuwei24@gmail.com>
Date: Sat, 14 Sep 2019 09:26:17 +0800
Subject: [PATCH] add or fix some errors return statements and ineffassign

Signed-off-by: haoshuwei <haoshuwei24@gmail.com>
---
 hack/.staticcheck_failures               | 1 -
 pkg/volume/azure_file/azure_file_test.go | 6 ++++++
 pkg/volume/cephfs/cephfs_test.go         | 3 +++
 pkg/volume/cinder/cinder.go              | 2 +-
 pkg/volume/cinder/cinder_test.go         | 6 ++++++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
index 04afef30e6a..5164f52d856 100644
--- a/hack/.staticcheck_failures
+++ b/hack/.staticcheck_failures
@@ -67,7 +67,6 @@ pkg/volume
 pkg/volume/awsebs
 pkg/volume/azure_dd
 pkg/volume/azure_file
-pkg/volume/cephfs
 pkg/volume/cinder
 pkg/volume/csi
 pkg/volume/emptydir
diff --git a/pkg/volume/azure_file/azure_file_test.go b/pkg/volume/azure_file/azure_file_test.go
index 14b95597ab5..1a82905157a 100644
--- a/pkg/volume/azure_file/azure_file_test.go
+++ b/pkg/volume/azure_file/azure_file_test.go
@@ -267,11 +267,17 @@ func TestMounterAndUnmounterTypeAssert(t *testing.T) {
 	fake := &mount.FakeMounter{}
 	pod := &v1.Pod{ObjectMeta: metav1.ObjectMeta{UID: types.UID("poduid")}}
 	mounter, err := plug.(*azureFilePlugin).newMounterInternal(volume.NewSpecFromVolume(spec), pod, &fakeAzureSvc{}, fake)
+	if err != nil {
+		t.Errorf("MounterInternal() failed: %v", err)
+	}
 	if _, ok := mounter.(volume.Unmounter); ok {
 		t.Errorf("Volume Mounter can be type-assert to Unmounter")
 	}
 
 	unmounter, err := plug.(*azureFilePlugin).newUnmounterInternal("vol1", types.UID("poduid"), &mount.FakeMounter{})
+	if err != nil {
+		t.Errorf("MounterInternal() failed: %v", err)
+	}
 	if _, ok := unmounter.(volume.Mounter); ok {
 		t.Errorf("Volume Unmounter can be type-assert to Mounter")
 	}
diff --git a/pkg/volume/cephfs/cephfs_test.go b/pkg/volume/cephfs/cephfs_test.go
index 3f9058442a0..b2ca1a25a71 100644
--- a/pkg/volume/cephfs/cephfs_test.go
+++ b/pkg/volume/cephfs/cephfs_test.go
@@ -128,6 +128,9 @@ func TestConstructVolumeSpec(t *testing.T) {
 	}
 
 	cephfsSpec, err := plug.(*cephfsPlugin).ConstructVolumeSpec("cephfsVolume", "/cephfsVolume/")
+	if err != nil {
+		t.Errorf("ConstructVolumeSpec() failed: %v", err)
+	}
 
 	if cephfsSpec.Name() != "cephfsVolume" {
 		t.Errorf("Get wrong cephfs spec name, got: %s", cephfsSpec.Name())
diff --git a/pkg/volume/cinder/cinder.go b/pkg/volume/cinder/cinder.go
index 040ea619789..b95929a82c2 100644
--- a/pkg/volume/cinder/cinder.go
+++ b/pkg/volume/cinder/cinder.go
@@ -524,7 +524,7 @@ func (c *cinderVolumeUnmounter) TearDownAt(dir string) error {
 	defer c.plugin.volumeLocks.UnlockKey(c.pdName)
 
 	// Reload list of references, there might be SetUpAt finished in the meantime
-	refs, err = c.mounter.GetMountRefs(dir)
+	_, err = c.mounter.GetMountRefs(dir)
 	if err != nil {
 		klog.V(4).Infof("GetMountRefs failed: %v", err)
 		return err
diff --git a/pkg/volume/cinder/cinder_test.go b/pkg/volume/cinder/cinder_test.go
index 244a2cf8153..7926ed4a3b3 100644
--- a/pkg/volume/cinder/cinder_test.go
+++ b/pkg/volume/cinder/cinder_test.go
@@ -202,6 +202,9 @@ func TestPlugin(t *testing.T) {
 		PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
 	}
 	provisioner, err := plug.(*cinderPlugin).newProvisionerInternal(options, &fakePDManager{0})
+	if err != nil {
+		t.Errorf("ProvisionerInternal() failed: %v", err)
+	}
 	persistentSpec, err := provisioner.Provision(nil, nil)
 	if err != nil {
 		t.Errorf("Provision() failed: %v", err)
@@ -254,6 +257,9 @@ func TestPlugin(t *testing.T) {
 		PersistentVolume: persistentSpec,
 	}
 	deleter, err := plug.(*cinderPlugin).newDeleterInternal(volSpec, &fakePDManager{0})
+	if err != nil {
+		t.Errorf("DeleterInternal() failed: %v", err)
+	}
 	err = deleter.Delete()
 	if err != nil {
 		t.Errorf("Deleter() failed: %v", err)