Merge pull request #11 from tetratelabs/errors

Remove multierror dependency

.github/workflows/ci.yaml

@@ -11,17 +11,15 @@ jobs:
     strategy:
       matrix:
         go-version:
-          - 1.16.x
-          - 1.17.x
-          - 1.18.x
-          - 1.19.x
           - 1.20.x
+          - 1.21.x
+          - 1.22.x
         os:
           - ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
       - run: go test ./...

example_group_test.go

@@ -20,8 +20,6 @@ import (
 	"os"
 
 	"github.com/spf13/pflag"
-	"github.com/tetratelabs/multierror"
-
 	"github.com/tetratelabs/run"
 	"github.com/tetratelabs/run/pkg/signal"
 )
@@ -75,18 +73,17 @@ func (p *PersonService) FlagSet() *pflag.FlagSet {
 // Validate implements run.Config and thus its configuration and flag handling
 // is automatically registered when adding the service to Group.
 func (p PersonService) Validate() error {
-	var err error
+	var errs []error
 	if p.name == "" {
-		err = multierror.Append(err, errors.New("invalid name provided"))
+		errs = append(errs, errors.New("invalid name provided"))
 	}
 	if p.age < 18 {
-		err = multierror.Append(err, errors.New("invalid age provided, we don't serve minors"))
+		errs = append(errs, errors.New("invalid age provided, we don't serve minors"))
 	}
 	if p.age > 110 {
-		err = multierror.Append(err, errors.New("faking it? or life expectancy assumptions surpassed by future healthcare system"))
+		errs = append(errs, errors.New("faking it? or life expectancy assumptions surpassed by future healthcare system"))
 	}
-
-	return err
+	return errors.Join(errs...)
 }
 
 // PreRun implements run.PreRunner and thus this method is run at the pre-run

go.mod

@@ -5,8 +5,5 @@ go 1.17
 require (
 	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/spf13/pflag v1.0.5
-	github.com/tetratelabs/multierror v1.1.0
 	github.com/tetratelabs/telemetry v0.7.1
 )
-
-require github.com/hashicorp/errwrap v1.0.0 // indirect

go.sum

@@ -1,10 +1,6 @@
-github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/tetratelabs/multierror v1.1.0 h1:cKmV/Pbf42K5wp8glxa2YIausbxIraPN8fzru9Pn1Cg=
-github.com/tetratelabs/multierror v1.1.0/go.mod h1:kH3SzI/z+FwEbV9bxQDx4GiIgE2djuyb8wiB2DaUBnY=
 github.com/tetratelabs/telemetry v0.7.1 h1:IiDiiZgShKlHjPFgCAE6ZD4URH3r8yj7SDAEN/ImHYA=
 github.com/tetratelabs/telemetry v0.7.1/go.mod h1:jDUcf1A2u4F5V1io5RdipM/bKz/hFCsx/RAgGopC37s=

group.go

@@ -29,7 +29,6 @@ import (
 
 	color "github.com/logrusorgru/aurora"
 	"github.com/spf13/pflag"
-	"github.com/tetratelabs/multierror"
 	"github.com/tetratelabs/telemetry"
 
 	"github.com/tetratelabs/run/pkg/log"
@@ -339,9 +338,8 @@ func (g *Group) RunConfig(args ...string) (err error) {
 	g.HelpText = strings.ReplaceAll(g.HelpText, BinaryName, os.Args[0])
 
 	defer func() {
-		if err != nil && err != ErrBailEarlyRequest {
+		if err != nil && !errors.Is(err, ErrBailEarlyRequest) {
 			g.Logger.Error("unexpected exit", err)
-			err = multierror.SetFormatter(err, multierror.ListFormatFunc)
 		}
 	}()
 
@@ -464,6 +462,7 @@ func (g *Group) RunConfig(args ...string) (err error) {
 	}
 
 	// Validate Config inputs
+	var errs []error
 	for idx, cfg := range g.c {
 		func(itemNr int, cfg Config) {
 			// a Config might have been de-registered during Run
@@ -482,14 +481,14 @@ func (g *Group) RunConfig(args ...string) (err error) {
 			defer l.Debug("validate-exit", debugLogError(vErr)...)
 			vErr = cfg.Validate()
 			if vErr != nil {
-				err = multierror.Append(err, vErr)
+				errs = append(errs, vErr)
 			}
 		}(idx+1, cfg)
 	}
 
 	// exit on at least one Validate error
-	if err != nil {
-		return err
+	if len(errs) > 0 {
+		return fmt.Errorf("%d errors occured:\n%w", len(errs), errors.Join(errs...))
 	}
 
 	// log binary name and version
@@ -539,7 +538,7 @@ func (g *Group) Run(args ...string) (err error) {
 	if !g.configured {
 		// run config registration and flag parsing stages
 		if err = g.RunConfig(args...); err != nil {
-			if err == ErrBailEarlyRequest {
+			if errors.Is(err, ErrBailEarlyRequest) {
 				return nil
 			}
 			return err
@@ -571,7 +570,6 @@ func (g *Group) Run(args ...string) (err error) {
 		}
 		// actual fatal error
 		g.Logger.Error("unexpected exit", err)
-		err = multierror.SetFormatter(err, multierror.ListFormatFunc)
 	}()
 
 	// call our Initializer (again)

group_test.go

@@ -22,8 +22,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/tetratelabs/multierror"
-
 	"github.com/tetratelabs/run"
 	"github.com/tetratelabs/run/pkg/test"
 )
@@ -114,11 +112,7 @@ func TestRunGroupMultiErrorHandling(t *testing.T) {
 		err1 = errors.New("cfg1 failed")
 		err2 = errors.New("cfg2 failed")
 		err3 = errors.New("cfg3 failed")
-
-		mErr = multierror.SetFormatter(
-			multierror.Append(nil, err1, err2, err3),
-			multierror.ListFormatFunc,
-		)
+		mErr = fmt.Errorf("3 errors occured:\n%w", errors.Join(err1, err2, err3))
 
 		cfg1 = failingConfig{e: err1}
 		cfg2 = failingConfig{e: err2}