fix golangci-lint errors (#733)

Signed-off-by: Bala.FA <[email protected]>

Author: balamurugana

.github/workflows/linters.yml

@@ -27,6 +27,6 @@ jobs:
           SHELLCHECK_OPTS: -e SC1091 -e SC2016
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.51.2
+          version: v1.52.1
           args: --config ./.golangci.yml --timeout=60m
           skip-go-installation: true

.golangci.yml

@@ -30,4 +30,4 @@ issues:
       - exitAfterDefer
 
 service:
-  golangci-lint-version: 1.51.2 # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.52.1 # use the fixed version to not introduce new linters unexpectedly

cmd/directpv/node-controller.go

@@ -40,11 +40,11 @@ var nodeControllerCmd = &cobra.Command{
 		if err := node.Sync(c.Context(), nodeID); err != nil {
 			return err
 		}
-		return startNodeController(c.Context(), args)
+		return startNodeController(c.Context())
 	},
 }
 
-func startNodeController(ctx context.Context, args []string) error {
+func startNodeController(ctx context.Context) error {
 	var cancel context.CancelFunc
 	ctx, cancel = context.WithCancel(ctx)
 	defer cancel()

cmd/kubectl-directpv/install.go

@@ -232,9 +232,9 @@ func getLegacyFlag(ctx context.Context) bool {
 		if result.Err != nil {
 			utils.Eprintf(quietFlag, true, "unable to get volumes; %v", result.Err)
 			break
-		} else {
-			return true
 		}
+
+		return true
 	}
 
 	legacyclient.Init()
@@ -243,9 +243,9 @@ func getLegacyFlag(ctx context.Context) bool {
 		if result.Err != nil {
 			utils.Eprintf(quietFlag, true, "unable to get legacy volumes; %v", result.Err)
 			break
-		} else {
-			return true
 		}
+
+		return true
 	}
 
 	return false

cmd/kubectl-directpv/label.go

@@ -74,10 +74,8 @@ func validateLabelCmd() error {
 	if err := validateNodeArgs(); err != nil {
 		return err
 	}
-	if err := validateDriveNameArgs(); err != nil {
-		return err
-	}
-	return nil
+
+	return validateDriveNameArgs()
 }
 
 func parseLabel(kv string) (labelKey types.LabelKey, labelValue types.LabelValue, err error) {

cmd/kubectl-directpv/list_drives.go

@@ -72,7 +72,7 @@ var listDrivesCmd = &cobra.Command{
 			os.Exit(-1)
 		}
 
-		listDrivesMain(c.Context(), args)
+		listDrivesMain(c.Context())
 	},
 }
 
@@ -121,7 +121,7 @@ func validateListDrivesArgs() error {
 	return nil
 }
 
-func listDrivesMain(ctx context.Context, args []string) {
+func listDrivesMain(ctx context.Context) {
 	drives, err := drive.NewLister().
 		NodeSelector(toLabelValues(nodesArgs)).
 		DriveNameSelector(toLabelValues(drivesArgs)).

cmd/kubectl-directpv/list_volumes.go

@@ -80,7 +80,7 @@ var listVolumesCmd = &cobra.Command{
 			os.Exit(-1)
 		}
 
-		listVolumesMain(c.Context(), args)
+		listVolumesMain(c.Context())
 	},
 }
 
@@ -159,7 +159,7 @@ func getPVCName(ctx context.Context, volume types.Volume) string {
 	return "-"
 }
 
-func listVolumesMain(ctx context.Context, args []string) {
+func listVolumesMain(ctx context.Context) {
 	volumes, err := volume.NewLister().
 		NodeSelector(toLabelValues(nodesArgs)).
 		DriveNameSelector(toLabelValues(drivesArgs)).

pkg/consts/consts.go

@@ -88,11 +88,6 @@ const (
 	// MountRootDir is mount root directory.
 	MountRootDir = AppRootDir + "/mnt"
 
-	CredentialsSecretName = AppName + "-creds"
-
-	PrivateKeyFileName = "key.pem"
-	PublicCertFileName = "cert.pem"
-
 	NodeServerName       = "node-server"
 	ControllerServerName = "controller"
 	NodeControllerName   = "node-controller"

pkg/consts/consts.go.in

@@ -86,11 +86,6 @@ const (
 	// MountRootDir is mount root directory.
 	MountRootDir = AppRootDir + "/mnt"
 
-	CredentialsSecretName = AppName + "-creds"
-
-	PrivateKeyFileName = "key.pem"
-	PublicCertFileName = "cert.pem"
-
 	NodeServerName       = "node-server"
 	ControllerServerName = "controller"
 	NodeControllerName   = "node-controller"

pkg/controller/controller.go

@@ -74,7 +74,7 @@ type Controller struct {
 }
 
 // New creates a new controller for the provided handler
-func New(ctx context.Context, name string, handler EventHandler, workers int, resyncPeriod time.Duration) *Controller {
+func New(name string, handler EventHandler, workers int, resyncPeriod time.Duration) *Controller {
 	informer := cache.NewSharedIndexInformer(
 		handler.ListerWatcher(),
 		handler.ObjectType(),
@@ -153,9 +153,11 @@ func (c *Controller) HasSynced() bool {
 }
 
 func (c *Controller) runWorker(ctx context.Context) {
+	//revive:disable:empty-block
 	for c.processNextItem(ctx) {
 		// continue looping
 	}
+	//revive:enable:empty-block
 }
 
 func (c *Controller) processNextItem(ctx context.Context) bool {