bump go version and fix linter

Author: Florian Sandel

.golangci.yaml

@@ -15,49 +15,21 @@ run:
   build-tags:
     - mytag
 
-  # which dirs to skip: issues from them won't be reported;
-  # can use regexp here: generated.*, regexp is applied on full path;
-  # default value is empty list, but default dirs are skipped independently
-  # from this option's value (see skip-dirs-use-default).
-  # "/" will be replaced by current OS file path separator to properly work
-  # on Windows.
-  skip-dirs:
-    - "./include/*"
-
-  # default is true. Enables skipping of directories:
-  #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
-  skip-dirs-use-default: true
-
-  # which files to skip: they will be analyzed, but issues from them
-  # won't be reported. Default value is empty list, but there is
-  # no need to include all autogenerated files, we confidently recognize
-  # autogenerated files. If it's not please let us know.
-  # "/" will be replaced by current OS file path separator to properly work
-  # on Windows.
-  skip-files:
-    - ".*\\.my\\.go$"
-    - lib/bad.go
-
   # Allow multiple parallel golangci-lint instances running.
   # If false (default) - golangci-lint acquires file lock on start.
   allow-parallel-runners: false
 
+  go: "1.23.5"
+
 
 # output configuration options
 output:
-  # colored-line-number|line-number|json|tab|checkstyle|code-climate|junit-xml|github-actions
-  # default is "colored-line-number"
-  format: colored-line-number
-
   # print lines of code with issue, default is true
   print-issued-lines: true
 
   # print linter name in the end of issue text, default is true
   print-linter-name: true
 
-  # make issues output unique by line, default is true
-  uniq-by-line: true
-
   # add a prefix to the output file references; default is no prefix
   path-prefix: ""
 
@@ -147,10 +119,13 @@ linters-settings:
     statements: 40
 
   gci:
-    # put imports beginning with prefix after 3rd-party packages;
-    # only support one prefix
-    # if not set, use goimports.local-prefixes
-    local-prefixes: github.com/org/project
+    sections:
+      - standard
+      - default
+      - prefix(github.com/stackitcloud/external-dns-stackit-webhook)
+
+  goimports:
+    local-prefixes: github.com/stackitcloud/external-dns-stackit-webhook
 
   gocognit:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)
@@ -268,13 +243,6 @@ linters-settings:
     # simplify code: gofmt with `-s` option, true by default
     simplify: true
 
-  gofumpt:
-    # Select the Go version to target. The default is `1.15`.
-    lang-version: "1.15"
-
-    # Choose whether or not to use the extra rules that are disabled
-    # by default
-    extra-rules: false
 
   goheader:
     values:
@@ -305,11 +273,6 @@ linters-settings:
     template-path:
     # also as alternative of directive 'template' you may put the path to file with the template source
 
-  goimports:
-    # put imports beginning with prefix after 3rd-party packages;
-    # it's a comma-separated list of prefixes
-    local-prefixes: github.com/org/project
-
   golint:
     # minimal confidence for issues, default is 0.8
     min-confidence: 0.8
@@ -383,15 +346,10 @@ linters-settings:
         truncate: "32"
 
   gosimple:
-    # Select the Go version to target. The default is '1.13'.
-    go: "1.15"
     # https://staticcheck.io/docs/options#checks
     checks: [ "all" ]
 
   govet:
-    # report about shadowed variables
-    check-shadowing: true
-
     # settings per analyzer
     settings:
       printf: # analyzer name, run `go tool vet help` to see all analyzers
@@ -405,9 +363,9 @@ linters-settings:
     # run `go tool vet help` to see all analyzers
     enable:
       - atomicalign
-    enable-all: false
-    disable:
       - shadow
+
+    enable-all: false
     disable-all: false
 
   depguard:
@@ -551,14 +509,10 @@ linters-settings:
             allowFloats: "0.0,0.,1.0,1.,2.0,2."
 
   staticcheck:
-    # Select the Go version to target. The default is '1.13'.
-    go: "1.15"
     # https://staticcheck.io/docs/options#checks
     checks: [ "all" ]
 
   stylecheck:
-    # Select the Go version to target. The default is '1.13'.
-    go: "1.15"
     # https://staticcheck.io/docs/options#checks
     checks: [ "all", "-ST1000", "-ST1003", "-ST1016", "-ST1020", "-ST1021", "-ST1022" ]
     # https://staticcheck.io/docs/options#dot_import_whitelist
@@ -600,11 +554,6 @@ linters-settings:
       name: true
       begin: true
 
-  tenv:
-    # The option `all` will run against whole test files (`_test.go`) regardless of method/function signatures.
-    # By default, only methods that take `*testing.T`, `*testing.B`, and `testing.TB` as arguments are checked.
-    all: false
-
   unparam:
     # Inspect exported functions, default is false. Set to true if no external program/library imports your code.
     # XXX: if you enable this setting, unparam will report a lot of false-positives in text editors:
@@ -613,8 +562,6 @@ linters-settings:
     check-exported: false
 
   unused:
-    # Select the Go version to target. The default is '1.13'.
-    go: "1.15"
 
   varnamelen:
     # The longest distance, in source lines, that is being considered a "small scope." (defaults to 5)
@@ -674,7 +621,6 @@ linters:
     - errname
     - errorlint
     - exhaustive
-    - exportloopref
     - forcetypeassert
     - funlen
     - gci
@@ -685,7 +631,6 @@ linters:
     - godot
     - godox
     - gofmt
-    - gofumpt
     - goheader
     - gomoddirectives
     - gomodguard
@@ -708,12 +653,12 @@ linters:
     - predeclared
     - promlinter
     - staticcheck
-    - tenv
     - thelper
     - tparallel
     - unconvert
     - unparam
     - unused
+    - usetesting
     - whitespace
     - paralleltest
   enable-all: false
@@ -726,14 +671,11 @@ linters:
     - goimports
     - lll
     - stylecheck
-    - gomnd
     - testpackage
     - wrapcheck
-    - golint
-    - scopelint
     - typecheck
     - tagliatelle
-    - goerr113
+    - err113
     - gochecknoglobals
     - wsl
     - revive
@@ -819,12 +761,10 @@ issues:
   # Default is false.
   new: false
 
-  # Show only new issues created after git revision `REV`
-  new-from-rev: REV
-
   # Fix found issues (if it's supported by the linter)
   fix: true
 
+
 severity:
   # Default value is empty string.
   # Set the default severity for issues. If severity rules are defined and the issues

Makefile

@@ -1,4 +1,4 @@
-GOLANGCI_VERSION = 1.59.1
+GOLANGCI_VERSION = 1.64.8
 LICENCES_IGNORE_LIST = $(shell cat licenses/licenses-ignore-list.txt)
 
 VERSION ?= 0.0.1

cmd/webhook/cmd/root.go

@@ -8,13 +8,14 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"sigs.k8s.io/external-dns/endpoint"
+
 	"github.com/stackitcloud/external-dns-stackit-webhook/internal/stackitprovider"
 	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
 	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/metrics"
 	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/stackit"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-	"sigs.k8s.io/external-dns/endpoint"
 )
 
 var (

pkg/api/adjust_endpoints_test.go

@@ -8,12 +8,13 @@ import (
 
 	"github.com/goccy/go-json"
 	"github.com/gofiber/fiber/v2"
-	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
-	mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 	"go.uber.org/zap"
 	"sigs.k8s.io/external-dns/endpoint"
+
+	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
+	mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
 )
 
 func TestWebhook_AdjustEndpoints(t *testing.T) {

pkg/api/api.go

@@ -15,9 +15,10 @@ import (
 	fiberlogger "github.com/gofiber/fiber/v2/middleware/logger"
 	"github.com/gofiber/fiber/v2/middleware/pprof"
 	fiberrecover "github.com/gofiber/fiber/v2/middleware/recover"
-	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/metrics"
 	"go.uber.org/zap"
 	"sigs.k8s.io/external-dns/provider"
+
+	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/metrics"
 )
 
 type Api interface {

pkg/api/api_test.go

@@ -8,11 +8,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
-	mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 	"go.uber.org/zap"
+
+	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
+	mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
 )
 
 func TestApi(t *testing.T) {

pkg/api/apply_changes_test.go

@@ -9,13 +9,14 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
-	mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 	"go.uber.org/zap"
 	"sigs.k8s.io/external-dns/endpoint"
 	"sigs.k8s.io/external-dns/plan"
+
+	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
+	mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
 )
 
 func TestWebhook_ApplyChanges(t *testing.T) {

pkg/api/domain_filter_test.go

@@ -8,12 +8,13 @@ import (
 
 	"github.com/goccy/go-json"
 	"github.com/gofiber/fiber/v2"
-	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
-	mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 	"go.uber.org/zap"
 	"sigs.k8s.io/external-dns/endpoint"
+
+	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
+	mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
 )
 
 func TestWebhook_DomainFilter(t *testing.T) {

pkg/api/health_test.go

@@ -6,11 +6,12 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
-	mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 	"go.uber.org/zap"
+
+	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
+	mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
 )
 
 func TestHealth(t *testing.T) {

pkg/api/metrics.go

@@ -7,6 +7,7 @@ import (
 	"github.com/gofiber/adaptor/v2"
 	"github.com/gofiber/fiber/v2"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+
 	metrics_collector "github.com/stackitcloud/external-dns-stackit-webhook/pkg/metrics"
 )
 

pkg/api/metrics_test.go

@@ -6,11 +6,12 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
+	"github.com/stretchr/testify/assert"
+	"go.uber.org/mock/gomock"
+
 	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
 	metrics_collector "github.com/stackitcloud/external-dns-stackit-webhook/pkg/metrics"
 	mock_metrics_collector "github.com/stackitcloud/external-dns-stackit-webhook/pkg/metrics/mock"
-	"github.com/stretchr/testify/assert"
-	"go.uber.org/mock/gomock"
 )
 
 func TestMetricsMiddleware(t *testing.T) {

pkg/api/records_test.go

@@ -7,12 +7,13 @@ import (
 	"testing"
 
 	"github.com/goccy/go-json"
-	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
-	mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 	"go.uber.org/zap"
 	"sigs.k8s.io/external-dns/endpoint"
+
+	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
+	mock_provider "github.com/stackitcloud/external-dns-stackit-webhook/pkg/api/mock"
 )
 
 func TestWebhook_Records(t *testing.T) {