chore: use go 1.26 and golangci-lint 2.10.1 (#568)

gacevicljubisa · web-flow · commit 5e7f8443d5aa · 2026-04-01T09:17:32.000+02:00
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -11,7 +11,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
       - name: Setup Go
@@ -32,9 +32,9 @@ jobs:
         run: git config --global core.autocrlf false
       - name: Lint
         if: matrix.os == 'ubuntu-latest'
-        uses: golangci/golangci-lint-action@v8
+        uses: golangci/golangci-lint-action@v9
         with:
-          version: v2.5.0
+          version: v2.10.1
           args: --timeout 10m
           skip-cache: false
       - name: Vet
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Setup Go
@@ -25,4 +25,4 @@ jobs:
           version: "~> v2"
           args: release --clean --timeout 1h
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.25 AS build
+FROM golang:1.26 AS build
 
 WORKDIR /src
 # enable modules caching in separate layer
@@ -8,7 +8,7 @@ COPY . ./
 
 RUN make binary
 
-FROM debian:12.12-slim
+FROM debian:12.13-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 GO ?= go
 GOLANGCI_LINT ?= golangci-lint
-GOLANGCI_LINT_VERSION ?= v2.5.0
+GOLANGCI_LINT_VERSION ?= v2.10.1
 COMMIT ?= "$(shell git describe --long --dirty --always --match "" || true)"
 VERSION ?= "$(shell git describe --tags --abbrev=0 | cut -c2-)"
 LDFLAGS ?= -s -w \
diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/ethersphere/beekeeper
 
-go 1.25.1
-
-toolchain go1.25.2
+go 1.26
 
 replace github.com/codahale/hdrhistogram => github.com/HdrHistogram/hdrhistogram-go v1.1.2
 
diff --git a/pkg/check/feed/feed_v1.go b/pkg/check/feed/feed_v1.go
@@ -57,7 +57,7 @@ func (c *CheckV1) Report() []prometheus.Collector {
 	return c.metrics.Report()
 }
 
-func (c *CheckV1) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *CheckV1) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")
diff --git a/pkg/check/gsoc/gsoc.go b/pkg/check/gsoc/gsoc.go
@@ -235,7 +235,7 @@ func getTargetNeighborhood(address swarm.Address, depth int) (string, error) {
 		if err != nil {
 			return "", err
 		}
-		targetNeighborhood.WriteString(fmt.Sprintf("%04b", value))
+		fmt.Fprintf(&targetNeighborhood, "%04b", value)
 	}
 	return targetNeighborhood.String(), nil
 }
diff --git a/pkg/check/kademlia/kademlia.go b/pkg/check/kademlia/kademlia.go
@@ -133,7 +133,7 @@ func checkKademliaD(topologies orchestration.ClusterTopologies, logger logging.L
 		var errmsg strings.Builder
 		for node, c := range culprits {
 			var msg strings.Builder
-			msg.WriteString(fmt.Sprintf("node %s expected connection to:\n", node))
+			fmt.Fprintf(&msg, "node %s expected connection to:\n", node)
 			for _, addr := range c {
 				msg.WriteString(addr.String() + "\n")
 			}
diff --git a/pkg/check/longavailability/longavailability.go b/pkg/check/longavailability/longavailability.go
@@ -77,7 +77,7 @@ func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, o any) e
 			labelValue := addr.String()
 			node, err := findRandomNode(ctx, addr, cluster, opts.RndSeed)
 			if err != nil {
-				c.logger.Errorf("find node %s. Skipping. %w", addr.String(), err)
+				c.logger.Errorf("find node %s. Skipping: %s", addr.String(), err.Error())
 				continue
 			}
 
diff --git a/pkg/check/manifest/manifest_v1.go b/pkg/check/manifest/manifest_v1.go
@@ -33,7 +33,7 @@ func NewCheckV1(logger logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *CheckV1) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *CheckV1) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")
@@ -201,7 +201,7 @@ func (c *CheckV1) downloadAndVerify(ctx context.Context, client *bee.Client, add
 	}
 	c.logger.Infof("downloading file: %s/%s", address, fName)
 
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		select {
 		case <-time.After(5 * time.Second):
 			_, hash, err := client.DownloadManifestFile(ctx, address, fName)
diff --git a/pkg/k8s/persistentvolumeclaim/client_test.go b/pkg/k8s/persistentvolumeclaim/client_test.go
@@ -37,9 +37,9 @@ func TestSet(t *testing.T) {
 					m := v1.PersistentVolumeFilesystem
 					return &m
 				}(),
-				StorageClassName: getAddress(""),
+				StorageClassName: new(""),
 				DataSource: &v1.TypedLocalObjectReference{
-					APIGroup: getAddress(""),
+					APIGroup: new(""),
 				},
 			},
 		},
@@ -63,9 +63,9 @@ func TestSet(t *testing.T) {
 					m := v1.PersistentVolumeFilesystem
 					return &m
 				}(),
-				StorageClassName: getAddress(""),
+				StorageClassName: new(""),
 				DataSource: &v1.TypedLocalObjectReference{
-					APIGroup: getAddress(""),
+					APIGroup: new(""),
 				},
 			},
 		},
diff --git a/pkg/k8s/persistentvolumeclaim/persistentvolumeclaim_test.go b/pkg/k8s/persistentvolumeclaim/persistentvolumeclaim_test.go
@@ -75,9 +75,9 @@ func TestToK8s(t *testing.T) {
 							Requests: map[v1.ResourceName]resource.Quantity{v1.ResourceStorage: resource.MustParse("1Gi")},
 						},
 						VolumeName:       "volume_1",
-						StorageClassName: getAddress("StorageClass"),
+						StorageClassName: new("StorageClass"),
 						DataSource: &v1.TypedLocalObjectReference{
-							APIGroup: getAddress("APIGroup"),
+							APIGroup: new("APIGroup"),
 							Kind:     "Kind",
 							Name:     "Name",
 						},
@@ -107,9 +107,9 @@ func TestToK8s(t *testing.T) {
 							m := v1.PersistentVolumeBlock
 							return &m
 						}(),
-						StorageClassName: getAddress(""),
+						StorageClassName: new(""),
 						DataSource: &v1.TypedLocalObjectReference{
-							APIGroup: getAddress(""),
+							APIGroup: new(""),
 						},
 					},
 				},
@@ -126,7 +126,3 @@ func TestToK8s(t *testing.T) {
 		})
 	}
 }
-
-func getAddress(value string) *string {
-	return &value
-}
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -17,11 +17,11 @@ type Reporter interface {
 
 func PrometheusCollectorsFromFields(i any) (cs []prometheus.Collector) {
 	v := reflect.Indirect(reflect.ValueOf(i))
-	for i := 0; i < v.NumField(); i++ {
-		if !v.Field(i).CanInterface() {
+	for _, field := range v.Fields() {
+		if !field.CanInterface() {
 			continue
 		}
-		if u, ok := v.Field(i).Interface().(prometheus.Collector); ok {
+		if u, ok := field.Interface().(prometheus.Collector); ok {
 			cs = append(cs, u)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func (c *CheckV1) Report() []prometheus.Collector {`
`57`	`57`	`return c.metrics.Report()`
`58`	`58`	`}`
`59`	`59`
`60`		`-func (c *CheckV1) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {`
	`60`	`+func (c *CheckV1) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {`
`61`	`61`	`o, ok := opts.(Options)`
`62`	`62`	`if !ok {`
`63`	`63`	`return fmt.Errorf("invalid options type")`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ func getTargetNeighborhood(address swarm.Address, depth int) (string, error) {`
`235`	`235`	`if err != nil {`
`236`	`236`	`return "", err`
`237`	`237`	`}`
`238`		`- targetNeighborhood.WriteString(fmt.Sprintf("%04b", value))`
	`238`	`+ fmt.Fprintf(&targetNeighborhood, "%04b", value)`
`239`	`239`	`}`
`240`	`240`	`return targetNeighborhood.String(), nil`
`241`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ func checkKademliaD(topologies orchestration.ClusterTopologies, logger logging.L`
`133`	`133`	`var errmsg strings.Builder`
`134`	`134`	`for node, c := range culprits {`
`135`	`135`	`var msg strings.Builder`
`136`		`- msg.WriteString(fmt.Sprintf("node %s expected connection to:\n", node))`
	`136`	`+ fmt.Fprintf(&msg, "node %s expected connection to:\n", node)`
`137`	`137`	`for _, addr := range c {`
`138`	`138`	`msg.WriteString(addr.String() + "\n")`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, o any) e`
`77`	`77`	`labelValue := addr.String()`
`78`	`78`	`node, err := findRandomNode(ctx, addr, cluster, opts.RndSeed)`
`79`	`79`	`if err != nil {`
`80`		`- c.logger.Errorf("find node %s. Skipping. %w", addr.String(), err)`
	`80`	`+ c.logger.Errorf("find node %s. Skipping: %s", addr.String(), err.Error())`
`81`	`81`	`continue`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func NewCheckV1(logger logging.Logger) beekeeper.Action {`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`-func (c *CheckV1) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {`
	`36`	`+func (c *CheckV1) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {`
`37`	`37`	`o, ok := opts.(Options)`
`38`	`38`	`if !ok {`
`39`	`39`	`return fmt.Errorf("invalid options type")`
`@@ -201,7 +201,7 @@ func (c CheckV1) downloadAndVerify(ctx context.Context, client bee.Client, add`
`201`	`201`	`}`
`202`	`202`	`c.logger.Infof("downloading file: %s/%s", address, fName)`
`203`	`203`
`204`		`- for i := 0; i < 10; i++ {`
	`204`	`+ for range 10 {`
`205`	`205`	`select {`
`206`	`206`	`case <-time.After(5 * time.Second):`
`207`	`207`	`_, hash, err := client.DownloadManifestFile(ctx, address, fName)`