lint: enable gocritic and govet linters

Author: moshe010

.golangci.yml

@@ -1,12 +1,4 @@
 linters-settings:
-  depguard:
-    list-type: blacklist
-    packages:
-      # logging is allowed only by logutils.Log, logrus
-      # is allowed to use only in logutils package
-      - github.com/sirupsen/logrus
-    packages-with-error-message:
-      - github.com/sirupsen/logrus: "logging is allowed only by logutils.Log"
   dupl:
     threshold: 100
   funlen:
@@ -28,6 +20,7 @@ linters-settings:
       - octalLiteral
       - whyNoLint
       - wrapperFunc
+      - unnamedResult
   gocyclo:
     min-complexity: 15
   goimports:
@@ -64,34 +57,34 @@ linters:
     - deadcode
     - depguard
     - dogsled
-    #- dupl
+    #- dupl - todo: check if use it
     - errcheck
-    #- funlen
+    #- funlen - need to fix errors
     - gochecknoinits
-    #- goconst
-    #- gocritic
-    #- gocyclo
+    #- goconst - need to fix errors
+    - gocritic
+    #- gocyclo - need to fix errors
     - gofmt
     - goimports
-    #- golint
-    #- gomnd
+    #- golint - need to fix errors
+    #- gomnd - need to fix errors
     - goprintffuncname
-    #- gosec
+    #- gosec - need to fix it errors
     - gosimple
-    #- govet
+    - govet
     - ineffassign
     - interfacer
-    #- lll
+    #- lll - need to fix errors
     - misspell
     - nakedret
     - rowserrcheck
     - scopelint
     - staticcheck
     - structcheck
-    #- stylecheck
+    #- stylecheck - need to fix errors
     - typecheck
     - unconvert
-    #- unparam
+    #- unparam - todo: need to check if use ittodo
     - unused
     - varcheck
     - whitespace
@@ -109,17 +102,3 @@ issues:
     - path: _test\.go
       linters:
         - gomnd
-
-run:
-  skip-dirs:
-    - test/testdata_etc
-    - internal/cache
-    - internal/renameio
-    - internal/robustio
-
-# golangci.com configuration
-# https://github.com/golangci/golangci/wiki/Configuration
-service:
-  golangci-lint-version: 1.23.x # use the fixed version to not introduce new linters unexpectedly
-  prepare:
-    - echo "here I can run custom commands, but no preparation needed for this repo"

pkg/daemon/daemon.go

@@ -74,7 +74,7 @@ func NewDaemon() (Daemon, error) {
 		return nil, err
 	}
 
-	if err = smClient.Validate(); err != nil {
+	if err := smClient.Validate(); err != nil {
 		return nil, err
 	}
 
@@ -297,30 +297,30 @@ func (d *daemon) DeletePeriodicUpdate() {
 		var guidList []net.HardwareAddr
 		for _, pod := range pods {
 			glog.Infof("DeletePeriodicUpdate(): pod namespace %s name %s", pod.Namespace, pod.Name)
-			ibAnnotation, err := utils.ParseInfiniBandAnnotation(pod)
-			if err == nil {
+			ibAnnotation, netErr := utils.ParseInfiniBandAnnotation(pod)
+			if netErr == nil {
 				if !utils.IsPodNetworkConfiguredWithInfiniBand(ibAnnotation, networkName) {
 					continue
 				}
 			}
-			networks, err := netAttUtils.ParsePodNetworkAnnotation(pod)
+			networks, netErr := netAttUtils.ParsePodNetworkAnnotation(pod)
 			if err != nil {
 				glog.Errorf("DeletePeriodicUpdate(): failed to read pod networkName annotations pod namespace %s name %s, with error: %v",
-					pod.Namespace, pod.Name, err)
+					pod.Namespace, pod.Name, netErr)
 				continue
 			}
 
-			network, err := utils.GetPodNetwork(networks, networkName)
-			if err != nil {
+			network, netErr := utils.GetPodNetwork(networks, networkName)
+			if netErr != nil {
 				glog.Errorf("DeletePeriodicUpdate(): failed to get pod networkName spec %s with error: %v",
-					networkName, err)
+					networkName, netErr)
 				// skip failed pod
 				continue
 			}
 
-			allocatedGuid, err := utils.GetPodNetworkGuid(network)
+			allocatedGuid, netErr := utils.GetPodNetworkGuid(network)
 			if err != nil {
-				glog.Errorf("DeletePeriodicUpdate(): %v", err)
+				glog.Errorf("DeletePeriodicUpdate(): %v", netErr)
 				continue
 			}
 
@@ -329,15 +329,15 @@ func (d *daemon) DeletePeriodicUpdate() {
 		}
 
 		if ibCniSpec.PKey != "" && len(guidList) != 0 {
-			pKey, err := utils.ParsePKey(ibCniSpec.PKey)
+			pKey, pkeyErr := utils.ParsePKey(ibCniSpec.PKey)
 			if err != nil {
-				glog.Errorf("DeletePeriodicUpdate(): failed to parse PKey %s with error: %v", ibCniSpec.PKey, err)
+				glog.Errorf("DeletePeriodicUpdate(): failed to parse PKey %s with error: %v", ibCniSpec.PKey, pkeyErr)
 				continue
 			}
 
-			if err = d.smClient.RemoveGuidsFromPKey(pKey, guidList); err != nil {
+			if pkeyErr = d.smClient.RemoveGuidsFromPKey(pKey, guidList); err != nil {
 				glog.Errorf("DeletePeriodicUpdate(): failed to config pKey with subnet manager %s with error: %v",
-					d.smClient.Name(), err)
+					d.smClient.Name(), pkeyErr)
 				continue
 			}
 		}

pkg/guid/guid_pool.go

@@ -85,9 +85,9 @@ func (p *guidPool) InitPool() error {
 		return err
 	}
 
-	for _, pod := range pods.Items {
-		glog.V(3).Infof("InitPool(): checking pod for network annotations %v", pod)
-		pod := pod // pin!
+	for index := range pods.Items {
+		glog.V(3).Infof("InitPool(): checking pod for network annotations %v", pods.Items[index])
+		pod := pods.Items[index]
 		networks, err := netAttUtils.ParsePodNetworkAnnotation(&pod)
 		if err != nil {
 			continue
@@ -119,7 +119,7 @@ func (p *guidPool) InitPool() error {
 	return nil
 }
 
-/// GenerateGUID generates a guid from the range
+// GenerateGUID generates a guid from the range
 func (p *guidPool) GenerateGUID(podNetworkId string) (string, error) {
 	glog.Infof("GenerateGUID(): podNetworkId %s", podNetworkId)
 
@@ -172,7 +172,7 @@ func (p *guidPool) ReleaseGUID(guid string) error {
 	return nil
 }
 
-/// AllocateGUID allocate guid for the pod
+// AllocateGUID allocate guid for the pod
 func (p *guidPool) AllocateGUID(podNetworkId, guid string) error {
 	glog.Infof("AllocateGUID(): podNetworkId, %s guid %s", podNetworkId, guid)
 
@@ -184,9 +184,8 @@ func (p *guidPool) AllocateGUID(podNetworkId, guid string) error {
 		if podNetworkId != p.guidPodNetworkMap[guid] {
 			return fmt.Errorf("failed to allocate requested guid %s, already allocated for %s",
 				guid, p.guidPodNetworkMap[guid])
-		} else {
-			return nil
 		}
+		return nil
 	}
 
 	p.guidPoolMap[guid] = true
@@ -196,7 +195,7 @@ func (p *guidPool) AllocateGUID(podNetworkId, guid string) error {
 
 func (p *guidPool) getNextGUID(currentGUID net.HardwareAddr) net.HardwareAddr {
 	for idx := 7; idx >= 0; idx-- {
-		currentGUID[idx] += 1
+		currentGUID[idx]++
 		if currentGUID[idx] != 0 {
 			break
 		}
@@ -206,7 +205,7 @@ func (p *guidPool) getNextGUID(currentGUID net.HardwareAddr) net.HardwareAddr {
 }
 
 func isAllowedGUID(guid string) bool {
-	return guid != "00:00:00:00:00:00:00:00" && strings.ToLower(guid) != "ff:ff:ff:ff:ff:ff:ff:ff"
+	return guid != "00:00:00:00:00:00:00:00" && !strings.EqualFold(guid, "ff:ff:ff:ff:ff:ff:ff:ff")
 }
 
 func checkGuidRange(startGUID, endGUID net.HardwareAddr) error {

pkg/sm/plugins/ufm/ufm.go

@@ -54,7 +54,7 @@ func newUfmPlugin(conf []byte) (*ufmPlugin, error) {
 		}
 	}
 
-	isSecure := strings.ToLower(ufmConf.HttpSchema) == "https"
+	isSecure := strings.EqualFold(ufmConf.HttpSchema, "https")
 	client := httpDriver.NewClient(isSecure, httpDriver.AuthBasic, ufmConf.Certificate)
 	auth := &httpDriver.BasicAuth{Username: ufmConf.Username, Password: ufmConf.Password}
 	client.SetBasicAuth(auth)

pkg/utils/utils.go

@@ -124,7 +124,7 @@ func IsIbSriovCniInNetwork(networkSpec map[string]interface{}) (*IbSriovCniSpec,
 	}
 
 	var plugins []*IbSriovCniSpec
-	if err = json.Unmarshal(pluginsData, &plugins); err != nil {
+	if err := json.Unmarshal(pluginsData, &plugins); err != nil {
 		return nil, err
 	}
 

pkg/watcher/resource-event-handler/pod.go

@@ -132,7 +132,7 @@ func (p *podEventHandler) OnDelete(obj interface{}) {
 			continue
 		}
 
-		//check if pod network has guid
+		// check if pod network has guid
 		if !utils.PodNetworkHasGuid(network) {
 			glog.Errorf("OnDelete(): pod %s has network %s marked as configured with InfiniBand without having guid",
 				pod.Name, network.Name)