additional cleanup of code

Author: xphyr

.golangci.yml

@@ -22,7 +22,7 @@ linters:
     # unused detects unused variables, constants, functions, etc.
     - unused
     # gosec is a security checker
-    # - gosec
+    #- gosec
     # revive is a more opinionated, customizable alternative to golint
     - whitespace
     # misspell checks for misspelled words
@@ -32,11 +32,10 @@ linters:
     # bidichk checks for bidirectional Unicode characters
     - bidichk
     # gocritic checks for code quality issues
-    # - gocritic
+    - gocritic
     # govet checks for suspicious constructs and potential bugs
     - govet
-    # modernize checks for modern Go language features
-    # - modernize
+
 
   disable:
     - errcheck

ReleaseNotes.md

@@ -68,3 +68,8 @@ This release introduces potentially **BREAKING CHANGES** If you are converting f
         - Enabled **Container Image Signing** using `cosign` (Keyless signing).
         - Added **SBOM** (Software Bill of Materials) generation for all release artifacts.
       - **Build Hygiene**: Removed mutating hooks (e.g., `go mod tidy`) from the release pipeline to ensure immutable builds.
+
+# v1.5.1
+  - Made change to how we handle nfsClientAccess lists. Previously we would set up a static entry as part of the client-config.yaml file. We are now settings this as a part of the storageclass definition. This allows for better control over the nfsClientAccess list and allows for the use of CIDR notation and wildcard notation.
+    - **NOTE:** This is a "breaking change". You will need to update your storageclass definition file to include the nfsClientAccess list, if you need this feature. If you do not include the nfsClientAccess list, the default value is "node" which reverts to the upstream behavior of only allowing the node to access the share.
+    - Need to look at snapshot functionality it may need to be fixed to support this as well.

pkg/driver/multipath.go

@@ -194,6 +194,7 @@ func lsblk(devicePaths []string, strict bool) ([]Device, error) {
 		if parent.Children == nil {
 			parent.Children = []Device{}
 		}
+		//nolint:gocritic // intentional branch from base slice
 		parent.Children = append(devicesMap[pkName].Children, *device)
 	}
 

pkg/driver/nodeserver.go

@@ -91,7 +91,12 @@ func (t *tools) getExistedVolumeMountPath(targetIqn string, mappingIndex int) st
 func getVolumeMountPath(iscsiDevPaths []string) string {
 	var path string
 
-	if len(iscsiDevPaths) > 1 { // check multipath exist
+	switch len(iscsiDevPaths) {
+	case 0:
+		return ""
+	case 1:
+		path = iscsiDevPaths[0]
+	default: // len > 1, check multipath exist
 		devices, err := lsblk(iscsiDevPaths, true)
 		if err != nil {
 			log.Errorf("Failed to lsblk for iscsi devices: %v", err)
@@ -104,10 +109,6 @@ func getVolumeMountPath(iscsiDevPaths []string) string {
 			return ""
 		}
 		path = filepath.Join("/dev/mapper", multipathDevice.Name)
-	} else if len(iscsiDevPaths) == 1 {
-		path = iscsiDevPaths[0]
-	} else {
-		return ""
 	}
 
 	if err := waitForDevicePathToExist(path); err != nil {
@@ -328,10 +329,6 @@ func (ns *nodeServer) setNFSVolumePrivilege(sourcePath string, hostnames []strin
 		return fmt.Errorf("failed to get DSM[%s]", dsmIp)
 	}
 
-	//priv := webapi.SharePrivilege{
-	//	ShareName: shareName,
-	//}
-
 	// load existing privileges
 	priv, err := dsm.ShareNfsPrivilegeLoad(shareName)
 	if err != nil {

pkg/dsm/service/dsm.go

@@ -598,11 +598,12 @@ func (service *DsmService) CreateVolume(spec *models.CreateK8sVolumeSpec) (*mode
 
 		var k8sVolume *models.K8sVolumeRespSpec
 		var err error
-		if spec.Protocol == utils.ProtocolIscsi {
+		switch spec.Protocol {
+		case utils.ProtocolIscsi:
 			k8sVolume, err = service.createVolumeByDsm(dsm, spec)
-		} else if spec.Protocol == utils.ProtocolSmb {
+		case utils.ProtocolSmb:
 			k8sVolume, err = service.createSMBorNFSVolumeByDsm(dsm, spec)
-		} else if spec.Protocol == utils.ProtocolNfs {
+		case utils.ProtocolNfs:
 			if !isNfsVersionSupport(dsm, spec.NfsVersion) {
 				continue
 			}

pkg/dsm/webapi/dsmwebapi.go

@@ -185,7 +185,7 @@ func (dsm *DSM) Login() error {
 
 	resp, err := dsm.sendRequestWithoutConnectionCheck("", &LoginResp{}, params, "webapi/auth.cgi")
 	if err != nil {
-		r, _ := regexp.Compile("passwd=.*&")
+		r := regexp.MustCompile("passwd=.*&")
 		temp := r.ReplaceAllString(err.Error(), "")
 
 		return fmt.Errorf("%s", temp)

pkg/utils/error.go

@@ -35,7 +35,7 @@ func (BadParametersError) Error() string {
 	return "Invalid input value"
 }
 
-// ISCSI errors
+// ISCSI errors.
 func (NoSuchLunError) Error() string {
 	return "No such LUN"
 }
@@ -64,7 +64,7 @@ func (e IscsiDefaultError) Error() string {
 	return fmt.Sprintf("ISCSI API error. Error code: %d", e.ErrCode)
 }
 
-// Share errors
+// Share errors.
 func (NoSuchShareError) Error() string {
 	return "No such share"
 }

pkg/utils/hostexec/hostexec.go

@@ -11,7 +11,7 @@ import (
 	"k8s.io/utils/exec"
 )
 
-// defaultSearchPath for running commands without absolute paths
+// defaultSearchPath for running commands without absolute paths.
 var defaultSearchPath = []string{
 	"/usr/local/sbin",
 	"/usr/local/bin",
@@ -34,7 +34,7 @@ type hostexec struct {
 	chrootDir  string
 }
 
-// New creates an instance of hostexec to execute commands in the given environment
+// New creates an instance of hostexec to execute commands in the given environment.
 func New(cmdMap map[string]string, chrootDir string) (Executor, error) {
 	// If chroot directory is defined, check that directory exists or return an error
 	if chrootDir != "" {

pkg/utils/hostexec/hostexec_test.go

@@ -304,7 +304,7 @@ func TestHostexec_wrap(t *testing.T) {
 	}
 }
 
-// dummyCmd statisfies the interface for exec.Cmd for testing purposes
+// dummyCmd statisfies the interface for exec.Cmd for testing purposes.
 type dummyCmd struct{}
 
 func (dummyCmd) Run() error                         { return nil }
@@ -321,7 +321,7 @@ func (dummyCmd) Start() error                       { return nil }
 func (dummyCmd) Wait() error                        { return nil }
 func (dummyCmd) Stop()                              {}
 
-// dummyInterface satisfies the interface for exec.Interface for testing purposes
+// dummyInterface satisfies the interface for exec.Interface for testing purposes.
 type dummyInterface struct {
 	commandFunc        func(string, ...string) exec.Cmd
 	commandContextFunc func(context.Context, string, ...string) exec.Cmd

pkg/utils/utils.go

@@ -43,7 +43,7 @@ func BytesToMB(size int64) int64 {
 	return size / UnitMB
 }
 
-// Ceiling
+// Ceiling.
 func BytesToMBCeil(size int64) int64 {
 	return (size + UnitMB - 1) / UnitMB
 }