libct/cg: stop using pkg/errors

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

libcontainer/cgroups/file.go

@@ -2,11 +2,12 @@ package cgroups
 
 import (
  "bytes"
+ "errors"
+ "fmt"
  "os"
  "strings"
  "sync"
 
- "github.com/pkg/errors"
  "github.com/sirupsen/logrus"
  "golang.org/x/sys/unix"
 )
@@ -15,7 +16,7 @@ import (
 // It is supposed to be used for cgroup files only.
 func OpenFile(dir, file string, flags int) (*os.File, error) {
  if dir == "" {
- return nil, errors.Errorf("no directory specified for %s", file)
+ return nil, fmt.Errorf("no directory specified for %s", file)
  }
  return openFile(dir, file, flags)
 }
@@ -43,7 +44,8 @@ func WriteFile(dir, file, data string) error {
  }
  defer fd.Close()
  if err := retryingWriteFile(fd, data); err != nil {
- return errors.Wrapf(err, "failed to write %q", data)
+ // Having data in the error message helps in debugging.
+ return fmt.Errorf("failed to write %q: %w", data, err)
  }
  return nil
 }

libcontainer/cgroups/fs/cpuset.go

@@ -3,16 +3,17 @@
 package fs
 
 import (
+ "errors"
  "os"
  "path/filepath"
  "strconv"
  "strings"
 
+ "golang.org/x/sys/unix"
+
  "github.com/opencontainers/runc/libcontainer/cgroups"
  "github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
  "github.com/opencontainers/runc/libcontainer/configs"
- "github.com/pkg/errors"
- "golang.org/x/sys/unix"
 )
 
 type CpusetGroup struct{}

libcontainer/cgroups/fs/fs.go

@@ -3,17 +3,18 @@
 package fs
 
 import (
+ "errors"
  "fmt"
  "os"
  "path/filepath"
  "sync"
 
+ "golang.org/x/sys/unix"
+
  "github.com/opencontainers/runc/libcontainer/cgroups"
  "github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
  "github.com/opencontainers/runc/libcontainer/configs"
  libcontainerUtils "github.com/opencontainers/runc/libcontainer/utils"
- "github.com/pkg/errors"
- "golang.org/x/sys/unix"
 )
 
 var (
@@ -171,8 +172,6 @@ func isIgnorableError(rootless bool, err error) bool {
  if !rootless {
  return false
  }
- // TODO: rm errors.Cause once we switch to %w everywhere
- err = errors.Cause(err)
  // Is it an ordinary EPERM?
  if errors.Is(err, os.ErrPermission) {
  return true

libcontainer/cgroups/fs/memory.go

@@ -4,18 +4,19 @@ package fs
 
 import (
  "bufio"
+ "errors"
  "fmt"
  "math"
  "os"
  "path/filepath"
  "strconv"
  "strings"
 
+ "golang.org/x/sys/unix"
+
  "github.com/opencontainers/runc/libcontainer/cgroups"
  "github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
  "github.com/opencontainers/runc/libcontainer/configs"
- "github.com/pkg/errors"
- "golang.org/x/sys/unix"
 )
 
 const (
@@ -56,7 +57,7 @@ func setMemory(path string, val int64) error {
  return err
  }
 
- return errors.Errorf("unable to set memory limit to %d (current usage: %d, peak usage: %d)", val, usage, max)
+ return fmt.Errorf("unable to set memory limit to %d (current usage: %d, peak usage: %d)", val, usage, max)
 }
 
 func setSwap(path string, val int64) error {

libcontainer/cgroups/fs2/defaultpath.go

@@ -18,25 +18,26 @@ package fs2
 
 import (
  "bufio"
+ "errors"
+ "fmt"
  "io"
  "os"
  "path/filepath"
  "strings"
 
  "github.com/opencontainers/runc/libcontainer/configs"
  libcontainerUtils "github.com/opencontainers/runc/libcontainer/utils"
- "github.com/pkg/errors"
 )
 
 const UnifiedMountpoint = "/sys/fs/cgroup"
 
 func defaultDirPath(c *configs.Cgroup) (string, error) {
  if (c.Name != "" || c.Parent != "") && c.Path != "" {
- return "", errors.Errorf("cgroup: either Path or Name and Parent should be used, got %+v", c)
+ return "", fmt.Errorf("cgroup: either Path or Name and Parent should be used, got %+v", c)
  }
  if len(c.Paths) != 0 {
  // never set by specconv
- return "", errors.Errorf("cgroup: Paths is unsupported, use Path, got %+v", c)
+ return "", fmt.Errorf("cgroup: Paths is unsupported, use Path, got %+v", c)
  }
 
  // XXX: Do not remove this code. Path safety is important! -- cyphar
@@ -89,7 +90,7 @@ func parseCgroupFromReader(r io.Reader) (string, error) {
  parts = strings.SplitN(text, ":", 3)
  )
  if len(parts) < 3 {
- return "", errors.Errorf("invalid cgroup entry: %q", text)
+ return "", fmt.Errorf("invalid cgroup entry: %q", text)
  }
  // text is like "0::/user.slice/user-1001.slice/session-1.scope"
  if parts[0] == "0" && parts[1] == "" {

libcontainer/cgroups/fs2/devices.go

@@ -3,14 +3,15 @@
 package fs2
 
 import (
+ "fmt"
+
+ "golang.org/x/sys/unix"
+
  "github.com/opencontainers/runc/libcontainer/cgroups/ebpf"
  "github.com/opencontainers/runc/libcontainer/cgroups/ebpf/devicefilter"
  "github.com/opencontainers/runc/libcontainer/configs"
  "github.com/opencontainers/runc/libcontainer/devices"
  "github.com/opencontainers/runc/libcontainer/userns"
-
- "github.com/pkg/errors"
- "golang.org/x/sys/unix"
 )
 
 func isRWM(perms devices.Permissions) bool {
@@ -64,7 +65,7 @@ func setDevices(dirPath string, r *configs.Resources) error {
  }
  dirFD, err := unix.Open(dirPath, unix.O_DIRECTORY|unix.O_RDONLY, 0o600)
  if err != nil {
- return errors.Errorf("cannot get dir FD for %s", dirPath)
+ return fmt.Errorf("cannot get dir FD for %s", dirPath)
  }
  defer unix.Close(dirFD)
  if _, err := ebpf.LoadAttachCgroupDeviceFilter(insts, license, dirFD); err != nil {

libcontainer/cgroups/fs2/freezer.go

@@ -4,16 +4,16 @@ package fs2
 
 import (
  "bufio"
- stdErrors "errors"
+ "errors"
  "fmt"
  "os"
  "strings"
  "time"
 
+ "golang.org/x/sys/unix"
+
  "github.com/opencontainers/runc/libcontainer/cgroups"
  "github.com/opencontainers/runc/libcontainer/configs"
- "github.com/pkg/errors"
- "golang.org/x/sys/unix"
 )
 
 func setFreezer(dirPath string, state configs.FreezerState) error {
@@ -26,7 +26,7 @@ func setFreezer(dirPath string, state configs.FreezerState) error {
  case configs.Thawed:
  stateStr = "0"
  default:
- return errors.Errorf("invalid freezer state %q requested", state)
+ return fmt.Errorf("invalid freezer state %q requested", state)
  }
 
  fd, err := cgroups.OpenFile(dirPath, "cgroup.freeze", unix.O_RDWR)
@@ -37,7 +37,7 @@ func setFreezer(dirPath string, state configs.FreezerState) error {
  if state != configs.Frozen {
  return nil
  }
- return errors.Wrap(err, "freezer not supported")
+ return fmt.Errorf("freezer not supported: %w", err)
  }
  defer fd.Close()
 
@@ -48,7 +48,7 @@ func setFreezer(dirPath string, state configs.FreezerState) error {
  if actualState, err := readFreezer(dirPath, fd); err != nil {
  return err
  } else if actualState != state {
- return errors.Errorf(`expected "cgroup.freeze" to be in state %q but was in %q`, state, actualState)
+ return fmt.Errorf(`expected "cgroup.freeze" to be in state %q but was in %q`, state, actualState)
  }
  return nil
 }
@@ -58,7 +58,7 @@ func getFreezer(dirPath string) (configs.FreezerState, error) {
  if err != nil {
  // If the kernel is too old, then we just treat the freezer as being in
  // an "undefined" state.
- if os.IsNotExist(err) || stdErrors.Is(err, unix.ENODEV) {
+ if os.IsNotExist(err) || errors.Is(err, unix.ENODEV) {
  err = nil
  }
  return configs.Undefined, err
@@ -82,7 +82,7 @@ func readFreezer(dirPath string, fd *os.File) (configs.FreezerState, error) {
  case "1\n":
  return waitFrozen(dirPath)
  default:
- return configs.Undefined, errors.Errorf(`unknown "cgroup.freeze" state: %q`, state)
+ return configs.Undefined, fmt.Errorf(`unknown "cgroup.freeze" state: %q`, state)
  }
 }
 

libcontainer/cgroups/fs2/fs2.go

@@ -3,14 +3,14 @@
 package fs2
 
 import (
+ "errors"
  "fmt"
  "os"
  "strings"
 
  "github.com/opencontainers/runc/libcontainer/cgroups"
  "github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
  "github.com/opencontainers/runc/libcontainer/configs"
- "github.com/pkg/errors"
 )
 
 type parseError = fscommon.ParseError
@@ -80,7 +80,7 @@ func (m *manager) Apply(pid int) error {
  if blNeed, nErr := needAnyControllers(m.config.Resources); nErr == nil && !blNeed {
  return nil
  }
- return errors.Wrap(err, "rootless needs no limits + no cgrouppath when no permission is granted for cgroups")
+ return fmt.Errorf("rootless needs no limits + no cgrouppath when no permission is granted for cgroups: %w", err)
  }
  }
  return err
@@ -126,7 +126,7 @@ func (m *manager) GetStats() (*cgroups.Stats, error) {
  errs = append(errs, err)
  }
  if len(errs) > 0 && !m.rootless {
- return st, errors.Errorf("error while statting cgroup v2: %+v", errs)
+ return st, fmt.Errorf("error while statting cgroup v2: %+v", errs)
  }
  return st, nil
 }
@@ -200,9 +200,8 @@ func (m *manager) setUnified(res map[string]string) error {
  return fmt.Errorf("unified resource %q must be a file name (no slashes)", k)
  }
  if err := cgroups.WriteFile(m.dirPath, k, v); err != nil {
- errC := errors.Cause(err)
  // Check for both EPERM and ENOENT since O_CREAT is used by WriteFile.
- if errors.Is(errC, os.ErrPermission) || errors.Is(errC, os.ErrNotExist) {
+ if errors.Is(err, os.ErrPermission) || errors.Is(err, os.ErrNotExist) {
  // Check if a controller is available,
  // to give more specific error if not.
  sk := strings.SplitN(k, ".", 2)
@@ -214,7 +213,7 @@ func (m *manager) setUnified(res map[string]string) error {
  return fmt.Errorf("unified resource %q can't be set: controller %q not available", k, c)
  }
  }
- return errors.Wrapf(err, "can't set unified resource %q", k)
+ return fmt.Errorf("unable to set unified resource %q: %w", k, err)
  }
  }
 

libcontainer/cgroups/fs2/hugetlb.go

@@ -3,10 +3,9 @@
 package fs2
 
 import (
+ "fmt"
  "strconv"
 
- "github.com/pkg/errors"
-
  "github.com/opencontainers/runc/libcontainer/cgroups"
  "github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
  "github.com/opencontainers/runc/libcontainer/configs"
@@ -32,7 +31,7 @@ func setHugeTlb(dirPath string, r *configs.Resources) error {
 func statHugeTlb(dirPath string, stats *cgroups.Stats) error {
  hugePageSizes, err := cgroups.GetHugePageSize()
  if err != nil {
- return errors.Wrap(err, "failed to fetch hugetlb info")
+ return fmt.Errorf("failed to fetch hugetlb info: %w", err)
  }
  hugetlbStats := cgroups.HugetlbStats{}
 

libcontainer/cgroups/fs2/memory.go

@@ -4,16 +4,17 @@ package fs2
 
 import (
  "bufio"
+ "errors"
  "math"
  "os"
  "strconv"
  "strings"
 
+ "golang.org/x/sys/unix"
+
  "github.com/opencontainers/runc/libcontainer/cgroups"
  "github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
  "github.com/opencontainers/runc/libcontainer/configs"
- "github.com/pkg/errors"
- "golang.org/x/sys/unix"
 )
 
 // numToStr converts an int64 value to a string for writing to a

libcontainer/cgroups/fs2/pids.go

@@ -3,15 +3,16 @@
 package fs2
 
 import (
+ "errors"
  "math"
  "os"
  "strings"
 
+ "golang.org/x/sys/unix"
+
  "github.com/opencontainers/runc/libcontainer/cgroups"
  "github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
  "github.com/opencontainers/runc/libcontainer/configs"
- "github.com/pkg/errors"
- "golang.org/x/sys/unix"
 )
 
 func isPidsSet(r *configs.Resources) bool {