chore: update Go version and lint

Signed-off-by: Fred Rolland <frolland@nvidia.com>

Author: rollandf

.golangci.yml

@@ -0,0 +1,144 @@
+# Tested with golangci-lint ver. 2.x
+version: "2"
+
+run:
+  timeout: 10m
+
+linters:
+  default: none
+  enable:
+    - asciicheck        # checks for non-ASCII identifiers
+    - bidichk           # checks for dangerous unicode sequences (security)
+    - bodyclose
+    - copyloopvar
+    - depguard
+    - dogsled
+    # TODO fix issues- dupl
+    - errcheck
+    - errname           # checks error naming conventions
+    - exhaustive
+    # TODO fix issues- funlen
+    - gocheckcompilerdirectives  # validates go compiler directives
+    #- gochecknoinits
+    - goconst
+    # TODO fix issues- gocritic
+    # TODO fix issues- gocyclo
+    # gofmt and goimports are now formatters in v2, not linters
+    # TODO fix issues- mnd (formerly gomnd)
+    - goprintffuncname
+    # TODO fix issues- gosec
+    # gosimple and stylecheck are now part of staticcheck in v2
+    - staticcheck
+    #- govet
+    - ineffassign
+    # TODO fix issues- intrange (2 issues - use integer ranges Go 1.22+)
+    # TODO fix issues- lll
+    - makezero          # finds slice declarations with non-zero initial length
+    - misspell
+    - nakedret
+    # TODO fix issues- nilerr (3 issues - returns nil when error is not nil)
+    # TODO fix issues- noctx (4 issues - missing context.Context)
+    # TODO fix issues- prealloc
+    - reassign          # checks package variable reassignment
+    - unconvert
+    # TODO fix issues- unparam
+    - unused
+    - whitespace
+
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: github.com/sirupsen/logrus
+              desc: "logging is allowed only by logutils.Log"
+    dupl:
+      threshold: 100
+    funlen:
+      lines: 100
+      statements: 50
+    goconst:
+      min-len: 2
+      min-occurrences: 2
+    gocritic:
+      enabled-tags:
+        - diagnostic
+        - experimental
+        - opinionated
+        - performance
+        - style
+      disabled-checks:
+        - ifElseChain    # style preference - suggests switch over if-else
+        - whyNoLint      # requires explanation for nolint directives
+        - unnamedResult  # style preference - named return values
+      settings:
+        hugeParam:
+          sizeThreshold: 512
+        rangeValCopy:
+          sizeThreshold: 512
+    gocyclo:
+      min-complexity: 15
+    mnd:
+      # don't include the "operation" and "assign"
+      checks:
+        - argument
+        - case
+        - condition
+        - return
+    lll:
+      line-length: 140
+    misspell:
+      locale: US
+    prealloc:
+      # Report preallocation suggestions only on simple loops that have no returns/breaks/continues/gotos in them.
+      # True by default.
+      simple: true
+      range-loops: true # Report preallocation suggestions on range loops, true by default
+      for-loops: false # Report preallocation suggestions on for loops, false by default
+    staticcheck:
+      checks:
+        - all
+        - -QF1001  # De Morgan's law suggestions
+        - -QF1003  # tagged switch suggestions
+        - -QF1008  # embedded field selector suggestions
+      dot-import-whitelist:
+        - github.com/onsi/ginkgo/v2
+        - github.com/onsi/gomega
+        - github.com/onsi/gomega/gstruct
+
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - std-error-handling
+    paths:
+      - vendor/
+      - .github/
+      - manifests/
+      - docs/
+      - cluster/
+      - hack/
+      - automation/
+      - examples/
+    rules:
+      # Exclude various linters from test files
+      - path: _test\.go
+        linters:
+          - mnd
+          - gosec
+          - dupl
+          - lll
+          - goconst
+      # Exclude linters from tests/ directory
+      - path: ^tests/
+        linters:
+          - goconst
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/k8snetworkplumbingwg/ovs-cni

Makefile

@@ -42,7 +42,7 @@ $(BASE): ; $(info  setting GOPATH...)
 
 GOLANGCI = $(GOBIN)/golangci-lint
 $(GOBIN)/golangci-lint: $(GO) | $(BASE) ; $(info  building golangci-lint...)
-	$Q $(GO) install -mod=mod github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.6
+	$Q $(GO) install -mod=mod github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.6.2
 
 build: format $(patsubst %, build-%, $(COMPONENTS))
 

cmd/marker/main.go

@@ -23,16 +23,16 @@ import (
 	"strings"
 	"time"
 
+	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/util/wait"
 
-	"github.com/golang/glog"
 	"github.com/k8snetworkplumbingwg/ovs-cni/pkg/cache"
 	"github.com/k8snetworkplumbingwg/ovs-cni/pkg/marker"
 )
 
 const (
 	UnixSocketType          = "unix"
-	TcpSocketType           = "tcp"
+	TCPSocketType           = "tcp"
 	SocketConnectionTimeout = time.Minute
 )
 
@@ -98,7 +98,6 @@ func main() {
 		if err != nil {
 			glog.Fatalf("Update failed: %v", err)
 		}
-
 	}, time.Duration(*updateInterval)*time.Second, 1.2, true, wait.NeverStop)
 }
 
@@ -119,7 +118,6 @@ func keepAlive(healthCheckFile string, healthCheckInterval int) {
 					healthCheckFile, err)
 			}
 		}
-
 	}, time.Duration(healthCheckInterval)*time.Second)
 }
 
@@ -140,7 +138,7 @@ func parseOvsSocket(ovsSocket *string) (string, string, error) {
 		address = *ovsSocket
 	} else {
 		socketType = ovsSocketTokens[0]
-		if socketType == TcpSocketType {
+		if socketType == TCPSocketType {
 			if len(ovsSocketTokens) != 3 {
 				return "", "", fmt.Errorf("failed to parse OVS %s socket, must be in this format %s:<host>:<port>", socketType, socketType)
 			}
@@ -166,8 +164,8 @@ func getOvsSocketValidator(socketType string) (func(string) error, error) {
 	switch socketType {
 	case UnixSocketType:
 		return validateOvsUnixConnection, nil
-	case TcpSocketType:
-		return validateOvsTcpConnection, nil
+	case TCPSocketType:
+		return validateOvsTCPConnection, nil
 	default:
 		return nil, fmt.Errorf("unsupported ovs socket type: %s", socketType)
 	}
@@ -189,8 +187,8 @@ func validateOvsUnixConnection(address string) error {
 	return nil
 }
 
-func validateOvsTcpConnection(address string) error {
-	conn, err := net.DialTimeout(TcpSocketType, address, SocketConnectionTimeout)
+func validateOvsTCPConnection(address string) error {
+	conn, err := net.DialTimeout(TCPSocketType, address, SocketConnectionTimeout)
 	if err == nil {
 		glog.Info("Successfully connected to TCP socket")
 		conn.Close()

pkg/config/config.go

@@ -26,6 +26,7 @@ import (
 	"dario.cat/mergo"
 	current "github.com/containernetworking/cni/pkg/types/100"
 	"github.com/containernetworking/cni/pkg/version"
+
 	"github.com/k8snetworkplumbingwg/ovs-cni/pkg/types"
 	"github.com/k8snetworkplumbingwg/ovs-cni/pkg/utils"
 )

pkg/marker/marker.go

@@ -53,17 +53,17 @@ type Marker struct {
 func NewMarker(nodeName string, ovsSocket string) (*Marker, error) {
 	config, err := rest.InClusterConfig()
 	if err != nil {
-		return nil, fmt.Errorf("Error while obtaining cluster config: %v", err)
+		return nil, fmt.Errorf("error while obtaining cluster config: %v", err)
 	}
 
 	clientset, err := kubernetes.NewForConfig(config)
 	if err != nil {
-		return nil, fmt.Errorf("Error building example clientset: %v", err)
+		return nil, fmt.Errorf("error building example clientset: %v", err)
 	}
 
 	ovsDriver, err := ovsdb.NewOvsDriver(ovsSocket)
 	if err != nil {
-		return nil, fmt.Errorf("Error creating the ovsdb connection: %v", err)
+		return nil, fmt.Errorf("error creating the ovsdb connection: %v", err)
 	}
 
 	return &Marker{clientset: clientset, nodeName: nodeName, ovsdb: ovsDriver}, nil

pkg/mirror-consumer/consumer.go

@@ -109,7 +109,6 @@ func CmdAdd(args *skel.CmdArgs) error {
 	}
 
 	for _, mirror := range netconf.Mirrors {
-
 		err = ovsDriver.CreateMirror(netconf.BrName, mirror.Name)
 		if err != nil {
 			return fmt.Errorf("cannot create mirror %s: %v ", mirror.Name, err)
@@ -178,7 +177,6 @@ func CmdDel(args *skel.CmdArgs) error {
 	}
 
 	for _, mirror := range netconf.Mirrors {
-
 		mirrorExist, err := ovsDriver.IsMirrorPresent(mirror.Name)
 		if err != nil {
 			return err
@@ -238,7 +236,6 @@ func CmdCheck(args *skel.CmdArgs) error {
 	}
 
 	for _, mirror := range netconf.Mirrors {
-
 		mirrorExist, err := ovsDriver.CheckMirrorConsumerWithPorts(mirror.Name, portUUID)
 		if err != nil {
 			return err

pkg/mirror-consumer/consumer_test.go

@@ -174,9 +174,9 @@ var testFunc = func(version string) {
 	testDel := func(conf string, mirrors []types.Mirror, r cnitypes.Result, ifName string, targetNs ns.NetNS) {
 		By("Checking that mirrors are still in ovsdb")
 		for _, mirror := range mirrors {
-			mirrorDb, err := GetMirrorAttribute(mirror.Name, "name")
+			mirrorDB, err := GetMirrorAttribute(mirror.Name, "name")
 			Expect(err).NotTo(HaveOccurred())
-			Expect(mirrorDb).To(Equal(mirror.Name))
+			Expect(mirrorDB).To(Equal(mirror.Name))
 		}
 
 		args := &skel.CmdArgs{

pkg/mirror-producer/producer.go

@@ -109,7 +109,6 @@ func CmdAdd(args *skel.CmdArgs) error {
 	}
 
 	for _, mirror := range netconf.Mirrors {
-
 		err = ovsDriver.CreateMirror(netconf.BrName, mirror.Name)
 		if err != nil {
 			return fmt.Errorf("cannot create mirror %s: %v ", mirror.Name, err)
@@ -170,7 +169,6 @@ func CmdDel(args *skel.CmdArgs) error {
 	}
 
 	for _, mirror := range netconf.Mirrors {
-
 		mirrorExist, err := ovsDriver.IsMirrorPresent(mirror.Name)
 		if err != nil {
 			return err

pkg/mirror-producer/producer_test.go

@@ -174,9 +174,9 @@ var testFunc = func(version string) {
 	testDel := func(conf string, mirrors []types.Mirror, r cnitypes.Result, ifName string, targetNs ns.NetNS) {
 		By("Checking that mirrors are still in ovsdb")
 		for _, mirror := range mirrors {
-			mirrorDb, err := GetMirrorAttribute(mirror.Name, "name")
+			mirrorDB, err := GetMirrorAttribute(mirror.Name, "name")
 			Expect(err).NotTo(HaveOccurred())
-			Expect(mirrorDb).To(Equal(mirror.Name))
+			Expect(mirrorDB).To(Equal(mirror.Name))
 		}
 
 		args := &skel.CmdArgs{