feat: replace multierr with errors.Join

Author: prskr

cmd/imctl/check.go

@@ -17,7 +17,6 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/valyala/bytebufferpool"
-	"go.uber.org/multierr"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 
@@ -246,7 +245,9 @@ func addCACertToPool(pool *x509.CertPool) (err error) {
 		return err
 	}
 
-	defer multierr.AppendInvoke(&err, multierr.Close(reader))
+	defer func() {
+		err = errors.Join(err, reader.Close())
+	}()
 
 	if _, err = io.Copy(buffer, reader); err != nil {
 		return err

cmd/inetmock/serve.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/soheilhy/cmux"
 	"github.com/spf13/cobra"
-	"go.uber.org/multierr"
 	"go.uber.org/zap"
 
 	"inetmock.icb4dc0.de/inetmock/internal/endpoint"
@@ -56,7 +55,7 @@ var (
 		},
 		PostRunE: func(*cobra.Command, []string) (err error) {
 			for idx := range toClose {
-				err = multierr.Append(err, toClose[idx].Close())
+				err = errors.Join(err, toClose[idx].Close())
 			}
 			return
 		},

go.mod

@@ -1,6 +1,6 @@
 module inetmock.icb4dc0.de/inetmock
 
-go 1.19
+go 1.20
 
 require (
 	github.com/DataDog/ebpf-manager v0.1.0
@@ -32,7 +32,6 @@ require (
 	github.com/valyala/bytebufferpool v1.0.0
 	github.com/valyala/tcplisten v1.0.0
 	github.com/vmihailenco/msgpack/v5 v5.3.5
-	go.uber.org/multierr v1.9.0
 	go.uber.org/zap v1.24.0
 	golang.org/x/exp v0.0.0-20230124195608-d38c7dcee874
 	golang.org/x/net v0.5.0
@@ -43,6 +42,14 @@ require (
 	gotest.tools/gotestsum v1.9.0
 )
 
+replace (
+	github.com/containerd/containerd => github.com/containerd/containerd v1.6.15
+	github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch
+	github.com/google/gopacket => github.com/baez90/gopacket v1.1.20-0.20220314074627-3272f0ec1510
+	golang.org/x/text => golang.org/x/text v0.6.0
+	gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0
+)
+
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/DataDog/gopsutil v1.2.2 // indirect
@@ -112,6 +119,7 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/goleak v1.2.0 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/mod v0.7.0 // indirect
 	golang.org/x/sys v0.4.0 // indirect
 	golang.org/x/term v0.4.0 // indirect
@@ -124,10 +132,4 @@ require (
 	gotest.tools/v3 v3.4.0 // indirect
 )
 
-replace (
-	github.com/containerd/containerd => github.com/containerd/containerd v1.6.15
-	github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch
-	github.com/google/gopacket => github.com/baez90/gopacket v1.1.20-0.20220314074627-3272f0ec1510
-	golang.org/x/text => golang.org/x/text v0.6.0
-	gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0
-)
+

internal/app/mock/app.mock.go

@@ -2,14 +2,14 @@ package endpoint
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net"
 	"sort"
 	"sync"
 	"time"
 
 	"github.com/soheilhy/cmux"
-	"go.uber.org/multierr"
 )
 
 const (
@@ -224,7 +224,7 @@ func (le ListenerEndpoint) Close(ctx context.Context) (err error) {
 		err = stoppable.Stop(ctx)
 	}
 
-	return multierr.Append(err, le.Uplink.Close())
+	return errors.Join(err, le.Uplink.Close())
 }
 
 func groupEndpoints(endpoints map[string]*ListenerEndpoint, predicate func(s *ListenerEndpoint) bool) (*Group, error) {

internal/endpoint/listener_group.go

@@ -1,10 +1,9 @@
 package endpoint
 
 import (
+	"errors"
 	"net"
 	"time"
-
-	"go.uber.org/multierr"
 )
 
 func NewUplink(conn any) (u Uplink) {
@@ -45,11 +44,11 @@ func (u *Uplink) Close() (err error) {
 		return nil
 	}
 	if u.Listener != nil {
-		multierr.AppendInvoke(&err, multierr.Close(u.Listener))
+		err = errors.Join(err, u.Listener.Close())
 		u.Listener = nil
 	}
 	if u.PacketConn != nil {
-		err = multierr.Combine(err, u.PacketConn.SetDeadline(time.Now()), u.PacketConn.Close())
+		err = errors.Join(err, u.PacketConn.SetDeadline(time.Now()), u.PacketConn.Close())
 		u.PacketConn = nil
 	}
 	return