✴️ Bump golang & lint (#52)

cardil · Copilot · web-flow · commit 26cee8690327 · 2025-07-02T10:37:43.000Z
* Bump golangci-lint

* golangci-lint 2.0 fixes

* Apply suggestions from code review

Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;

---------

Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -24,12 +24,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.24'
           cache: false
-      - uses: golangci/golangci-lint-action@v4
+      - uses: golangci/golangci-lint-action@v7
         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/.github/workflows/mage.yaml b/.github/workflows/mage.yaml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         go-version:
-          - '1.22'
+          - '1.24'
     steps:
 
       - name: Set up Go ${{ matrix.go-version }}
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,42 +1,41 @@
+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
+    - nonamedreturns
+  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/config/defaults.go b/pkg/config/defaults.go
@@ -37,7 +37,7 @@ func newDefaults(project Project) Config {
 			RefSpec: "v*",
 		},
 		ResyncReleases: ResyncReleases{
-			NumberOf: 6, //nolint:mnd,gomnd
+			NumberOf: 6, //nolint:mnd
 		},
 		Messages: Messages{
 			TriggerCI: ":robot: Synchronize branch `%s` to " +
diff --git a/pkg/errors/wrap.go b/pkg/errors/wrap.go
@@ -23,5 +23,11 @@ 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
+}
+
+// Join returns an error that wraps the given errors.
+// Any nil error values are discarded.
+func Join(err ...error) error {
+	return errors.Join(err...)
 }
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/checkout_test.go b/pkg/git/checkout_test.go
@@ -1,7 +1,6 @@
 package git_test
 
 import (
-	"context"
 	"slices"
 	"testing"
 
@@ -45,7 +44,7 @@ func TestCheckout_OntoWorkspace(t *testing.T) {
 		Branch: plumbing.NewBranchReferenceName("target"),
 	}))
 	repo := &git.Repository{
-		Context: context.TODO(),
+		Context: t.Context(),
 		Project: config.Project{
 			Path: projectPath,
 		},
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/github/client.go b/pkg/github/client.go
@@ -27,19 +27,24 @@ type Client struct {
 }
 
 // Execute a Github client CLI command.
-func (c Client) Execute(ctx context.Context) ([]byte, error) {
+func (c Client) Execute(ctx context.Context) (bytes []byte, err error) {
 	buildVersion := metadata.Version
 	cmdFactory := factory.New(buildVersion)
-	cmd, err := ghroot.NewCmdRoot(cmdFactory, buildVersion, "-")
-	if err != nil {
-		return nil, errors.Wrap(err, ErrClientFailed)
+	cmd, gerr := ghroot.NewCmdRoot(cmdFactory, buildVersion, "-")
+	if gerr != nil {
+		err = errors.Join(err, errors.Wrap(gerr, ErrClientFailed))
+		return bytes, err
 	}
 	cmd.SetArgs(c.Args)
 	tmpf, terr := os.CreateTemp("", "gh-")
 	if terr != nil {
-		return nil, errors.Wrap(terr, ErrClientFailed)
+		err = errors.Join(err, errors.Wrap(terr, ErrClientFailed))
+		return bytes, err
 	}
-	defer os.Remove(tmpf.Name())
+	defer func() {
+		rmerr := os.Remove(tmpf.Name())
+		err = errors.Join(err, errors.Wrap(rmerr, ErrClientFailed))
+	}()
 	cmdFactory.IOStreams.Out = tmpf
 	cmdFactory.IOStreams.ErrOut = os.Stderr
 	if c.DisableColor {
@@ -55,10 +60,10 @@ func (c Client) Execute(ctx context.Context) ([]byte, error) {
 				ErrClientFailed)
 		}
 	}
-	err = runner()
+	err = errors.Join(err, runner())
 	bytes, ferr := os.ReadFile(tmpf.Name())
 	if ferr != nil {
-		return nil, errors.Wrap(ferr, ErrClientFailed)
+		err = errors.Join(err, errors.Wrap(ferr, ErrClientFailed))
 	}
-	return bytes, errors.Wrap(err, ErrClientFailed)
+	return bytes, err
 }
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
diff --git a/pkg/sync/operation.go b/pkg/sync/operation.go
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`	`.`