estargz: deprecate errorutil in favor of native errors.Join

Commit cf6d7a0 introduced this package
as a replacement for `github.com/hashicorp/go-multierror`. Now that
Go stdlib provides native support for multi-errors through errors.Join,
we can deprecated the utility, and use stdlib errors instead. Using
errors.Join will produce a slightly different formatting, but should
still capture the same information.

There do not appear to be external consumers of this package, other than
through vendoring, so we could decide to remove the package entirely;
https://grep.app/search?f.lang=Go&q=estargz%2Ferrorutil

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

estargz/build.go

@@ -37,7 +37,6 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/containerd/stargz-snapshotter/estargz/errorutil"
 	"github.com/klauspost/compress/zstd"
 	digest "github.com/opencontainers/go-digest"
 	"golang.org/x/sync/errgroup"
@@ -656,7 +655,7 @@ func (tf *tempFiles) cleanupAll() error {
 		}
 	}
 	tf.files = nil
-	return errorutil.Aggregate(allErr)
+	return errors.Join(allErr...)
 }
 
 func newCountReadSeeker(r io.ReaderAt) (*countReadSeeker, error) {

estargz/errorutil/errors.go

@@ -23,6 +23,8 @@ import (
 )
 
 // Aggregate combines a list of errors into a single new error.
+//
+// Deprecated: use [errors.Join] instead. This package will be removed in v0.19.0
 func Aggregate(errs []error) error {
 	switch len(errs) {
 	case 0:

estargz/estargz.go

@@ -38,7 +38,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/containerd/stargz-snapshotter/estargz/errorutil"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/vbatts/tar-split/archive/tar"
 )
@@ -164,7 +163,7 @@ func Open(sr *io.SectionReader, opt ...OpenOption) (*Reader, error) {
 		allErr = append(allErr, err)
 	}
 	if !found {
-		return nil, errorutil.Aggregate(allErr)
+		return nil, errors.Join(allErr...)
 	}
 	if err := r.initFields(); err != nil {
 		return nil, fmt.Errorf("failed to initialize fields of entries: %v", err)
@@ -192,7 +191,7 @@ func OpenFooter(sr *io.SectionReader) (tocOffset int64, footerSize int64, rErr e
 		}
 		allErr = append(allErr, err)
 	}
-	return 0, 0, errorutil.Aggregate(allErr)
+	return 0, 0, errors.Join(allErr...)
 }
 
 // initFields populates the Reader from r.toc after decoding it from

estargz/testutil.go

@@ -40,7 +40,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containerd/stargz-snapshotter/estargz/errorutil"
 	"github.com/klauspost/compress/zstd"
 	digest "github.com/opencontainers/go-digest"
 )
@@ -1650,7 +1649,7 @@ func newCalledTelemetry() (telemetry *Telemetry, check func(needsGetTOC bool) er
 			if !deserializeTocLatencyCalled {
 				allErr = append(allErr, fmt.Errorf("metrics DeserializeTocLatency isn't called"))
 			}
-			return errorutil.Aggregate(allErr)
+			return errors.Join(allErr...)
 		}
 }