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:

README.md

@@ -28,6 +28,7 @@ To create a new preprocessing child workflow project:
   - The default Docker image name
   - The Makefile project name and the location of the installed tools
   - The `appName` in the worker command
+  - The gci "prefix" section in the `.golangci.yml` config file
 - Update this readme file:
   - Change the heading and initial description
   - Remove the first three sections from the list above and the content

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

@@ -66,7 +66,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 +83,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 +98,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)`,
 		},
 		{