global: upgrade GO to 1.23 golangci-lint to 1.61 (#244)

Co-authored-by: nkononov <[email protected]>

.golangci.yml

@@ -5,6 +5,9 @@ run:
 #  modules-download-mode: readonly
 
 linters-settings:
+  misspell:
+    ignore-words:
+      - "nto"
   revive:
     rules:
       - name: indent-error-flow
@@ -63,7 +66,7 @@ linters-settings:
     statements: 40
   unused:
     check-exported: true
-    go: "1.22"
+    go: "1.23"
   stylecheck:
     dot-import-whitelist:
       - github.com/onsi/gomega
@@ -86,7 +89,7 @@ linters-settings:
       - github.com/openshift-kni/eco-gotests/tests/lca/imagebasedinstall/mgmt/internal/mgmtinittools
       - github.com/openshift-kni/eco-gotests/tests/system-tests/diskencryption/internal/diskencryptioninittools
     # Select the Go version to target. The default is '1.13'.
-    go: "1.22"
+    go: "1.23"
     # https://staticcheck.io/docs/options#checks
     checks:
       - all

Dockerfile

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi9/ubi:latest
 
-ARG GO_VER=go1.22.6
+ARG GO_VER=go1.23.2
 ARG [email protected]
 ARG CONTAINERUSER=testuser
 

README.md

@@ -7,7 +7,7 @@ The [eco-gotests](https://github.com/openshift-kni/eco-gotests) is the downstrea
 The project is based on golang+[ginkgo](https://onsi.github.io/ginkgo) framework.
 
 ### Project requirements
-* golang v1.22.x
+* golang v1.23.x
 * ginkgo v2.x
 
 ## eco-gotests

go.mod

@@ -1,6 +1,6 @@
 module github.com/openshift-kni/eco-gotests
 
-go 1.22
+go 1.23
 
 require (
 	github.com/Juniper/go-netconf v0.3.0

images/cnf/network/eco-gotests-network-client/Dockerfile

@@ -1,5 +1,5 @@
 # Build testcmd bin
-FROM docker.io/library/golang:1.22 AS builder
+FROM docker.io/library/golang:1.23 AS builder
 RUN git clone https://github.com/kononovn/testcmd.git
 WORKDIR ./testcmd
 ENV CGO_ENABLED=0

scripts/golangci-lint.sh

@@ -4,7 +4,7 @@ set -e
 
 . "$(dirname "$0")"/common.sh
 
-GOLANGCI_LINT_VERSION="1.56.2"
+GOLANGCI_LINT_VERSION="1.61.0"
 
 # IsGoLangCiLintInstalled is used to check whether golangci-lint executable is on the $PATH.
 function IsGolangCiLintInstalled() {

tests/cnf/core/network/internal/netenv/netenv.go

@@ -11,7 +11,7 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/mco"
 	"github.com/openshift-kni/eco-goinfra/pkg/namespace"
 	"github.com/openshift-kni/eco-goinfra/pkg/nodes"
-	"github.com/openshift-kni/eco-goinfra/pkg/nto" //nolint:misspell
+	"github.com/openshift-kni/eco-goinfra/pkg/nto"
 	"github.com/openshift-kni/eco-goinfra/pkg/pod"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/core/network/internal/netconfig"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/core/network/internal/netparam"

tests/cnf/core/network/metallb/internal/metallbenv/metallbenv.go

@@ -216,8 +216,8 @@ func DefineIterationParams(
 			doesIPListsHaveEnoughAddresses(ipv6AddrList, nodeExtIPv6AddrList, ipFamily)
 	}
 
-	return "", "", nil, nil, nil, nil, fmt.Errorf(fmt.Sprintf(
-		"ipStack parameter is invalid allowed values are %s, %s ", netparam.IPV4Family, netparam.IPV6Family))
+	return "", "", nil, nil, nil, nil, fmt.Errorf(
+		"ipStack parameter is invalid allowed values are %s, %s ", netparam.IPV4Family, netparam.IPV6Family)
 }
 
 func doesIPListsHaveEnoughAddresses(mlbAddrList, nodeExtAddrList []string, ipFamily string) error {

tests/cnf/core/network/sriov/tests/externalllymanaged.go

@@ -428,9 +428,9 @@ func defineIterationParams(ipFamily string) (clientIPs, serverIPs []string, err
 			[]string{tsparams.ServerIPv4IPAddress, tsparams.ServerIPv6IPAddress}, nil
 	}
 
-	return nil, nil, fmt.Errorf(fmt.Sprintf(
+	return nil, nil, fmt.Errorf(
 		"ipStack parameter %s is invalid; allowed values are %s, %s, %s ",
-		ipFamily, netparam.IPV4Family, netparam.IPV6Family, netparam.DualIPFamily))
+		ipFamily, netparam.IPV4Family, netparam.IPV6Family, netparam.DualIPFamily)
 }
 
 func getVlanIDAndMaxTxRateForVf(nodeName, sriovInterfaceName string) (maxTxRate, vlanID int) {

tests/cnf/core/network/sriov/tests/rdmametrics.go

@@ -180,7 +180,7 @@ var _ = Describe("rdmaMetrics", Ordered, Label(tsparams.LabelRdmaMetricsTestCase
 					fmt.Sprintf("Failed to run command %s on node %s",
 						fmt.Sprintf("ls /sys/bus/pci/devices/%s/infiniband/%s/ports/1/hw_counters",
 							pciAddress, rdmaDevice), testPod.Object.Spec.NodeName))
-				Expect(nodeOutput[fmt.Sprintf(testPod.Object.Spec.NodeName)]).To(ContainSubstring("out_of_buffer"),
+				Expect(nodeOutput[testPod.Object.Spec.NodeName]).To(ContainSubstring("out_of_buffer"),
 					fmt.Sprintf("Failed to find the counters in the output %s", nodeOutput[testPod.Object.Spec.NodeName]))
 			})
 

tests/cnf/ran/powermanagement/internal/collect/collect.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"github.com/openshift-kni/eco-goinfra/pkg/nto" //nolint:misspell
+	"github.com/openshift-kni/eco-goinfra/pkg/nto"
 	"github.com/openshift-kni/eco-goinfra/pkg/pod"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/stats"

tests/cnf/ran/powermanagement/internal/helper/helper.go

@@ -10,7 +10,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/openshift-kni/eco-goinfra/pkg/mco"
 	"github.com/openshift-kni/eco-goinfra/pkg/nodes"
-	"github.com/openshift-kni/eco-goinfra/pkg/nto" //nolint:misspell
+	"github.com/openshift-kni/eco-goinfra/pkg/nto"
 	"github.com/openshift-kni/eco-goinfra/pkg/pod"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranparam"

tests/cnf/ran/powermanagement/tests/cpufreq.go

@@ -9,7 +9,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/openshift-kni/eco-goinfra/pkg/nto" //nolint:misspell
+	"github.com/openshift-kni/eco-goinfra/pkg/nto"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranparam"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/version"

tests/cnf/ran/powermanagement/tests/powersave.go

@@ -12,7 +12,7 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/openshift-kni/eco-goinfra/pkg/mco"
 	"github.com/openshift-kni/eco-goinfra/pkg/nodes"
-	"github.com/openshift-kni/eco-goinfra/pkg/nto" //nolint:misspell
+	"github.com/openshift-kni/eco-goinfra/pkg/nto"
 	"github.com/openshift-kni/eco-goinfra/pkg/reportxml"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranparam"

tests/hw-accel/kmm/modules/tests/realtime-test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/kmm"
 	"github.com/openshift-kni/eco-goinfra/pkg/mco"
 	"github.com/openshift-kni/eco-goinfra/pkg/namespace"
-	"github.com/openshift-kni/eco-goinfra/pkg/nto" //nolint:misspell
+	"github.com/openshift-kni/eco-goinfra/pkg/nto"
 	"github.com/openshift-kni/eco-goinfra/pkg/reportxml"
 	"github.com/openshift-kni/eco-goinfra/pkg/serviceaccount"
 	"github.com/openshift-kni/eco-gotests/tests/hw-accel/kmm/internal/await"

tests/system-tests/vcore/internal/vcorecommon/node-tuning-operator.go

@@ -15,7 +15,7 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/clusteroperator"
 	"github.com/openshift-kni/eco-goinfra/pkg/mco"
 	"github.com/openshift-kni/eco-goinfra/pkg/nodes"
-	"github.com/openshift-kni/eco-goinfra/pkg/nto" //nolint:misspell
+	"github.com/openshift-kni/eco-goinfra/pkg/nto"
 	"github.com/openshift-kni/eco-goinfra/pkg/service"
 	"github.com/openshift-kni/eco-gotests/tests/system-tests/internal/apiobjectshelper"
 	"github.com/openshift-kni/eco-gotests/tests/system-tests/vcore/internal/vcoreparams"
@@ -40,28 +40,28 @@ var (
 // VerifyNTOSuite container that contains tests for Node Tuning Operator verification.
 func VerifyNTOSuite() {
 	Describe(
-		"NTO validation", //nolint:misspell
+		"NTO validation",
 		Label(vcoreparams.LabelVCoreOperators), func() {
 			It(fmt.Sprintf("Verifies %s namespace exists", vcoreparams.NTONamespace),
-				Label("nto"), VerifyNTONamespaceExists) //nolint:misspell
+				Label("nto"), VerifyNTONamespaceExists)
 
 			It("Verify Node Tuning Operator successfully installed",
-				Label("nto"), reportxml.ID("63656"), VerifyNTODeployment) //nolint:misspell
+				Label("nto"), reportxml.ID("63656"), VerifyNTODeployment)
 
 			It("Create new performanceprofile",
-				Label("nto"), reportxml.ID("63741"), CreatePerformanceProfile) //nolint:misspell
+				Label("nto"), reportxml.ID("63741"), CreatePerformanceProfile)
 
 			It("Create new nodes tuning",
-				Label("nto"), reportxml.ID("63740"), CreateNodesTuning) //nolint:misspell
+				Label("nto"), reportxml.ID("63740"), CreateNodesTuning)
 
 			It("Verify CPU Manager config",
-				Label("nto"), reportxml.ID("63809"), VerifyCPUManagerConfig) //nolint:misspell
+				Label("nto"), reportxml.ID("63809"), VerifyCPUManagerConfig)
 
 			It("Verify Node Tuning Operator Huge Pages configuration",
-				Label("nto"), reportxml.ID("60062"), VerifyHugePagesConfig) //nolint:misspell
+				Label("nto"), reportxml.ID("60062"), VerifyHugePagesConfig)
 
 			It("Verify System Reserved memory for user-plane-worker nodes configuration",
-				Label("nto"), //nolint:misspell
+				Label("nto"),
 				reportxml.ID("60047"), SetSystemReservedMemoryForWorkers)
 		})
 }
@@ -88,7 +88,7 @@ func VerifyNTODeployment(ctx SpecContext) {
 			vcoreparams.NTODeploymentName, vcoreparams.NTONamespace, err))
 
 	glog.V(vcoreparams.VCoreLogLevel).Infof(
-		"Confirm that NTO %s pod was deployed and running in %s namespace", //nolint:misspell
+		"Confirm that NTO %s pod was deployed and running in %s namespace",
 		vcoreparams.NTODeploymentName, vcoreparams.NTONamespace)
 
 	ntoPods, err := pod.ListByNamePattern(APIClient, vcoreparams.NTODeploymentName, vcoreparams.NTONamespace)
@@ -107,7 +107,7 @@ func VerifyNTODeployment(ctx SpecContext) {
 			ntoPodName, vcoreparams.NTONamespace, ntoPodLog)
 	}
 
-	glog.V(vcoreparams.VCoreLogLevel).Infof("Verify NTO service %s created in the namespace %s", //nolint:misspell
+	glog.V(vcoreparams.VCoreLogLevel).Infof("Verify NTO service %s created in the namespace %s",
 		ntoServiceName, vcoreparams.NTONamespace)
 
 	ntoService, err := service.Pull(APIClient, ntoServiceName, vcoreparams.NTONamespace)
@@ -116,7 +116,7 @@ func VerifyNTODeployment(ctx SpecContext) {
 	Expect(ntoService.Exists()).To(Equal(true), fmt.Sprintf("no service %s was found in the namespace %s",
 		ntoServiceName, vcoreparams.NTONamespace))
 
-	glog.V(vcoreparams.VCoreLogLevel).Infof("Verify NTO service %s created in the namespace %s", //nolint:misspell
+	glog.V(vcoreparams.VCoreLogLevel).Infof("Verify NTO service %s created in the namespace %s",
 		ntoServiceName, vcoreparams.NTONamespace)
 
 	paoService, err := service.Pull(APIClient, paoServiceName, vcoreparams.NTONamespace)

tests/system-tests/vcore/internal/vcorecommon/odf.go

@@ -240,8 +240,6 @@ func VerifyODFStorageSystemConfig(ctx SpecContext) {
 } // func VerifyODFStorageSystemConfig (ctx SpecContext)
 
 // VerifyOperatorsConfigForODFNodes asserts operators configuration for ODF nodes.
-//
-//nolint:goconst
 func VerifyOperatorsConfigForODFNodes(ctx SpecContext) {
 	glog.V(vcoreparams.VCoreLogLevel).Infof("Configuring operators for ODF nodes")