Remove hashicorp/go-multierror

Signed-off-by: Jin Dong <jin.dong@databricks.com>
This commit is contained in:
Jin Dong
2023-08-19 00:33:26 -07:00
parent 89553637a7
commit cd8c8ae4bc
14 changed files with 101 additions and 117 deletions

View File

@@ -18,6 +18,7 @@ package streaming
import (
"context"
"errors"
"sync"
"github.com/containerd/containerd/errdefs"
@@ -27,8 +28,6 @@ import (
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/streaming"
"github.com/containerd/containerd/plugin"
"github.com/hashicorp/go-multierror"
)
func init() {
@@ -256,12 +255,12 @@ func (cc *collectionContext) Finish() error {
}
cc.manager.rwlock.Unlock()
var errs *multierror.Error
var errs []error
for _, s := range closeStreams {
if err := s.Close(); err != nil {
errs = multierror.Append(errs, err)
errs = append(errs, err)
}
}
return errs.ErrorOrNil()
return errors.Join(errs...)
}