From d1b0d885c6ea9024cbcab1064dbb15cc08ff01fd Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 19 Nov 2021 16:10:34 +0900 Subject: [PATCH] Remove github.com/pkg/errors Signed-off-by: Akihiro Suda --- check.go | 7 +++---- fuseoverlayfs.go | 25 ++++++++++++------------- go.mod | 1 - 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/check.go b/check.go index 9cec584..6e8c9a7 100644 --- a/check.go +++ b/check.go @@ -28,7 +28,6 @@ import ( "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" - "github.com/pkg/errors" ) // supportsReadonlyMultipleLowerDir checks if read-only multiple lowerdirs can be mounted with fuse-overlayfs. @@ -58,7 +57,7 @@ func supportsReadonlyMultipleLowerDir(d string) error { } dest := filepath.Join(td, "merged") if err := m.Mount(dest); err != nil { - return errors.Wrapf(err, "failed to mount fuse-overlayfs (%+v) on %s", m, dest) + return fmt.Errorf("failed to mount fuse-overlayfs (%+v) on %s: %w", m, dest, err) } if err := mount.UnmountAll(dest, 0); err != nil { log.L.WithError(err).Warnf("Failed to unmount check directory %v", dest) @@ -71,13 +70,13 @@ func supportsReadonlyMultipleLowerDir(d string) error { // this snapshotter as a library. func Supported(root string) error { if _, err := exec.LookPath(fuseoverlayfsBinary); err != nil { - return errors.Wrapf(err, "%s not installed", fuseoverlayfsBinary) + return fmt.Errorf("%s not installed: %w", fuseoverlayfsBinary, err) } if err := os.MkdirAll(root, 0700); err != nil { return err } if err := supportsReadonlyMultipleLowerDir(root); err != nil { - return errors.Wrap(err, "fuse-overlayfs not functional, make sure running with kernel >= 4.18") + return fmt.Errorf("fuse-overlayfs not functional, make sure running with kernel >= 4.18: %w", err) } return nil } diff --git a/fuseoverlayfs.go b/fuseoverlayfs.go index 344157c..09211ca 100644 --- a/fuseoverlayfs.go +++ b/fuseoverlayfs.go @@ -33,7 +33,6 @@ import ( "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" "github.com/containerd/continuity/fs" - "github.com/pkg/errors" ) const ( @@ -187,7 +186,7 @@ func (o *snapshotter) Mounts(ctx context.Context, key string) ([]mount.Mount, er _, info, _, err := storage.GetInfo(ctx, key) t.Rollback() if err != nil { - return nil, errors.Wrap(err, "failed to get active mount") + return nil, fmt.Errorf("failed to get active mount: %w", err) } return o.mounts(s, info), nil } @@ -218,7 +217,7 @@ func (o *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap } if _, err = storage.CommitActive(ctx, key, name, snapshots.Usage(usage), opts...); err != nil { - return errors.Wrap(err, "failed to commit snapshot") + return fmt.Errorf("failed to commit snapshot: %w", err) } return t.Commit() } @@ -241,14 +240,14 @@ func (o *snapshotter) Remove(ctx context.Context, key string) (err error) { _, _, err = storage.Remove(ctx, key) if err != nil { - return errors.Wrap(err, "failed to remove") + return fmt.Errorf("failed to remove: %w", err) } if !o.asyncRemove { var removals []string removals, err = o.getCleanupDirectories(ctx, t) if err != nil { - return errors.Wrap(err, "unable to get directories for removal") + return fmt.Errorf("unable to get directories for removal: %w", err) } // Remove directories after the transaction is closed, failures must not @@ -354,7 +353,7 @@ func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k if path != "" { if err1 := os.RemoveAll(path); err1 != nil { log.G(ctx).WithError(err1).WithField("path", path).Error("failed to reclaim snapshot directory, directory may need removal") - err = errors.Wrapf(err, "failed to remove path: %v", err1) + err = fmt.Errorf("failed to remove path: %v: %w", err1, err) } } } @@ -366,7 +365,7 @@ func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k if rerr := t.Rollback(); rerr != nil { log.G(ctx).WithError(rerr).Warn("failed to rollback transaction") } - return nil, errors.Wrap(err, "failed to create prepare snapshot dir") + return nil, fmt.Errorf("failed to create prepare snapshot dir: %w", err) } rollback := true defer func() { @@ -379,13 +378,13 @@ func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k s, err := storage.CreateSnapshot(ctx, kind, key, parent, opts...) if err != nil { - return nil, errors.Wrap(err, "failed to create snapshot") + return nil, fmt.Errorf("failed to create snapshot: %w", err) } if len(s.ParentIDs) > 0 { st, err := os.Stat(o.upperPath(s.ParentIDs[0])) if err != nil { - return nil, errors.Wrap(err, "failed to stat parent") + return nil, fmt.Errorf("failed to stat parent: %w", err) } stat := st.Sys().(*syscall.Stat_t) @@ -394,13 +393,13 @@ func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k if rerr := t.Rollback(); rerr != nil { log.G(ctx).WithError(rerr).Warn("failed to rollback transaction") } - return nil, errors.Wrap(err, "failed to chown") + return nil, fmt.Errorf("failed to chown: %w", err) } } path = filepath.Join(snapshotDir, s.ID) if err = os.Rename(td, path); err != nil { - return nil, errors.Wrap(err, "failed to rename") + return nil, fmt.Errorf("failed to rename: %w", err) } td = "" @@ -408,7 +407,7 @@ func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k rollback = false if err = t.Commit(); err != nil { - return nil, errors.Wrap(err, "commit failed") + return nil, fmt.Errorf("commit failed: %w", err) } return o.mounts(s, info), nil @@ -417,7 +416,7 @@ func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k func (o *snapshotter) prepareDirectory(ctx context.Context, snapshotDir string, kind snapshots.Kind) (string, error) { td, err := ioutil.TempDir(snapshotDir, "new-") if err != nil { - return "", errors.Wrap(err, "failed to create temp dir") + return "", fmt.Errorf("failed to create temp dir: %w", err) } if err := os.Mkdir(filepath.Join(td, "fs"), 0755); err != nil { diff --git a/go.mod b/go.mod index 9488285..3294eeb 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( github.com/containerd/containerd v1.5.8 github.com/containerd/continuity v0.1.0 github.com/coreos/go-systemd/v22 v22.3.2 - github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 google.golang.org/grpc v1.33.2 )