chore: upgrade golangci-lint

Author: fabianburth

.golangci.yaml

@@ -1,116 +1,126 @@
+version: "2"
 run:
   go: "1.22"
-  timeout: 10m
   tests: false
   allow-parallel-runners: true
-linters-settings:
-  funlen:
-    lines: 150
-    statements: 60
-  cyclop:
-    max-complexity: 20
-    skip-tests: true
-  gosec:
-    exclude-generated: true
-  lll:
-    line-length: 150
-  misspell:
-    locale: US
-  nolintlint:
-    allow-unused: false
-    require-explanation: true
-    require-specific: false
-  varnamelen:
-    ignore-names:
-      - err
-      - wg
-      - fs
-      - id
-      - vm
-      - ns
-      - ip
-
-issues:
-  exclude-dirs:
-    - "./*/mock"
-  exclude-files:
-    - pkg/ocm/fakes/fakes.go
-    - pkg/cache/fakes/cache.go
-    - pkg/untar/untar.go
-  max-same-issues: 0
-  max-issues-per-linter: 0
-  exclude-rules:
-    - text: "should not use dot imports|don't use an underscore in package name"
-      linters:
-        - golint
-    - source: "https://"
-      linters:
-        - lll
-    - path: pkg/defaults/
-      linters:
-        - lll
-    - path: _test\.go
-      linters:
-        - goerr113
-        - gocyclo
-        - errcheck
-        - gosec
-        - dupl
-        - funlen
-        - scopelint
-        - testpackage
-        - goconst
-        - godox
-    - path: internal/version/
-      linters:
-        - gochecknoglobals
-    - path: internal/command/
-      linters:
-        - exhaustivestruct
-        - lll
-        - wrapcheck
-    - source: "// .* #\\d+"
-      linters:
-        - godox
-    - path: test/e2e/
-      linters:
-        - goerr113
-        - gomnd
-    # remove this once https://github.com/golangci/golangci-lint/issues/2649 is closed
-    - path: /
-      linters:
-        - typecheck
-
 linters:
-  enable-all: true
+  default: all
   disable:
-    - gci
+    - copyloopvar
     - depguard
-    - exhaustivestruct
-    - golint
-    - interfacer
-    - ireturn
-    - maligned
-    - nilnil
-    - scopelint
-    - tagliatelle
-    - gomoddirectives
-    - varcheck
-    - nosnakecase
-    - structcheck
-    - ifshort
-    - deadcode
+    - err113
+    - exhaustruct
     - forbidigo
-    - prealloc
+    - gochecknoglobals
     - gochecknoinits
-    - exhaustruct
-    - goerr113
+    - gomoddirectives
     - govet
+    - ireturn
+    - nilnil
     - nonamedreturns
+    - paralleltest
+    - perfsprint
+    - prealloc
+    - staticcheck
+    - tagliatelle
     - varnamelen
     - wrapcheck
-    - staticcheck
-    - gochecknoglobals
-    - paralleltest
     - wsl
-    - perfsprint
+    - funcorder
+    - recvcheck
+  settings:
+    cyclop:
+      max-complexity: 20
+    funlen:
+      lines: 150
+      statements: 60
+    lll:
+      line-length: 150
+    misspell:
+      locale: US
+    nolintlint:
+      require-explanation: true
+      require-specific: false
+      allow-unused: false
+    varnamelen:
+      ignore-names:
+        - err
+        - wg
+        - fs
+        - id
+        - vm
+        - ns
+        - ip
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - golint
+        text: should not use dot imports|don't use an underscore in package name
+      - linters:
+          - lll
+        source: https://
+      - linters:
+          - lll
+        path: pkg/defaults/
+      - linters:
+          - dupl
+          - err113
+          - errcheck
+          - funlen
+          - goconst
+          - gocyclo
+          - godox
+          - gosec
+          - scopelint
+          - testpackage
+        path: _test\.go
+      - linters:
+          - gochecknoglobals
+        path: internal/version/
+      - linters:
+          - exhaustivestruct
+          - lll
+          - wrapcheck
+        path: internal/command/
+      - linters:
+          - godox
+        source: '// .* #\d+'
+      - linters:
+          - err113
+          - mnd
+        path: test/e2e/
+      - linters:
+          - cyclop
+        path: (.+)_test\.go
+    paths:
+      - pkg/ocm/fakes/fakes.go
+      - pkg/cache/fakes/cache.go
+      - pkg/untar/untar.go
+      - ./*/mock
+      - third_party$
+      - builtin$
+      - examples$
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - pkg/ocm/fakes/fakes.go
+      - pkg/cache/fakes/cache.go
+      - pkg/untar/untar.go
+      - ./*/mock
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -155,7 +155,7 @@ KUSTOMIZE_VERSION ?= v3.8.7
 CONTROLLER_TOOLS_VERSION ?= v0.14.0
 GEN_API_REF_DOCS_VERSION ?= e327d0730470cbd61b06300f81c5fcf91c23c113
 MKCERT_VERSION ?= v1.4.4
-GOLANGCI_LINT_VERSION ?= v1.57.2
+GOLANGCI_LINT_VERSION ?= v2.1.1
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize

controllers/configuration_strat_merge_patch.go

@@ -13,6 +13,10 @@ import (
 	kustypes "sigs.k8s.io/kustomize/api/types"
 )
 
+const (
+	FSOwnerReadWrite = 0o600
+)
+
 // the following is influenced by https://github.com/fluxcd/kustomize-controller
 func (m *MutationReconcileLooper) strategicMergePatch(
 	resource []byte,
@@ -53,7 +57,7 @@ func (m *MutationReconcileLooper) strategicMergePatch(
 	}
 
 	kustomize := filepath.Join(workDir, "kustomization.yaml")
-	err = os.WriteFile(kustomize, manifest, os.ModePerm)
+	err = os.WriteFile(kustomize, manifest, FSOwnerReadWrite)
 	if err != nil {
 		return "", err
 	}

controllers/spifftemplatedoc.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"container/list"
 	"fmt"
+	"math"
 
 	"github.com/mikefarah/yq/v4/pkg/yqlib"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm/utils/localize"
@@ -33,6 +34,9 @@ func makeYqNode(docBytes []byte, fileName string, docIndex, fileIndex uint) (*yq
 
 	ret.SetDocument(docIndex)
 	ret.SetFilename(fileName)
+	if fileIndex > math.MaxInt {
+		return nil, fmt.Errorf("file index value would cause integer overflow: %d", fileIndex)
+	}
 	ret.SetFileIndex(int(fileIndex))
 
 	return ret, nil

internal/wasm/io/write.go

@@ -2,6 +2,7 @@ package io
 
 import (
 	"context"
+	"math"
 
 	wasmerr "github.com/open-component-model/ocm-controller/pkg/wasm/errors"
 	"github.com/tetratelabs/wazero/api"
@@ -27,6 +28,9 @@ func Write(ctx context.Context, m api.Module, data []byte) (result uint64) {
 		}
 	}()
 
+	if ptr > math.MaxUint32 {
+		return wasmerr.ErrWrite
+	}
 	if !mem.Write(uint32(ptr), data) {
 		return wasmerr.ErrWrite
 	}