Skip to content

Commit 4b9df59

Browse files
djdongjindjdongjin
committed
Remove hashicorp/go-multierror
Signed-off-by: Jin Dong <[email protected]>
1 parent ad317d0 commit 4b9df59

File tree

14 files changed

+100
-117
lines changed

14 files changed

+100
-117
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ require (
3939
github.com/google/uuid v1.4.0
4040
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
4141
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
42-
github.com/hashicorp/go-multierror v1.1.1
4342
github.com/intel/goresctrl v0.3.0
4443
github.com/klauspost/compress v1.16.7
4544
github.com/minio/sha256-simd v1.0.0
@@ -110,6 +109,7 @@ require (
110109
github.com/google/gofuzz v1.2.0 // indirect
111110
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
112111
github.com/hashicorp/errwrap v1.1.0 // indirect
112+
github.com/hashicorp/go-multierror v1.1.1 // indirect
113113
github.com/json-iterator/go v1.1.12 // indirect
114114
github.com/klauspost/cpuid/v2 v2.0.4 // indirect
115115
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect

‎pkg/cri/sbserver/podsandbox/sandbox_run.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
v1 "github.com/containerd/nri/types/v1"
2626
"github.com/containerd/typeurl/v2"
2727
"github.com/davecgh/go-spew/spew"
28-
"github.com/hashicorp/go-multierror"
2928
"github.com/opencontainers/selinux/go-selinux"
3029
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
3130

@@ -61,7 +60,7 @@ func (c *Controller) Start(ctx context.Context, id string) (cin sandbox.Controll
6160
defer func() {
6261
if retErr != nil && cleanupErr != nil {
6362
log.G(ctx).WithField("id", id).WithError(cleanupErr).Errorf("failed to fully teardown sandbox resources after earlier error: %s", retErr)
64-
retErr = multierror.Append(retErr, CleanupErr{cleanupErr})
63+
retErr = errors.Join(retErr, CleanupErr{cleanupErr})
6564
}
6665
}()
6766

‎pkg/cri/sbserver/sandbox_run.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828

2929
"github.com/containerd/go-cni"
3030
"github.com/containerd/typeurl/v2"
31-
"github.com/hashicorp/go-multierror"
3231
"github.com/sirupsen/logrus"
3332
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
3433

@@ -238,8 +237,8 @@ func (c *criService) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandbox
238237
cleanupErr = fmt.Errorf("failed to cleanup sandbox: %w", cerr)
239238

240239
// Strip last error as cleanup error to handle separately
241-
if merr, ok := err.(*multierror.Error); ok {
242-
if errs := merr.WrappedErrors(); len(errs) > 0 {
240+
if merr, ok := err.(interface{ Unwrap() []error }); ok {
241+
if errs := merr.Unwrap(); len(errs) > 0 {
243242
err = errs[0]
244243
}
245244
}

‎pkg/cri/sbserver/sandbox_stats_list.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ package sbserver
1818

1919
import (
2020
"context"
21+
"errors"
2122
"fmt"
2223

2324
"github.com/containerd/log"
24-
"github.com/hashicorp/go-multierror"
2525
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
2626

2727
"github.com/containerd/containerd/errdefs"
@@ -35,21 +35,21 @@ func (c *criService) ListPodSandboxStats(
3535
) (*runtime.ListPodSandboxStatsResponse, error) {
3636
sandboxes := c.sandboxesForListPodSandboxStatsRequest(r)
3737

38-
var errs *multierror.Error
38+
var errs []error
3939
podSandboxStats := new(runtime.ListPodSandboxStatsResponse)
4040
for _, sandbox := range sandboxes {
4141
sandboxStats, err := c.podSandboxStats(ctx, sandbox)
4242
switch {
4343
case errdefs.IsUnavailable(err):
4444
log.G(ctx).WithField("podsandboxid", sandbox.ID).Debugf("failed to get pod sandbox stats, this is likely a transient error: %v", err)
4545
case err != nil:
46-
errs = multierror.Append(errs, fmt.Errorf("failed to decode sandbox container metrics for sandbox %q: %w", sandbox.ID, err))
46+
errs = append(errs, fmt.Errorf("failed to decode sandbox container metrics for sandbox %q: %w", sandbox.ID, err))
4747
default:
4848
podSandboxStats.Stats = append(podSandboxStats.Stats, sandboxStats)
4949
}
5050
}
5151

52-
return podSandboxStats, errs.ErrorOrNil()
52+
return podSandboxStats, errors.Join(errs...)
5353
}
5454

5555
func (c *criService) sandboxesForListPodSandboxStatsRequest(r *runtime.ListPodSandboxStatsRequest) []sandboxstore.Sandbox {

‎pkg/cri/server/sandbox_stats_list.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import (
2727

2828
"github.com/containerd/containerd/errdefs"
2929
sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
30-
31-
"github.com/hashicorp/go-multierror"
3230
)
3331

3432
// ListPodSandboxStats returns stats of all ready sandboxes.
@@ -38,7 +36,7 @@ func (c *criService) ListPodSandboxStats(
3836
) (*runtime.ListPodSandboxStatsResponse, error) {
3937
sandboxes := c.sandboxesForListPodSandboxStatsRequest(r)
4038

41-
var errs *multierror.Error
39+
var errs []error
4240
podSandboxStats := new(runtime.ListPodSandboxStatsResponse)
4341
for _, sandbox := range sandboxes {
4442
sandboxStats, err := c.podSandboxStats(ctx, sandbox)
@@ -48,13 +46,13 @@ func (c *criService) ListPodSandboxStats(
4846
case errors.Is(err, ttrpc.ErrClosed):
4947
log.G(ctx).WithField("podsandboxid", sandbox.ID).Debugf("failed to get pod sandbox stats, connection closed: %v", err)
5048
case err != nil:
51-
errs = multierror.Append(errs, fmt.Errorf("failed to decode sandbox container metrics for sandbox %q: %w", sandbox.ID, err))
49+
errs = append(errs, fmt.Errorf("failed to decode sandbox container metrics for sandbox %q: %w", sandbox.ID, err))
5250
default:
5351
podSandboxStats.Stats = append(podSandboxStats.Stats, sandboxStats)
5452
}
5553
}
5654

57-
return podSandboxStats, errs.ErrorOrNil()
55+
return podSandboxStats, errors.Join(errs...)
5856
}
5957

6058
func (c *criService) sandboxesForListPodSandboxStatsRequest(r *runtime.ListPodSandboxStatsRequest) []sandboxstore.Sandbox {

‎pkg/process/io.go

+18-22
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package process
2020

2121
import (
2222
"context"
23+
"errors"
2324
"fmt"
2425
"io"
2526
"net/url"
@@ -36,7 +37,6 @@ import (
3637
"github.com/containerd/fifo"
3738
runc "github.com/containerd/go-runc"
3839
"github.com/containerd/log"
39-
"github.com/hashicorp/go-multierror"
4040
)
4141

4242
const binaryIOProcTermTimeout = 12 * time.Second // Give logger process solid 10 seconds for cleanup
@@ -255,11 +255,11 @@ func NewBinaryIO(ctx context.Context, id string, uri *url.URL) (_ runc.IO, err e
255255
if err == nil {
256256
return
257257
}
258-
result := multierror.Append(err)
258+
result := []error{err}
259259
for _, fn := range closers {
260-
result = multierror.Append(result, fn())
260+
result = append(result, fn())
261261
}
262-
err = multierror.Flatten(result)
262+
err = errors.Join(result...)
263263
}()
264264

265265
out, err := newPipe()
@@ -313,39 +313,35 @@ type binaryIO struct {
313313
}
314314

315315
func (b *binaryIO) CloseAfterStart() error {
316-
var (
317-
result *multierror.Error
318-
)
316+
var result []error
319317

320318
for _, v := range []*pipe{b.out, b.err} {
321319
if v != nil {
322320
if err := v.r.Close(); err != nil {
323-
result = multierror.Append(result, err)
321+
result = append(result, err)
324322
}
325323
}
326324
}
327325

328-
return result.ErrorOrNil()
326+
return errors.Join(result...)
329327
}
330328

331329
func (b *binaryIO) Close() error {
332-
var (
333-
result *multierror.Error
334-
)
330+
var result []error
335331

336332
for _, v := range []*pipe{b.out, b.err} {
337333
if v != nil {
338334
if err := v.Close(); err != nil {
339-
result = multierror.Append(result, err)
335+
result = append(result, err)
340336
}
341337
}
342338
}
343339

344340
if err := b.cancel(); err != nil {
345-
result = multierror.Append(result, err)
341+
result = append(result, err)
346342
}
347343

348-
return result.ErrorOrNil()
344+
return errors.Join(result...)
349345
}
350346

351347
func (b *binaryIO) cancel() error {
@@ -355,15 +351,15 @@ func (b *binaryIO) cancel() error {
355351

356352
// Send SIGTERM first, so logger process has a chance to flush and exit properly
357353
if err := b.cmd.Process.Signal(syscall.SIGTERM); err != nil {
358-
result := multierror.Append(fmt.Errorf("failed to send SIGTERM: %w", err))
354+
result := []error{fmt.Errorf("failed to send SIGTERM: %w", err)}
359355

360356
log.L.WithError(err).Warn("failed to send SIGTERM signal, killing logging shim")
361357

362358
if err := b.cmd.Process.Kill(); err != nil {
363-
result = multierror.Append(result, fmt.Errorf("failed to kill process after faulty SIGTERM: %w", err))
359+
result = append(result, fmt.Errorf("failed to kill process after faulty SIGTERM: %w", err))
364360
}
365361

366-
return result.ErrorOrNil()
362+
return errors.Join(result...)
367363
}
368364

369365
done := make(chan error, 1)
@@ -424,15 +420,15 @@ type pipe struct {
424420
}
425421

426422
func (p *pipe) Close() error {
427-
var result *multierror.Error
423+
var result []error
428424

429425
if err := p.w.Close(); err != nil {
430-
result = multierror.Append(result, fmt.Errorf("failed to close write pipe: %w", err))
426+
result = append(result, fmt.Errorf("pipe: failed to close write pipe: %w", err))
431427
}
432428

433429
if err := p.r.Close(); err != nil {
434-
result = multierror.Append(result, fmt.Errorf("failed to close read pipe: %w", err))
430+
result = append(result, fmt.Errorf("pipe: failed to close read pipe: %w", err))
435431
}
436432

437-
return multierror.Prefix(result.ErrorOrNil(), "pipe:")
433+
return errors.Join(result...)
438434
}

‎plugins/streaming/manager.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package streaming
1818

1919
import (
2020
"context"
21+
"errors"
2122
"sync"
2223

2324
"github.com/containerd/containerd/errdefs"
@@ -27,8 +28,6 @@ import (
2728
"github.com/containerd/containerd/namespaces"
2829
"github.com/containerd/containerd/pkg/streaming"
2930
"github.com/containerd/containerd/plugin"
30-
31-
"github.com/hashicorp/go-multierror"
3231
)
3332

3433
func init() {
@@ -256,12 +255,12 @@ func (cc *collectionContext) Finish() error {
256255
}
257256
cc.manager.rwlock.Unlock()
258257

259-
var errs *multierror.Error
258+
var errs []error
260259
for _, s := range closeStreams {
261260
if err := s.Close(); err != nil {
262-
errs = multierror.Append(errs, err)
261+
errs = append(errs, err)
263262
}
264263
}
265264

266-
return errs.ErrorOrNil()
265+
return errors.Join(errs...)
267266
}

‎runtime/v2/shim.go

+7-10
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030

3131
"github.com/containerd/log"
3232
"github.com/containerd/ttrpc"
33-
"github.com/hashicorp/go-multierror"
3433
"google.golang.org/grpc"
3534
"google.golang.org/grpc/connectivity"
3635
"google.golang.org/grpc/credentials/insecure"
@@ -374,36 +373,34 @@ func (s *shim) Close() error {
374373
}
375374

376375
func (s *shim) Delete(ctx context.Context) error {
377-
var (
378-
result *multierror.Error
379-
)
376+
var result []error
380377

381378
if ttrpcClient, ok := s.client.(*ttrpc.Client); ok {
382379
if err := ttrpcClient.Close(); err != nil {
383-
result = multierror.Append(result, fmt.Errorf("failed to close ttrpc client: %w", err))
380+
result = append(result, fmt.Errorf("failed to close ttrpc client: %w", err))
384381
}
385382

386383
if err := ttrpcClient.UserOnCloseWait(ctx); err != nil {
387-
result = multierror.Append(result, fmt.Errorf("close wait error: %w", err))
384+
result = append(result, fmt.Errorf("close wait error: %w", err))
388385
}
389386
}
390387

391388
if grpcClient, ok := s.client.(*grpcConn); ok {
392389
if err := grpcClient.Close(); err != nil {
393-
result = multierror.Append(result, fmt.Errorf("failed to close grpc client: %w", err))
390+
result = append(result, fmt.Errorf("failed to close grpc client: %w", err))
394391
}
395392

396393
if err := grpcClient.UserOnCloseWait(ctx); err != nil {
397-
result = multierror.Append(result, fmt.Errorf("close wait error: %w", err))
394+
result = append(result, fmt.Errorf("close wait error: %w", err))
398395
}
399396
}
400397

401398
if err := s.bundle.Delete(); err != nil {
402399
log.G(ctx).WithField("id", s.ID()).WithError(err).Error("failed to delete bundle")
403-
result = multierror.Append(result, fmt.Errorf("failed to delete bundle: %w", err))
400+
result = append(result, fmt.Errorf("failed to delete bundle: %w", err))
404401
}
405402

406-
return result.ErrorOrNil()
403+
return errors.Join(result...)
407404
}
408405

409406
var _ runtime.Task = &shimTask{}

‎snapshots/devmapper/config.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
package devmapper
2020

2121
import (
22+
"errors"
2223
"fmt"
2324
"os"
2425

2526
"github.com/docker/go-units"
26-
"github.com/hashicorp/go-multierror"
2727
"github.com/pelletier/go-toml"
2828
)
2929

@@ -100,29 +100,29 @@ func (c *Config) parse() error {
100100

101101
// Validate makes sure configuration fields are valid
102102
func (c *Config) Validate() error {
103-
var result *multierror.Error
103+
var result []error
104104

105105
if c.PoolName == "" {
106-
result = multierror.Append(result, fmt.Errorf("pool_name is required"))
106+
result = append(result, fmt.Errorf("pool_name is required"))
107107
}
108108

109109
if c.RootPath == "" {
110-
result = multierror.Append(result, fmt.Errorf("root_path is required"))
110+
result = append(result, fmt.Errorf("root_path is required"))
111111
}
112112

113113
if c.BaseImageSize == "" {
114-
result = multierror.Append(result, fmt.Errorf("base_image_size is required"))
114+
result = append(result, fmt.Errorf("base_image_size is required"))
115115
}
116116

117117
if c.FileSystemType != "" {
118118
switch c.FileSystemType {
119119
case fsTypeExt4, fsTypeXFS, fsTypeExt2:
120120
default:
121-
result = multierror.Append(result, fmt.Errorf("unsupported Filesystem Type: %q", c.FileSystemType))
121+
result = append(result, fmt.Errorf("unsupported Filesystem Type: %q", c.FileSystemType))
122122
}
123123
} else {
124-
result = multierror.Append(result, fmt.Errorf("filesystem type cannot be empty"))
124+
result = append(result, fmt.Errorf("filesystem type cannot be empty"))
125125
}
126126

127-
return result.ErrorOrNil()
127+
return errors.Join(result...)
128128
}

0 commit comments

Comments
 (0)