chore: bump golangci-lint to v2 and golang to v1.25.1 (#508)

* chore: bump golangci-lint to v2

* chore: bump golang to 1.25.1

* chore: gofumpt

Author: gacevicljubisa

.github/workflows/go.yml

@@ -11,18 +11,18 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 1
       - name: Setup Go
         if: matrix.os == 'ubuntu-latest'
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           cache: false
           go-version-file: go.mod
       - name: Setup Go
         if: matrix.os == 'macos-latest' || matrix.os == 'windows-latest'
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           cache: true
           go-version-file: go.mod
@@ -32,9 +32,9 @@ jobs:
         run: git config --global core.autocrlf false
       - name: Lint
         if: matrix.os == 'ubuntu-latest'
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.64.5
+          version: v2.5.0
           args: --timeout 10m
           skip-cache: false
       - name: Vet

.github/workflows/release.yaml

@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
       - name: Run GoReleaser

.golangci.yml

@@ -1,17 +1,31 @@
-run:
-  timeout: 10m
+version: "2"
 linters:
   enable:
     - copyloopvar
-    - errcheck
     - errname
     - errorlint
     - goconst
-    - gofmt
-    - gofumpt
-    - govet
     - misspell
     - nilerr
-    - staticcheck
     - unconvert
-    - unused
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.goreleaser.yml

@@ -22,13 +22,13 @@ builds:
 
     goarch:
       - amd64
-      - 386
+      - "386"
       - arm64
       - arm
 
     ignore:
       - goos: darwin
-        goarch: 386
+        goarch: "386"
       - goos: darwin
         goarch: arm
       - goos: windows

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24 AS build
+FROM golang:1.25 AS build
 
 WORKDIR /src
 # enable modules caching in separate layer
@@ -8,7 +8,7 @@ COPY . ./
 
 RUN make binary
 
-FROM debian:12.10-slim
+FROM debian:12.12-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 

Makefile

@@ -1,6 +1,6 @@
 GO ?= go
 GOLANGCI_LINT ?= golangci-lint
-GOLANGCI_LINT_VERSION ?= v1.64.5
+GOLANGCI_LINT_VERSION ?= v2.5.0
 COMMIT ?= "$(shell git describe --long --dirty --always --match "" || true)"
 VERSION ?= "$(shell git describe --tags --abbrev=0 | cut -c2-)"
 LDFLAGS ?= -s -w \

cmd/beekeeper/cmd/cmd.go

@@ -449,7 +449,7 @@ func (c *command) setSwapClient() (err error) {
 		c.swapClient = &swap.NotSet{}
 	}
 
-	return
+	return err
 }
 
 func newLogger(cmd *cobra.Command, verbosity, lokiEndpoint string, httpClient *http.Client) (logging.Logger, error) {

cmd/beekeeper/cmd/create_k8s_namespace.go

@@ -28,7 +28,7 @@ func (c *command) initCreateK8sNamespace() *cobra.Command {
 			}
 
 			c.log.Infof("namespace %s created", name)
-			return
+			return err
 		},
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			if err := c.setK8sClient(); err != nil {

cmd/beekeeper/cmd/delete_k8s_namespace.go

@@ -26,7 +26,7 @@ func (c *command) initDeleteK8SNamespace() *cobra.Command {
 			}
 
 			c.log.Infof("namespace %s deleted", name)
-			return
+			return err
 		},
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			if err := c.setK8sClient(); err != nil {

cmd/beekeeper/cmd/print.go

@@ -46,7 +46,7 @@ Requires exactly one argument from the list above.`,
 				if err := c.config.PrintYaml(os.Stdout); err != nil {
 					return fmt.Errorf("config can not be printed: %s", err.Error())
 				}
-				return
+				return err
 			}
 
 			ctx, cancel := context.WithTimeout(cmd.Context(), c.globalConfig.GetDuration(optionNameTimeout))
@@ -67,7 +67,7 @@ Requires exactly one argument from the list above.`,
 		PreRunE: func(cmd *cobra.Command, args []string) (err error) {
 			// skip setup in case of print config
 			if args[0] == "config" {
-				return
+				return err
 			}
 			return c.preRunE(cmd, args)
 		},
@@ -100,7 +100,7 @@ var printFuncs = map[string]func(ctx context.Context, cluster orchestration.Clus
 			}
 		}
 
-		return
+		return err
 	},
 	"depths": func(ctx context.Context, cluster orchestration.Cluster) (err error) {
 		topologies, err := cluster.Topologies(ctx)
@@ -115,7 +115,7 @@ var printFuncs = map[string]func(ctx context.Context, cluster orchestration.Clus
 			}
 		}
 
-		return
+		return err
 	},
 	"nodes": func(ctx context.Context, cluster orchestration.Cluster) (err error) {
 		nodes := cluster.NodeNames()
@@ -124,7 +124,7 @@ var printFuncs = map[string]func(ctx context.Context, cluster orchestration.Clus
 			fmt.Printf("%s\n", n)
 		}
 
-		return
+		return err
 	},
 	"overlays": func(ctx context.Context, cluster orchestration.Cluster) (err error) {
 		overlays, err := cluster.Overlays(ctx)
@@ -139,7 +139,7 @@ var printFuncs = map[string]func(ctx context.Context, cluster orchestration.Clus
 			}
 		}
 
-		return
+		return err
 	},
 	"peers": func(ctx context.Context, cluster orchestration.Cluster) (err error) {
 		peers, err := cluster.Peers(ctx)
@@ -155,7 +155,7 @@ var printFuncs = map[string]func(ctx context.Context, cluster orchestration.Clus
 				}
 			}
 		}
-		return
+		return err
 	},
 	"topologies": func(ctx context.Context, cluster orchestration.Cluster) (err error) {
 		topologies, err := cluster.Topologies(ctx)
@@ -177,11 +177,11 @@ var printFuncs = map[string]func(ctx context.Context, cluster orchestration.Clus
 			}
 		}
 
-		return
+		return err
 	},
 	// print config prints configuration used to setup cluster
 	// add it to print funcs and do nothing (required to check if argument exists)
 	"config": func(ctx context.Context, cluster orchestration.Cluster) (err error) {
-		return
+		return err
 	},
 }