update linter and fix linter issues

Author: cornelk

.github/workflows/go.yaml

@@ -5,34 +5,36 @@ on:
     branches:
       - main
   pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
 
 jobs:
   build:
-    if: "!contains(github.event.commits[0].message, '[skip ci]')"
+    if: ${{ github.event_name == 'push' || !github.event.pull_request.draft || !contains(github.event.commits[0].message, '[skip ci]') }}
     timeout-minutes: 15
 
     name: Build
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [1.17, 1.18, 1.19]
+        go: [ "1.17", "1.18" ]
 
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ matrix.go }}
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
 
       - name: Install linters
         run: make install-linters
 
-      - name: Get dependencies
-        run: go mod download
-
       - name: Run tests
         run: make test
 

.golangci.yml

@@ -1,58 +1,70 @@
+version: "2"
 run:
-  deadline: 5m
-
+  modules-download-mode: readonly
 linters:
   enable:
-    - asasalint # check for pass []any as any in variadic func(...any)
-    - asciicheck # Simple linter to check that your code does not contain non-ASCII identifiers
+    - asasalint # Check for pass []any as any in variadic func(...any)
+    - asciicheck # Checks that code identifiers do not have non-ASCII symbols
     - bidichk # Checks for dangerous unicode character sequences
-    - containedctx # detects struct contained context.Context field
-    - contextcheck # check the function whether use a non-inherited context
-    - cyclop # checks function and package cyclomatic complexity
-    - decorder # check declaration order and count of types, constants, variables and functions
-    - depguard # Go linter that checks if package imports are in a list of acceptable packages
-    - dogsled # Checks assignments with too many blank identifiers (e.g. x, _, _, _, := f())
-    - durationcheck # check for two durations multiplied together
-    - errcheck # checking for unchecked errors
-    - errname # Checks that errors are prefixed with the `Err` and error types are suffixed with the `Error`
-    - errorlint # finds code that will cause problems with the error wrapping scheme introduced in Go 1.13
-    - exportloopref # checks for pointers to enclosing loop variables
-    - funlen # Tool for detection of long functions
-    - gci # controls golang package import order and makes it always deterministic
+    - containedctx # Detects struct contained context.Context field
+    - contextcheck # Check whether the function uses a non-inherited context
+    - copyloopvar # Detects places where loop variables are copied
+    - cyclop # Checks function and package cyclomatic complexity
+    - decorder # Check declaration order of types, constants, variables and functions
+    - dogsled # Checks assignments with too many blank identifiers
+    - durationcheck # Check for two durations multiplied together
+    - embeddedstructfieldcheck # Checks embedded struct field positioning and formatting
+    - err113 # Check errors handling expressions
+    - errcheck # Checks for unchecked errors in Go code
+    - errname # Checks that sentinel errors are prefixed with Err
+    - errorlint # Find code that will cause problems with error wrapping
+    - funlen # Checks for long functions
     - gocognit # Computes and checks the cognitive complexity of functions
     - gocritic # Provides diagnostics that check for bugs, performance and style issues
     - gocyclo # Computes and checks the cyclomatic complexity of functions
     - godot # Check if comments end in a period
-    - goerr113 # Golang linter to check the errors handling expressions
-    - gosimple # Linter for Go source code that specializes in simplifying a code
-    - govet # reports suspicious constructs, such as Printf calls with wrong arguments
+    - govet # Examines Go source code and reports suspicious constructs
+    - grouper # Analyze expression groups
+    - iface # Detect the incorrect use of interfaces
     - ineffassign # Detects when assignments to existing variables are not used
-    - maintidx # measures the maintainability index of each function
-    - makezero # Finds slice declarations with non-zero initial length
-    - misspell # Finds commonly misspelled English words in comments
-    - nakedret # Finds naked returns in functions
+    - intrange # Find places where for loops could use an integer range
+    - ireturn # Accept Interfaces, Return Concrete Types
+    - maintidx # Measures the maintainability index of each function
+    - makezero # Find slice declarations with non-zero initial length
+    - mirror # Reports wrong mirror patterns of bytes/strings usage
+    - misspell # Finds commonly misspelled English words
+    - modernize # Suggest simplifications using modern Go features
+    - nakedret # Finds naked returns in functions longer than a maximum size
     - nestif # Reports deeply nested if statements
-    - nilerr # Finds the code that returns nil even if it checks that the error is not nil
-    - nilnil # Checks that there is no simultaneous return of `nil` error and an invalid value
-    - prealloc # Finds slice declarations that could potentially be preallocated
-    - predeclared # find code that shadows one of Go's predeclared identifiers
-    - revive # drop-in replacement of golint
-    - staticcheck # drop-in replacement of go vet
-    - stylecheck # Stylecheck is a replacement for golint
-    - tenv # detects using os.Setenv instead of t.Setenv
-    - thelper # checks the consistency of test helpers
-    - tparallel # detects inappropriate usage of t.Parallel()
-    - typecheck # parses and type-checks Go code
+    - nilerr # Finds code that returns nil even if it checks that error is not nil
+    - nilnil # Checks that there is no simultaneous return of nil error and invalid value
+    - noctx # Detects missing usage of context.Context
+    - perfsprint # Checks that fmt.Sprintf can be replaced with a faster alternative
+    - prealloc # Find slice declarations that could be pre-allocated
+    - predeclared # Find code that shadows one of Go's predeclared identifiers
+    - reassign # Checks that package variables are not reassigned
+    - revive # Fast, configurable, extensible linter for Go
+    - staticcheck # Set of rules from staticcheck
+    - thelper # Detects test helpers which do not call t.Helper()
+    - tparallel # Detects inappropriate usage of t.Parallel()
     - unconvert # Remove unnecessary type conversions
     - unparam # Reports unused function parameters
     - unused # Checks Go code for unused constants, variables, functions and types
-    - usestdlibvars # detect the possibility to use variables/constants from the Go standard library
-    - wastedassign # finds wasted assignment statements
-    - whitespace # detects leading and trailing whitespace
-
-issues:
-  exclude-use-default: false
-  exclude-rules:
-    - linters:
-        - goerr113
-      text: "do not define dynamic errors"
+    - usestdlibvars # Detect the possibility to use variables/constants from stdlib
+    - wastedassign # Finds wasted assignment statements
+    - whitespace # Checks for unnecessary newlines
+    - wrapcheck # Checks that errors returned from external packages are wrapped
+  settings:
+    whitespace:
+      multi-if: true # Enforces newlines (or comments) after every multi-line if statement
+      multi-func: true # Enforces newlines (or comments) after every multi-line function signature
+  exclusions:
+    rules:
+      - linters:
+          - err113
+        text: do not define dynamic errors
+formatters:
+  enable:
+    - gci # Check if code and import statements are formatted, with additional rules
+    - gofmt # Check if the code is formatted according to 'gofmt' command
+    - goimports # Checks if the code and import statements are formatted according to the 'goimports' command

Makefile

@@ -1,3 +1,5 @@
+GOLANGCI_VERSION = v2.6.1
+
 help: ## show help, shown by default if no target is specified
 	@grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
@@ -15,4 +17,4 @@ test-coverage-web: test-coverage ## run unit tests and show test coverage in bro
 	go tool cover -html=.testCoverage
 
 install-linters: ## install all used linters
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.49.0
+	go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@${GOLANGCI_VERSION}

map.go

@@ -35,7 +35,7 @@ func (m *Map) Range(f func(key string, value interface{}) bool) {
 // UnmarshalJSON implements the json.Unmarshaler interface.
 func (m *Map) UnmarshalJSON(b []byte) error {
 	if err := json.Unmarshal(b, &m.Data); err != nil {
-		return err
+		return fmt.Errorf("failed to unmarshal orderedmap: %w", err)
 	}
 
 	m.rebuildKeys()

map_value.go

@@ -35,5 +35,9 @@ func (s *Entry) UnmarshalJSON(b []byte) error {
 
 // MarshalJSON implements the json.Marshaler interface.
 func (s *Entry) MarshalJSON() ([]byte, error) {
-	return json.Marshal(s.Value)
+	b, err := json.Marshal(s.Value)
+	if err != nil {
+		return nil, fmt.Errorf("marshalling entry: %w", err)
+	}
+	return b, nil
 }