update dependencies

containerd/exec.go

@@ -4,19 +4,18 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"os/exec"
 	"strconv"
 	"sync"
 
-	"github.com/sirupsen/logrus"
-
 	"github.com/containerd/console"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/sys/reaper"
 	runc "github.com/containerd/go-runc"
-	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 // execCreate runs the "create" subcommand for runj
@@ -56,12 +55,12 @@ func execCreate(ctx context.Context, id, bundle string, stdin io.Reader, stdout
 			con, err := func() (console.Console, error) {
 				con, err := socket.ReceiveMaster()
 				if err != nil {
-					return nil, errors.Wrap(err, "failed to retrieve console master")
+					return nil, fmt.Errorf("failed to retrieve console master: %w", err)
 				}
 				log.G(ctx).WithField("id", id).Warn("Received console master!")
 				err = copyConsole(ctx, con, stdin, stdout, stderr)
 				if err != nil {
-					return nil, errors.Wrap(err, "failed to start console copy")
+					return nil, fmt.Errorf("failed to start console copy: %w", err)
 				}
 				log.G(ctx).WithField("id", id).Warn("Copying console!")
 				return con, nil
@@ -221,12 +220,12 @@ func execExec(ctx context.Context, id, processJSONFilename string, stdin io.Read
 	if socket != nil {
 		con, err = socket.ReceiveMaster()
 		if err != nil {
-			return pid, nil, errors.Wrap(err, "failed to retrieve console master")
+			return pid, nil, fmt.Errorf("failed to retrieve console master: %w", err)
 		}
 		log.G(ctx).WithField("id", id).Warn("Received exec console master!")
 		err = copyConsole(ctx, con, stdin, stdout, stderr)
 		if err != nil {
-			return pid, nil, errors.Wrap(err, "failed to start console copy")
+			return pid, nil, fmt.Errorf("failed to start console copy: %w", err)
 		}
 		log.G(ctx).WithField("id", id).Warn("Copying exec console!")
 	}

containerd/shim.go

@@ -3,6 +3,7 @@ package containerd
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -36,7 +37,6 @@ import (
 	ptypes "github.com/gogo/protobuf/types"
 	"github.com/moby/sys/mount"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )
@@ -220,7 +220,7 @@ func (s *service) StartShim(ctx context.Context, opts shim.StartOpts) (string, e
 			return "", err
 		}
 		if err := shim.RemoveSocket(address); err != nil {
-			return "", errors.Wrap(err, "remove already used socket")
+			return "", fmt.Errorf("remove already used socket: %w", err)
 		}
 		if socket, err = shim.NewSocket(address); err != nil {
 			return "", err
@@ -427,7 +427,7 @@ func (s *service) Create(ctx context.Context, req *task.CreateTaskRequest) (*tas
 	for _, rm := range mounts {
 		log.G(ctx).WithField("mount", rm).WithField("rootfs", rootfs).Warn("mount")
 		if err := mount.Mount(rm.Source, rootfs, rm.Type, strings.Join(rm.Options, ",")); err != nil {
-			return nil, errors.Wrapf(err, "failed to mount rootfs component %v", rm)
+			return nil, fmt.Errorf("failed to mount rootfs component %v: %w", rm, err)
 		}
 	}
 

go.mod

@@ -3,24 +3,22 @@ module go.sbk.wtf/runj
 go 1.16
 
 require (
-	github.com/bxcodec/faker v2.0.1+incompatible
-	github.com/cheggaaa/pb/v3 v3.0.5
-	github.com/containerd/console v1.0.3-0.20210412134321-2298a9c8aead
-	github.com/containerd/containerd v1.5.13
+	github.com/cheggaaa/pb/v3 v3.1.2
+	github.com/containerd/console v1.0.3
+	github.com/containerd/containerd v1.6.19
 	github.com/containerd/fifo v1.0.0
 	github.com/containerd/go-runc v1.0.0
 	github.com/containerd/typeurl v1.0.2
+	github.com/go-faker/faker/v4 v4.1.0
 	github.com/gogo/protobuf v1.3.2
-	github.com/hashicorp/go-multierror v1.1.0 // indirect
 	github.com/moby/sys/mount v0.3.3
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/opencontainers/image-spec v1.0.2
+	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
 	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
-	github.com/spf13/cobra v1.0.0
+	github.com/sirupsen/logrus v1.9.0
+	github.com/spf13/cobra v1.6.1
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
-	google.golang.org/grpc v1.34.0 // indirect
-	gotest.tools/v3 v3.0.3
+	golang.org/x/sys v0.6.0
+	golang.org/x/text v0.8.0 // indirect
+	gotest.tools/v3 v3.4.0
 )