Bump golangci-lint

cardil · cardil · commit f3ca8e0c44e6 · 2025-07-02T12:15:40.000+02:00
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -29,7 +29,7 @@ jobs:
       - uses: golangci/golangci-lint-action@v4
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.57.2
+          version: v2.0.2
 
   editorconfig:
     name: EditorConfig
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,42 +1,40 @@
+version: "2"
 run:
-  timeout: 5m
   build-tags:
     - e2e
     - mage
     - ignored
-
 linters:
-  disable-all: false
-  presets:
-    - bugs
-    - unused
-    - complexity
-    - format
-    - performance
-    - style
-  enable:
-    - gci
+  default: all
   disable:
-    - paralleltest
-    - nlreturn
-    - wsl
+    - containedctx
+    - depguard
+    - exhaustruct
     - godox
     - ireturn
+    - nlreturn
+    - paralleltest
     - varnamelen
-    - exhaustruct
-    - depguard
-    - containedctx # TODO: consider removing this
-
-issues:
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - wrapcheck
-
-linters-settings:
-  wrapcheck:
-    ignorePackageGlobs:
-      - github.com/openshift-knative/hack/*
-  gomoddirectives:
-    # List of allowed `replace` directives. Default is empty.
-    replace-allow-list: []
+    - wsl
+  settings:
+    wrapcheck:
+      ignore-package-globs:
+        - github.com/openshift-knative/hack/*
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+    rules:
+      - linters:
+          - wrapcheck
+        path: _test\.go
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
diff --git a/build/Magefile.go b/build/Magefile.go
@@ -32,7 +32,7 @@ func init() { //nolint:gochecknoinits
 			Resolver: git.NewVersionResolver(),
 		},
 		Artifacts: []config.Artifact{bin},
-		Checks:    []config.Task{checks.GolangCiLint(withVersion("v1.57.2"))},
+		Checks:    []config.Task{checks.GolangCiLint(withVersion("v2.0.2"))},
 	})
 }
 
diff --git a/build/go.mod b/build/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift-knative/deviate/build
 
-go 1.22.9
+go 1.24.0
 
 require (
 	github.com/openshift-knative/deviate v0.0.0
diff --git a/build/go.sum b/build/go.sum
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift-knative/deviate
 
-go 1.22.9
+go 1.24.0
 
 require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
diff --git a/go.work b/go.work
@@ -1,4 +1,4 @@
-go 1.22.9
+go 1.24.0
 
 use (
 	.
diff --git a/pkg/errors/wrap.go b/pkg/errors/wrap.go
@@ -23,5 +23,5 @@ func Is(err, target error) bool {
 
 // New returns an error that formats as the given text.
 func New(text string) error {
-	return errors.New(text) //nolint:goerr113
+	return errors.New(text) //nolint:err113
 }
diff --git a/pkg/git/auth.go b/pkg/git/auth.go
@@ -11,7 +11,8 @@ import (
 
 func authentication(remote git.Remote) (ssh.AuthMethod, error) { //nolint:ireturn
 	if url.IsHTTP(remote.URL) {
-		return nil, nil
+		// The auth isn't required for getting HTTP remote from GH
+		return nil, nil //nolint:nilnil
 	}
 	if sshagent.Available() {
 		user := ""
diff --git a/pkg/git/checkout.go b/pkg/git/checkout.go
@@ -89,7 +89,7 @@ func (o onGoingCheckout) As(branch string) error {
 
 func (o onGoingCheckout) OntoWorkspace(filters files.Filters) error {
 	coOpts := &gitv5.CloneOptions{
-		URL:           "file://" + o.repo.Project.Path,
+		URL:           "file://" + o.repo.Path,
 		ReferenceName: plumbing.NewBranchReferenceName(o.branch),
 		SingleBranch:  true,
 		Depth:         1,
diff --git a/pkg/git/commit.go b/pkg/git/commit.go
@@ -8,7 +8,7 @@ import (
 )
 
 func (r Repository) CommitChanges(message string) (*object.Commit, error) {
-	wt, err := r.Repository.Worktree()
+	wt, err := r.Worktree()
 	if err != nil {
 		return nil, errors.Wrap(err, ErrLocalOperationFailed)
 	}
diff --git a/pkg/git/fetch.go b/pkg/git/fetch.go
@@ -14,7 +14,7 @@ func (r Repository) Fetch(remote git.Remote) error {
 	if err != nil {
 		return err
 	}
-	if err = r.Repository.FetchContext(r.Context, &gitv5.FetchOptions{
+	if err = r.FetchContext(r.Context, &gitv5.FetchOptions{
 		RemoteName: remote.Name,
 		Auth:       auth,
 	}); !errors.Is(err, gitv5.NoErrAlreadyUpToDate) {
diff --git a/pkg/git/merge.go b/pkg/git/merge.go
@@ -33,13 +33,13 @@ func (r Repository) Merge(remote *git.Remote, branch string) error {
 		targetBranch = fmt.Sprintf("%s/%s", remote.Name, branch)
 	}
 	// TODO: Consider rewriting this to Go native code.
-	err = pkgfiles.WithinDirectory(r.Project.Path, func() error {
+	err = pkgfiles.WithinDirectory(r.Path, func() error {
 		return errors.Wrap(sh.Run("git", "merge", "--commit",
 			"--quiet", "--log", "-m", "Merge "+targetBranch, targetBranch),
 			ErrRemoteOperationFailed)
 	})
 	if err != nil {
-		_ = pkgfiles.WithinDirectory(r.Project.Path, func() error {
+		_ = pkgfiles.WithinDirectory(r.Path, func() error {
 			return sh.Run("git", "merge", "--abort")
 		})
 		return errors.Wrap(err, ErrRemoteOperationFailed)
diff --git a/pkg/git/remote.go b/pkg/git/remote.go
@@ -40,7 +40,7 @@ func (r Repository) Remote(name string) (string, error) {
 func (r Repository) ensureRemote(remote git.Remote) error {
 	_, err := r.Repository.Remote(remote.Name)
 	if errors.Is(err, gitv5.ErrRemoteNotFound) {
-		_, err = r.Repository.CreateRemote(&config.RemoteConfig{
+		_, err = r.CreateRemote(&config.RemoteConfig{
 			Name: remote.Name,
 			URLs: []string{remote.URL},
 		})
diff --git a/pkg/log/labeled.go b/pkg/log/labeled.go
@@ -19,7 +19,7 @@ func (l LabeledLogger) Printf(format string, v ...interface{}) {
 func prependText(text string, v []interface{}) []interface{} {
 	vars := make([]interface{}, len(v)+1)
 	vars[0] = text
-	for i := 0; i < len(v); i++ {
+	for i := range v {
 		vars[i+1] = v[i]
 	}
 	return vars
diff --git a/pkg/sync/apply_patches.go b/pkg/sync/apply_patches.go
@@ -13,7 +13,7 @@ import (
 
 func (o Operation) applyPatches() error {
 	o.Println("- Apply patches if present")
-	patchesDir := path.Join(o.Project.Path, "openshift", "patches")
+	patchesDir := path.Join(o.Path, "openshift", "patches")
 	files, err := os.ReadDir(patchesDir)
 	if err != nil {
 		o.Println("-- No patches found")
@@ -28,7 +28,7 @@ func (o Operation) applyPatches() error {
 		o.Printf("-- Applying %s\n", color.Blue(filePath))
 
 		// TODO: Consider rewriting this to Go native code instead shell invocation.
-		err = pkgfiles.WithinDirectory(o.Project.Path, func() error {
+		err = pkgfiles.WithinDirectory(o.Path, func() error {
 			return errors.Wrap(sh.Run("git", "apply", filePath),
 				ErrSyncFailed)
 		})
diff --git a/pkg/sync/create_pr.go b/pkg/sync/create_pr.go
@@ -11,10 +11,10 @@ import (
 )
 
 func (o Operation) createSyncReleaseNextPR() error {
-	branches := o.Config.Branches
+	branches := o.Branches
 	return o.createPR(
 		o.triggerCIMessage(),
-		fmt.Sprintf(o.Config.Messages.TriggerCIBody, branches.ReleaseNext, branches.Main),
+		fmt.Sprintf(o.TriggerCIBody, branches.ReleaseNext, branches.Main),
 		branches.ReleaseNext,
 		branches.CheckPrPrefix+branches.ReleaseNext,
 	)
@@ -59,12 +59,12 @@ func (c createPR) active() (*string, error) {
 		"--search", c.title,
 		"--json", "url",
 	}
-	for _, label := range c.Config.SyncLabels {
+	for _, label := range c.SyncLabels {
 		args = append(args, "--label", label)
 	}
 	cl := github.NewClient(args...)
 	cl.DisableColor = true
-	cl.ProjectDir = c.Project.Path
+	cl.ProjectDir = c.Path
 	buff, err := cl.Execute(c.Context)
 	if err != nil {
 		return nil, errors.Wrap(err, ErrSyncFailed)
@@ -95,18 +95,18 @@ func (c createPR) open() error {
 		"--base", c.base,
 		"--head", c.head,
 	}
-	for _, label := range c.Config.SyncLabels {
+	for _, label := range c.SyncLabels {
 		args = append(args, "--label", label)
 	}
 	cl := github.NewClient(args...)
-	cl.ProjectDir = c.Project.Path
+	cl.ProjectDir = c.Path
 	buff, err := cl.Execute(c.Context)
 	defer c.Println("Github client:", buff)
 	return errors.Wrap(err, ErrSyncFailed)
 }
 
 func (c createPR) repository() (string, error) {
-	addr, err := git.ParseAddress(c.Config.Downstream)
+	addr, err := git.ParseAddress(c.Downstream)
 	if err != nil {
 		return "", errors.Wrap(err, ErrSyncFailed)
 	}
diff --git a/pkg/sync/fork_files.go b/pkg/sync/fork_files.go
@@ -17,8 +17,8 @@ func (o Operation) addForkFiles(rel release) step {
 
 func (o Operation) unpackForkOntoWorkspace() error {
 	o.Println("- Add fork's files")
-	upstream := git.Remote{Name: "upstream", URL: o.Config.Upstream}
+	upstream := git.Remote{Name: "upstream", URL: o.Upstream}
 	err := o.Repository.Checkout(upstream, o.Config.Branches.Main).
-		OntoWorkspace(o.Config.CopyFromMidstream)
+		OntoWorkspace(o.CopyFromMidstream)
 	return errors.Wrap(err, ErrSyncFailed)
 }
diff --git a/pkg/sync/generate_images.go b/pkg/sync/generate_images.go
@@ -12,7 +12,7 @@ import (
 
 func (o Operation) generateImages(rel release) step {
 	return func() error {
-		params := o.Config.DockerfileGen
+		params := o.DockerfileGen
 		if params.Skip {
 			o.Println("- Skipping image generation")
 			return nil
diff --git a/pkg/sync/mirror_branches.go b/pkg/sync/mirror_branches.go
@@ -105,14 +105,14 @@ func (o Operation) findMissingDownstreamReleases() ([]release, error) {
 }
 
 func (o Operation) listReleases(upstream bool) ([]release, error) {
-	url := o.Config.Downstream
-	re := regexp.MustCompile(o.Config.Branches.Searches.DownstreamReleases)
+	url := o.Downstream
+	re := regexp.MustCompile(o.DownstreamReleases)
 	if upstream {
-		url = o.Config.Upstream
-		re = regexp.MustCompile(o.Config.Branches.Searches.UpstreamReleases)
+		url = o.Upstream
+		re = regexp.MustCompile(o.UpstreamReleases)
 	}
 
-	refs, err := o.Repository.ListRemote(git.Remote{Name: "origin", URL: url})
+	refs, err := o.ListRemote(git.Remote{Name: "origin", URL: url})
 	if err != nil {
 		return nil, errors.Wrap(err, ErrSyncFailed)
 	}
diff --git a/pkg/sync/mirror_release.go b/pkg/sync/mirror_release.go
@@ -22,15 +22,15 @@ func (o Operation) mirrorRelease(rel release) error {
 
 func (o Operation) createNewRelease(rel release) step {
 	o.Printf("- Creating new release: %s\n", color.Blue(rel.String()))
-	upstream := git.Remote{Name: "upstream", URL: o.Config.Upstream}
+	upstream := git.Remote{Name: "upstream", URL: o.Upstream}
 	cnr := createNewRelease{State: o.State, rel: rel, remote: upstream}
 	return cnr.step
 }
 
 func (o Operation) pushRelease(rel release) step {
 	return func() error {
 		o.Printf("- Publishing release: %s\n", color.Blue(rel.String()))
-		branch, err := rel.Name(o.Config.ReleaseTemplates.Downstream)
+		branch, err := rel.Name(o.ReleaseTemplates.Downstream)
 		if err != nil {
 			return errors.Wrap(err, ErrSyncFailed)
 		}
@@ -46,11 +46,11 @@ type createNewRelease struct {
 }
 
 func (r createNewRelease) step() error {
-	upstreamBranch, err := r.rel.Name(r.Config.ReleaseTemplates.Upstream)
+	upstreamBranch, err := r.rel.Name(r.ReleaseTemplates.Upstream)
 	if err != nil {
 		return errors.Wrap(err, ErrSyncFailed)
 	}
-	downstreamBranch, err := r.rel.Name(r.Config.ReleaseTemplates.Downstream)
+	downstreamBranch, err := r.rel.Name(r.ReleaseTemplates.Downstream)
 	if err != nil {
 		return errors.Wrap(err, ErrSyncFailed)
 	}
@@ -61,7 +61,7 @@ func (r createNewRelease) step() error {
 }
 
 func (r createNewRelease) fetch() error {
-	return errors.Wrap(r.Repository.Fetch(r.remote), ErrSyncFailed)
+	return errors.Wrap(r.Fetch(r.remote), ErrSyncFailed)
 }
 
 func (r createNewRelease) checkoutAsNewRelease(upstreamBranch, downstreamBranch string) step {
@@ -90,18 +90,18 @@ func (p push) push() error {
 }
 
 func (p push) delete() error {
-	return errors.Wrap(p.Repository.DeleteBranch(p.branch), ErrSyncFailed)
+	return errors.Wrap(p.DeleteBranch(p.branch), ErrSyncFailed)
 }
 
 func publish(state state.State, title string, refName plumbing.ReferenceName) error {
-	if state.Config.DryRun {
-		state.Logger.Println(color.Yellow(fmt.Sprintf(
+	if state.DryRun {
+		state.Println(color.Yellow(fmt.Sprintf(
 			"- Skipping %s, because of dry run", title)))
 		return nil
 	}
 	remote := git.Remote{
 		Name: "downstream",
-		URL:  state.Config.Downstream,
+		URL:  state.Downstream,
 	}
-	return errors.Wrap(state.Repository.Push(remote, refName), ErrSyncFailed)
+	return errors.Wrap(state.Push(remote, refName), ErrSyncFailed)
 }
diff --git a/pkg/sync/operation.go b/pkg/sync/operation.go
@@ -31,21 +31,21 @@ func (o Operation) Run() error {
 }
 
 func (o Operation) switchToMain() error {
-	downstream := git.Remote{Name: "downstream", URL: o.Config.Downstream}
-	err := o.Repository.Fetch(downstream)
+	downstream := git.Remote{Name: "downstream", URL: o.Downstream}
+	err := o.Fetch(downstream)
 	if err != nil {
 		return errors.Wrap(err, ErrSyncFailed)
 	}
 	return errors.Wrap(
-		o.Repository.Checkout(downstream, o.Config.Main).As(o.Config.Main),
+		o.Repository.Checkout(downstream, o.Config.Main).As(o.Main),
 		ErrSyncFailed,
 	)
 }
 
 func (o Operation) commitChanges(message string) step {
 	return func() error {
 		o.Println("- Committing changes:", message)
-		commit, err := o.Repository.CommitChanges(message)
+		commit, err := o.CommitChanges(message)
 		if err != nil {
 			if errors.Is(err, gitv5.NoErrAlreadyUpToDate) {
 				o.Println("-- No changes to commit")
@@ -62,7 +62,7 @@ func (o Operation) commitChanges(message string) step {
 }
 
 func (o Operation) syncTags() error {
-	refName := plumbing.NewTagReferenceName(o.Config.Tags.RefSpec)
+	refName := plumbing.NewTagReferenceName(o.RefSpec)
 	o.Println("- Syncing tags:", color.Blue(refName))
 	return publish(o.State, "tag synchronization", refName)
 }
diff --git a/pkg/sync/remove_unwanted_upstream_files.go b/pkg/sync/remove_unwanted_upstream_files.go
diff --git a/pkg/sync/reset_release_next.go b/pkg/sync/reset_release_next.go
diff --git a/pkg/sync/resync_releases.go b/pkg/sync/resync_releases.go
diff --git a/pkg/sync/sync_release_next.go b/pkg/sync/sync_release_next.go
diff --git a/pkg/sync/trigger_ci.go b/pkg/sync/trigger_ci.go

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func init() { //nolint:gochecknoinits`
`32`	`32`	`Resolver: git.NewVersionResolver(),`
`33`	`33`	`},`
`34`	`34`	`Artifacts: []config.Artifact{bin},`
`35`		`- Checks: []config.Task{checks.GolangCiLint(withVersion("v1.57.2"))},`
	`35`	`+ Checks: []config.Task{checks.GolangCiLint(withVersion("v2.0.2"))},`
`36`	`36`	`})`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-go 1.22.9`
	`1`	`+go 1.24.0`
`2`	`2`
`3`	`3`	`use (`
`4`	`4`	`.`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ func Is(err, target error) bool {`
`23`	`23`
`24`	`24`	`// New returns an error that formats as the given text.`
`25`	`25`	`func New(text string) error {`
`26`		`- return errors.New(text) //nolint:goerr113`
	`26`	`+ return errors.New(text) //nolint:err113`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ import (`
`11`	`11`
`12`	`12`	`func authentication(remote git.Remote) (ssh.AuthMethod, error) { //nolint:ireturn`
`13`	`13`	`if url.IsHTTP(remote.URL) {`
`14`		`- return nil, nil`
	`14`	`+ // The auth isn't required for getting HTTP remote from GH`
	`15`	`+ return nil, nil //nolint:nilnil`
`15`	`16`	`}`
`16`	`17`	`if sshagent.Available() {`
`17`	`18`	`user := ""`