Use stdlib errors.Join instead of go-multierror

Use error wrapping from the errors standard library package instead of the 3rd party go-multierror package to join multiple errors. Signed-off-by: Tobias Klauser <[email protected]>
cilium · Nov 27, 2023 · de55dde · de55dde
1 parent 40a9124
commit de55dde
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 1,486 deletions.
diff --git a/go.mod b/go.mod
@@ -1,10 +1,9 @@
 module github.com/cilium/little-vm-helper
 
-go 1.18
+go 1.20
 
 require (
 	github.com/go-git/go-git/v5 v5.10.0
-	github.com/hashicorp/go-multierror v1.1.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.8.4
@@ -23,7 +22,6 @@ require (
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect

diff --git a/go.sum b/go.sum
@@ -32,11 +32,6 @@ github.com/go-git/go-git/v5 v5.10.0/go.mod h1:1FOZ/pQnqw24ghP2n7cunVl0ON55BsjPYv
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=

diff --git a/pkg/kernels/dir.go b/pkg/kernels/dir.go
@@ -6,14 +6,14 @@ package kernels
 import (
 	"bufio"
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
 	"regexp"
 	"runtime"
 
 	"github.com/cilium/little-vm-helper/pkg/logcmd"
-	"github.com/hashicorp/go-multierror"
 	"github.com/sirupsen/logrus"
 )
 
@@ -109,8 +109,9 @@ func kcfonfigValidate(opts []ConfigOption) error {
 		optMap[opt] = mapVal
 
 		if mapVal.enabled != optEnabled {
-			err := fmt.Errorf("value %s misconfigured: expected: %t but seems to be %t based on '%s'", opt, mapVal.enabled, optEnabled, txt)
-			ret = multierror.Append(ret, err)
+			ret = errors.Join(ret,
+				fmt.Errorf("value %s misconfigured: expected: %t but seems to be %t based on '%s'",
+					opt, mapVal.enabled, optEnabled, txt))
 		}
 
 	}
@@ -121,8 +122,7 @@ func kcfonfigValidate(opts []ConfigOption) error {
 
 	for i, v := range optMap {
 		if v.enabled && !v.checked {
-			err := fmt.Errorf("value %s enabled but not found", i)
-			ret = multierror.Append(ret, err)
+			ret = errors.Join(ret, fmt.Errorf("value %s enabled but not found", i))
 		}
 	}
 

diff --git a/pkg/kernels/git.go b/pkg/kernels/git.go
@@ -5,13 +5,13 @@ package kernels
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
 
 	"github.com/cilium/little-vm-helper/pkg/logcmd"
 
-	"github.com/hashicorp/go-multierror"
 	"github.com/sirupsen/logrus"
 )
 
@@ -116,7 +116,7 @@ func gitRemoveWorkdir(ctx context.Context, log logrus.FieldLogger, arg *gitRemov
 		arg.workDir,
 	}
 	if err := logcmd.RunAndLogCommandContext(ctx, log, GitBinary, worktreeRemoveArgs...); err != nil {
-		multierror.Append(res, fmt.Errorf("did not remove worktree: %w", err))
+		res = errors.Join(res, fmt.Errorf("did not remove worktree: %w", err))
 	}
 
 	remoteRemoveArgs := []string{
@@ -125,7 +125,7 @@ func gitRemoveWorkdir(ctx context.Context, log logrus.FieldLogger, arg *gitRemov
 		arg.remoteName,
 	}
 	if err := logcmd.RunAndLogCommandContext(ctx, log, GitBinary, remoteRemoveArgs...); err != nil {
-		multierror.Append(res, fmt.Errorf("did not remove remote: %w", err))
+		res = errors.Join(res, fmt.Errorf("did not remove remote: %w", err))
 	}
 
 	branchRemoveArgs := []string{
@@ -134,7 +134,7 @@ func gitRemoveWorkdir(ctx context.Context, log logrus.FieldLogger, arg *gitRemov
 		arg.localBranch,
 	}
 	if err := logcmd.RunAndLogCommandContext(ctx, log, GitBinary, branchRemoveArgs...); err != nil {
-		multierror.Append(res, fmt.Errorf("did not remove local branch: %w", err))
+		res = errors.Join(res, fmt.Errorf("did not remove local branch: %w", err))
 	}
 
 	return res