Upgrade golangci-lint from v1.64.8 to v2.8.0

Upgrade golangci-lint and apply changes recommended by linter.

Author: djjuhasz

.golangci.yml

@@ -1,49 +1,68 @@
-run:
-  deadline: 60s
-
+version: "2"
 linters:
+  default: standard
   enable:
     - contextcheck
-    - gci
-    - gofumpt
     - gosec
     - importas
     - intrange
     - misspell
     - tparallel
     - unparam
-
-issues:
-  exclude-dirs:
-    - hack
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - errcheck
-
-linters-settings:
-  gci:
-    no-inline-comments: true
-    no-prefix-comments: false
-    sections:
-      - standard
-      - default
-      - prefix(github.com/artefactual-sdps/preprocessing-base)
-    section-separators:
-      - newLine
-  gofumpt:
-    extra-rules: true
-  importas:
-    no-unaliased: true
-    no-extra-aliases: false
-    alias:
-      - pkg: go.temporal.io/sdk/contrib/(\w+)
-        alias: temporalsdk_contrib_$1
-      - pkg: go.temporal.io/sdk/(\w+)
-        alias: temporalsdk_$1
-      - pkg: go.temporal.io/api/(\w+)
-        alias: temporalapi_$1
-  gosec:
-    exclude-generated: false
-    severity: low
-    confidence: low
+  settings:
+    gosec:
+      severity: low
+      confidence: low
+    importas:
+      alias:
+        - pkg: go.temporal.io/sdk/contrib/(\w+)
+          alias: temporalsdk_contrib_$1
+        - pkg: go.temporal.io/sdk/(\w+)
+          alias: temporalsdk_$1
+        - pkg: go.temporal.io/api/(\w+)
+          alias: temporalapi_$1
+      no-unaliased: true
+      no-extra-aliases: false
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - errcheck
+        path: _test\.go
+    paths:
+      - hack
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofumpt
+    - golines
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/artefactual-sdps/preprocessing-base)
+      no-inline-comments: true
+      no-prefix-comments: false
+    gofumpt:
+      extra-rules: true
+    golines:
+      max-len: 120
+      shorten-comments: true
+      reformat-tags: true
+      chain-split-dots: true
+  exclusions:
+    generated: lax
+    paths:
+      - hack
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -85,10 +85,9 @@ help:
 	    '
 
 lint: # @HELP Lint the project Go files with golangci-lint.
-lint: OUT_FORMAT ?= colored-line-number
-lint: LINT_FLAGS ?= --timeout=5m --fix
+lint: LINT_FLAGS ?= --timeout=5m --fix --output.text.colors
 lint: $(GOLANGCI_LINT)
-	golangci-lint run --out-format $(OUT_FORMAT) $(LINT_FLAGS)
+	golangci-lint run $(LINT_FLAGS)
 
 list-tested-packages: # @HELP Print a list of packages being tested.
 list-tested-packages:

cmd/worker/main.go

@@ -8,12 +8,11 @@ import (
 	"os/signal"
 	"runtime"
 
-	"github.com/spf13/pflag"
-	"go.artefactual.dev/tools/log"
-
 	"github.com/artefactual-sdps/preprocessing-base/cmd/worker/workercmd"
 	"github.com/artefactual-sdps/preprocessing-base/internal/config"
 	"github.com/artefactual-sdps/preprocessing-base/internal/version"
+	"github.com/spf13/pflag"
+	"go.artefactual.dev/tools/log"
 )
 
 const appName = "preprocessing-base-worker"

cmd/worker/workercmd/cmd.go

@@ -3,6 +3,8 @@ package workercmd
 import (
 	"context"
 
+	"github.com/artefactual-sdps/preprocessing-base/internal/config"
+	"github.com/artefactual-sdps/preprocessing-base/internal/workflow"
 	"github.com/artefactual-sdps/temporal-activities/bagcreate"
 	"github.com/go-logr/logr"
 	"go.artefactual.dev/tools/temporal"
@@ -11,9 +13,6 @@ import (
 	temporalsdk_interceptor "go.temporal.io/sdk/interceptor"
 	temporalsdk_worker "go.temporal.io/sdk/worker"
 	temporalsdk_workflow "go.temporal.io/sdk/workflow"
-
-	"github.com/artefactual-sdps/preprocessing-base/internal/config"
-	"github.com/artefactual-sdps/preprocessing-base/internal/workflow"
 )
 
 const Name = "preprocessing-worker"

hack/make/dep_golangci_lint.mk

@@ -5,7 +5,7 @@ $(call _assert_var,UNAME_ARCH)
 $(call _assert_var,CACHE_VERSIONS)
 $(call _assert_var,CACHE_BIN)
 
-GOLANGCI_LINT_VERSION ?= 1.64.8
+GOLANGCI_LINT_VERSION ?= 2.8.0
 
 ARCH := $(UNAME_ARCH)
 ifeq ($(UNAME_ARCH),x86_64)

internal/config/config.go

@@ -128,7 +128,7 @@ func Read(config *Configuration, configFile string) (found bool, configFileUsed
 	}
 
 	if err := config.Validate(); err != nil {
-		return true, "", errors.Join(errors.New("invalid configuration:"), err)
+		return true, "", errors.Join(errors.New("invalid configuration"), err)
 	}
 
 	return true, v.ConfigFileUsed(), nil

internal/config/config_test.go

@@ -3,11 +3,10 @@ package config_test
 import (
 	"testing"
 
+	"github.com/artefactual-sdps/preprocessing-base/internal/config"
 	"github.com/artefactual-sdps/temporal-activities/bagcreate"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/fs"
-
-	"github.com/artefactual-sdps/preprocessing-base/internal/config"
 )
 
 const testConfig = `# Config
@@ -66,7 +65,7 @@ func TestConfig(t *testing.T) {
 			name:       "Errors when configuration values are not valid",
 			configFile: "preprocessing.toml",
 			wantFound:  true,
-			wantErr: `invalid configuration:
+			wantErr: `invalid configuration
 SharedPath: missing required value
 Temporal.TaskQueue: missing required value
 Temporal.WorkflowName: missing required value`,
@@ -83,7 +82,7 @@ workflowName = "preprocessing"
 maxConcurrentSessions = -1
 `,
 			wantFound: true,
-			wantErr: `invalid configuration:
+			wantErr: `invalid configuration
 Worker.MaxConcurrentSessions: -1 is less than the minimum value (1)`,
 		},
 		{
@@ -98,7 +97,7 @@ workflowName = "preprocessing"
 checksumAlgorithm = "unknown"
 `,
 			wantFound: true,
-			wantErr: `invalid configuration:
+			wantErr: `invalid configuration
 Bagit.ChecksumAlgorithm: invalid value "unknown", must be one of (md5, sha1, sha256, sha512)`,
 		},
 		{

internal/eventlog/eventlog_test.go

@@ -5,10 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"gotest.tools/v3/assert"
-
 	"github.com/artefactual-sdps/preprocessing-base/internal/enums"
 	"github.com/artefactual-sdps/preprocessing-base/internal/eventlog"
+	"gotest.tools/v3/assert"
 )
 
 func TestEvent(t *testing.T) {

internal/workflow/preprocessing.go

@@ -5,13 +5,12 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/artefactual-sdps/preprocessing-base/internal/enums"
+	"github.com/artefactual-sdps/preprocessing-base/internal/eventlog"
 	"github.com/artefactual-sdps/temporal-activities/bagcreate"
 	"go.artefactual.dev/tools/temporal"
 	temporalsdk_temporal "go.temporal.io/sdk/temporal"
 	temporalsdk_workflow "go.temporal.io/sdk/workflow"
-
-	"github.com/artefactual-sdps/preprocessing-base/internal/enums"
-	"github.com/artefactual-sdps/preprocessing-base/internal/eventlog"
 )
 
 type Outcome int

internal/workflow/preprocessing_test.go

@@ -5,17 +5,16 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/artefactual-sdps/preprocessing-base/internal/config"
+	"github.com/artefactual-sdps/preprocessing-base/internal/enums"
+	"github.com/artefactual-sdps/preprocessing-base/internal/eventlog"
+	"github.com/artefactual-sdps/preprocessing-base/internal/workflow"
 	"github.com/artefactual-sdps/temporal-activities/bagcreate"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 	temporalsdk_activity "go.temporal.io/sdk/activity"
 	temporalsdk_testsuite "go.temporal.io/sdk/testsuite"
 	temporalsdk_worker "go.temporal.io/sdk/worker"
-
-	"github.com/artefactual-sdps/preprocessing-base/internal/config"
-	"github.com/artefactual-sdps/preprocessing-base/internal/enums"
-	"github.com/artefactual-sdps/preprocessing-base/internal/eventlog"
-	"github.com/artefactual-sdps/preprocessing-base/internal/workflow"
 )
 
 const sharedPath = "/shared/path/"