feat: replace github.com/pkg/errors to errors

Signed-off-by: haoyun <yun.hao@daocloud.io>
Co-authored-by: zounengren <zouyee1989@gmail.com>

integration/client/container_test.go

@@ -46,7 +46,6 @@ import (
 	"github.com/containerd/typeurl"
 	gogotypes "github.com/gogo/protobuf/types"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/pkg/errors"
 	exec "golang.org/x/sys/execabs"
 )
 
@@ -1903,7 +1902,7 @@ func TestRegressionIssue4769(t *testing.T) {
 	select {
 	case et := <-statusC:
 		if got := et.ExitCode(); got != 0 {
-			t.Fatal(errors.Errorf("expect zero exit status, but got %v", got))
+			t.Fatal(fmt.Errorf("expect zero exit status, but got %v", got))
 		}
 	case <-time.After(timeout):
 		t.Fatal(fmt.Errorf("failed to get exit event in time"))
@@ -1913,21 +1912,21 @@ func TestRegressionIssue4769(t *testing.T) {
 	select {
 	case et := <-eventStream:
 		if et.Event == nil {
-			t.Fatal(errors.Errorf("unexpected empty event: %+v", et))
+			t.Fatal(fmt.Errorf("unexpected empty event: %+v", et))
 		}
 
 		v, err := typeurl.UnmarshalAny(et.Event)
 		if err != nil {
-			t.Fatal(errors.Wrap(err, "failed to unmarshal event"))
+			t.Fatal(fmt.Errorf("failed to unmarshal event: %w", err))
 		}
 
 		if e, ok := v.(*apievents.TaskExit); !ok {
-			t.Fatal(errors.Errorf("unexpected event type: %+v", v))
+			t.Fatal(fmt.Errorf("unexpected event type: %+v", v))
 		} else if e.ExitStatus != 0 {
-			t.Fatal(errors.Errorf("expect zero exit status, but got %v", e.ExitStatus))
+			t.Fatal(fmt.Errorf("expect zero exit status, but got %v", e.ExitStatus))
 		}
 	case err := <-errC:
-		t.Fatal(errors.Wrap(err, "unexpected error from event service"))
+		t.Fatal(fmt.Errorf("unexpected error from event service: %w", err))
 
 	case <-time.After(timeout):
 		t.Fatal(fmt.Errorf("failed to get exit event in time"))
@@ -1940,9 +1939,9 @@ func TestRegressionIssue4769(t *testing.T) {
 	// check duplicate event should not show up
 	select {
 	case event := <-eventStream:
-		t.Fatal(errors.Errorf("unexpected exit event: %+v", event))
+		t.Fatal(fmt.Errorf("unexpected exit event: %+v", event))
 	case err := <-errC:
-		t.Fatal(errors.Wrap(err, "unexpected error from event service"))
+		t.Fatal(fmt.Errorf("unexpected error from event service: %w", err))
 	case <-time.After(timeout):
 	}
 }

integration/client/content_test.go

@@ -27,7 +27,6 @@ import (
 	"github.com/containerd/containerd/content/testsuite"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/namespaces"
-	"github.com/pkg/errors"
 )
 
 func newContentStore(ctx context.Context, root string) (context.Context, content.Store, func() error, error) {
@@ -59,7 +58,7 @@ func newContentStore(ctx context.Context, root string) (context.Context, content
 			}
 			for _, st := range statuses {
 				if err := cs.Abort(ctx, st.Ref); err != nil && !errdefs.IsNotFound(err) {
-					return errors.Wrapf(err, "failed to abort %s", st.Ref)
+					return fmt.Errorf("failed to abort %s: %w", st.Ref, err)
 				}
 			}
 			err = cs.Walk(ctx, func(info content.Info) error {

integration/client/daemon_test.go

@@ -18,13 +18,14 @@ package client
 
 import (
 	"context"
+	"errors"
+	"fmt"
 	"io"
 	"runtime"
 	"sync"
 	"syscall"
 
 	. "github.com/containerd/containerd"
-	"github.com/pkg/errors"
 	exec "golang.org/x/sys/execabs"
 )
 
@@ -46,7 +47,7 @@ func (d *daemon) start(name, address string, args []string, stdout, stderr io.Wr
 	cmd.Stderr = stderr
 	if err := cmd.Start(); err != nil {
 		cmd.Wait()
-		return errors.Wrap(err, "failed to start daemon")
+		return fmt.Errorf("failed to start daemon: %w", err)
 	}
 	d.addr = address
 	d.cmd = cmd
@@ -117,7 +118,7 @@ func (d *daemon) Restart(stopCb func()) error {
 	}
 	var err error
 	if err = d.cmd.Process.Signal(signal); err != nil {
-		return errors.Wrap(err, "failed to signal daemon")
+		return fmt.Errorf("failed to signal daemon: %w", err)
 	}
 
 	d.cmd.Wait()
@@ -131,7 +132,7 @@ func (d *daemon) Restart(stopCb func()) error {
 	cmd.Stderr = d.cmd.Stderr
 	if err := cmd.Start(); err != nil {
 		cmd.Wait()
-		return errors.Wrap(err, "failed to start new daemon instance")
+		return fmt.Errorf("failed to start new daemon instance: %w", err)
 	}
 	d.cmd = cmd
 

integration/client/go.mod

@@ -16,7 +16,6 @@ require (
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5
 	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
-	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
 	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e
 	gotest.tools/v3 v3.0.3