Merge pull request #44 from andyzhangx/fix-golint

cleanup: fix golint errors

Author: k8s-ci-robot

.github/workflows/shellcheck.yaml

@@ -283,7 +283,7 @@ func (c *Connector) Connect() (string, error) {
 	}
 
 	if len(c.Devices) < 1 {
-		iscsiCmd([]string{"-m", "iface", "-I", iFace, "-o", "delete"}...)
+		_, _ = iscsiCmd([]string{"-m", "iface", "-I", iFace, "-o", "delete"}...)
 		return "", fmt.Errorf("failed to find device path: %s, last error seen: %v", devicePaths, lastErr)
 	}
 
@@ -679,11 +679,14 @@ func GetConnectorFromFile(filePath string) (*Connector, error) {
 	if c.MountTargetDevice == nil {
 		return nil, fmt.Errorf("mountTargetDevice in the connector is nil")
 	}
-	if devices, err := GetSCSIDevices([]string{c.MountTargetDevice.GetPath()}, false); err != nil {
+	devices, err := GetSCSIDevices([]string{c.MountTargetDevice.GetPath()}, false)
+	if err != nil {
 		return nil, err
-	} else {
-		c.MountTargetDevice = &devices[0]
 	}
+	if len(devices) == 0 {
+		return nil, fmt.Errorf("mountTargetDevice %s not found", c.MountTargetDevice.GetPath())
+	}
+	c.MountTargetDevice = &devices[0]
 
 	if c.Devices, err = GetSCSIDevices(devicePaths, false); err != nil {
 		return nil, err

iscsi/iscsi.go

@@ -322,9 +322,9 @@ func Test_DisconnectNormalVolume(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if tt.withDeviceFile {
-				os.Create(deleteDeviceFile)
+				_, _ = os.Create(deleteDeviceFile)
 			} else {
-				os.RemoveAll(testRootFS)
+				_ = os.RemoveAll(testRootFS)
 			}
 
 			device := Device{Name: "test"}
@@ -723,7 +723,8 @@ func TestConnectorPersistance(t *testing.T) {
 		return makeFakeExecCommand(0, string(mockedOutput))(cmd, args...)
 	}).Reset()
 
-	c.Persist("/tmp/connector.json")
+	err := c.Persist("/tmp/connector.json")
+	assert.Nil(err)
 	c2, err := GetConnectorFromFile("/tmp/connector.json")
 	assert.Nil(err)
 	assert.NotNil(c2)
@@ -739,7 +740,8 @@ func TestConnectorPersistance(t *testing.T) {
 	assert.NotNil(err)
 	assert.IsType(&os.PathError{}, err)
 
-	ioutil.WriteFile("/tmp/connector.json", []byte("not a connector"), 0o600)
+	err = ioutil.WriteFile("/tmp/connector.json", []byte("not a connector"), 0o600)
+	assert.Nil(err)
 	_, err = GetConnectorFromFile("/tmp/connector.json")
 	assert.NotNil(err)
 	assert.IsType(&json.SyntaxError{}, err)

iscsi/iscsi_test.go

@@ -100,14 +100,14 @@ func Discoverydb(tp, iface string, discoverySecrets Secrets, chapDiscovery bool)
 	_, err = iscsiCmd(append(baseArgs, []string{"--discover"}...)...)
 	if err != nil {
 		// delete the discoverydb record
-		iscsiCmd(append(baseArgs, []string{"-o", "delete"}...)...)
+		_, _ = iscsiCmd(append(baseArgs, []string{"-o", "delete"}...)...)
 		return fmt.Errorf("failed to sendtargets to portal %s, err: %v", tp, err)
 	}
 	return nil
 }
 
 func createCHAPEntries(baseArgs []string, secrets Secrets, discovery bool) error {
-	args := []string{}
+	var args []string
 	debug.Printf("Begin createCHAPEntries (discovery=%t)...", discovery)
 	if discovery {
 		args = append(baseArgs, []string{
@@ -122,9 +122,7 @@ func createCHAPEntries(baseArgs []string, secrets Secrets, discovery bool) error
 		if secrets.PasswordIn != "" {
 			args = append(args, []string{"-n", "discovery.sendtargets.auth.password_in", "-v", secrets.PasswordIn}...)
 		}
-
 	} else {
-
 		args = append(baseArgs, []string{
 			"-o", "update",
 			"-n", "node.session.auth.authmethod", "-v", "CHAP",
@@ -160,7 +158,7 @@ func Login(tgtIQN, portal string) error {
 	baseArgs := []string{"-m", "node", "-T", tgtIQN, "-p", portal}
 	if _, err := iscsiCmd(append(baseArgs, []string{"-l"}...)...); err != nil {
 		// delete the node record from database
-		iscsiCmd(append(baseArgs, []string{"-o", "delete"}...)...)
+		_, _ = iscsiCmd(append(baseArgs, []string{"-o", "delete"}...)...)
 		return fmt.Errorf("failed to sendtargets to portal %s, err: %v", portal, err)
 	}
 	return nil
@@ -170,21 +168,21 @@ func Login(tgtIQN, portal string) error {
 func Logout(tgtIQN, portal string) error {
 	debug.Println("Begin Logout...")
 	args := []string{"-m", "node", "-T", tgtIQN, "-p", portal, "-u"}
-	iscsiCmd(args...)
-	return nil
+	_, err := iscsiCmd(args...)
+	return err
 }
 
 // DeleteDBEntry deletes the iscsi db entry for the specified target
 func DeleteDBEntry(tgtIQN string) error {
 	debug.Println("Begin DeleteDBEntry...")
 	args := []string{"-m", "node", "-T", tgtIQN, "-o", "delete"}
-	iscsiCmd(args...)
-	return nil
+	_, err := iscsiCmd(args...)
+	return err
 }
 
 // DeleteIFace delete the iface
 func DeleteIFace(iface string) error {
 	debug.Println("Begin DeleteIFace...")
-	iscsiCmd([]string{"-m", "iface", "-I", iface, "-o", "delete"}...)
-	return nil
+	_, err := iscsiCmd([]string{"-m", "iface", "-I", iface, "-o", "delete"}...)
+	return err
 }

iscsi/iscsiadm.go

@@ -10,14 +10,6 @@ import (
 	"time"
 )
 
-type pathGroup struct {
-	Paths []path `json:"paths"`
-}
-
-type path struct {
-	Device string `json:"dev"`
-}
-
 // ExecWithTimeout execute a command with a timeout and returns an error if timeout is exceeded
 func ExecWithTimeout(command string, args []string, timeout time.Duration) ([]byte, error) {
 	debug.Printf("Executing command '%v' with args: '%v'.\n", command, args)