Merge pull request #8177 from rhatdan/wrap

Stop excessive wrapping of errors

4 files changed, 14 insertions, 17 deletions

diff --git a/pkg/domain/infra/abi/cp.go b/pkg/domain/infra/abi/cp.go
index ab90c8183..8f4f5d3d7 100644
--- a/pkg/domain/infra/abi/cp.go
+++ b/pkg/domain/infra/abi/cp.go
@@ -214,7 +214,7 @@ func getPathInfo(path string) (string, os.FileInfo, error) {
 	}
 	srcfi, err := os.Stat(path)
 	if err != nil {
-		return "", nil, errors.Wrapf(err, "error reading path %q", path)
+		return "", nil, err
 	}
 	return path, srcfi, nil
 }
@@ -245,7 +245,7 @@ func containerCopy(srcPath, destPath, src, dest string, idMappingOpts storage.ID
 	}
 	_, err = os.Stat(destdir)
 	if err != nil && !os.IsNotExist(err) {
-		return errors.Wrapf(err, "error checking directory %q", destdir)
+		return err
 	}
 	destDirIsExist := err == nil
 	if err = os.MkdirAll(destdir, 0755); err != nil {
@@ -292,7 +292,7 @@ func containerCopy(srcPath, destPath, src, dest string, idMappingOpts storage.ID
 	destfi, err := os.Stat(destPath)
 	if err != nil {
 		if !os.IsNotExist(err) || strings.HasSuffix(dest, string(os.PathSeparator)) {
-			return errors.Wrapf(err, "failed to get stat of dest path %s", destPath)
+			return err
 		}
 	}
 	if destfi != nil && destfi.IsDir() {
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index 348570a20..57de0f3b1 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -251,7 +251,7 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
 			case v1.HostPathDirectoryOrCreate:
 				if _, err := os.Stat(hostPath.Path); os.IsNotExist(err) {
 					if err := os.Mkdir(hostPath.Path, kubeDirectoryPermission); err != nil {
-						return nil, errors.Errorf("error creating HostPath %s", volume.Name)
+						return nil, err
 					}
 				}
 				// Label a newly created volume
@@ -262,7 +262,7 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
 				if _, err := os.Stat(hostPath.Path); os.IsNotExist(err) {
 					f, err := os.OpenFile(hostPath.Path, os.O_RDONLY|os.O_CREATE, kubeFilePermission)
 					if err != nil {
-						return nil, errors.Errorf("error creating HostPath %s", volume.Name)
+						return nil, errors.Wrap(err, "error creating HostPath")
 					}
 					if err := f.Close(); err != nil {
 						logrus.Warnf("Error in closing newly created HostPath file: %v", err)
diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go
index fac02ad01..fcb7641d2 100644
--- a/pkg/specgen/generate/config_linux.go
+++ b/pkg/specgen/generate/config_linux.go
@@ -52,7 +52,7 @@ func addPrivilegedDevices(g *generate.Generator) error {
 				if err == unix.EPERM {
 					continue
 				}
-				return errors.Wrapf(err, "stat %s", d.Path)
+				return err
 			}
 			// Skip devices that the user has not access to.
 			if st.Mode()&0007 == 0 {
@@ -90,7 +90,7 @@ func DevicesFromPath(g *generate.Generator, devicePath string) error {
 	}
 	st, err := os.Stat(resolvedDevicePath)
 	if err != nil {
-		return errors.Wrapf(err, "cannot stat device path %s", devicePath)
+		return err
 	}
 	if st.IsDir() {
 		found := false
@@ -231,10 +231,7 @@ func addDevice(g *generate.Generator, device string) error {
 	}
 	if rootless.IsRootless() {
 		if _, err := os.Stat(src); err != nil {
-			if os.IsNotExist(err) {
-				return errors.Wrapf(err, "the specified device %s doesn't exist", src)
-			}
-			return errors.Wrapf(err, "stat device %s exist", src)
+			return err
 		}
 		perm := "ro"
 		if strings.Contains(permissions, "w") {
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go
index 55a0118cb..ddc73ca61 100644
--- a/pkg/specgen/generate/namespaces.go
+++ b/pkg/specgen/generate/namespaces.go
@@ -279,7 +279,7 @@ func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt
 	switch s.PidNS.NSMode {
 	case specgen.Path:
 		if _, err := os.Stat(s.PidNS.Value); err != nil {
-			return errors.Wrapf(err, "cannot find specified PID namespace path %q", s.PidNS.Value)
+			return errors.Wrap(err, "cannot find specified PID namespace path")
 		}
 		if err := g.AddOrReplaceLinuxNamespace(string(spec.PIDNamespace), s.PidNS.Value); err != nil {
 			return err
@@ -298,7 +298,7 @@ func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt
 	switch s.IpcNS.NSMode {
 	case specgen.Path:
 		if _, err := os.Stat(s.IpcNS.Value); err != nil {
-			return errors.Wrapf(err, "cannot find specified IPC namespace path %q", s.IpcNS.Value)
+			return errors.Wrap(err, "cannot find specified IPC namespace path")
 		}
 		if err := g.AddOrReplaceLinuxNamespace(string(spec.IPCNamespace), s.IpcNS.Value); err != nil {
 			return err
@@ -317,7 +317,7 @@ func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt
 	switch s.UtsNS.NSMode {
 	case specgen.Path:
 		if _, err := os.Stat(s.UtsNS.Value); err != nil {
-			return errors.Wrapf(err, "cannot find specified UTS namespace path %q", s.UtsNS.Value)
+			return errors.Wrap(err, "cannot find specified UTS namespace path")
 		}
 		if err := g.AddOrReplaceLinuxNamespace(string(spec.UTSNamespace), s.UtsNS.Value); err != nil {
 			return err
@@ -368,7 +368,7 @@ func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt
 	switch s.UserNS.NSMode {
 	case specgen.Path:
 		if _, err := os.Stat(s.UserNS.Value); err != nil {
-			return errors.Wrapf(err, "cannot find specified user namespace path %s", s.UserNS.Value)
+			return errors.Wrap(err, "cannot find specified user namespace path")
 		}
 		if err := g.AddOrReplaceLinuxNamespace(string(spec.UserNamespace), s.UserNS.Value); err != nil {
 			return err
@@ -411,7 +411,7 @@ func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt
 	switch s.CgroupNS.NSMode {
 	case specgen.Path:
 		if _, err := os.Stat(s.CgroupNS.Value); err != nil {
-			return errors.Wrapf(err, "cannot find specified cgroup namespace path %s", s.CgroupNS.Value)
+			return errors.Wrap(err, "cannot find specified cgroup namespace path")
 		}
 		if err := g.AddOrReplaceLinuxNamespace(string(spec.CgroupNamespace), s.CgroupNS.Value); err != nil {
 			return err
@@ -430,7 +430,7 @@ func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt
 	switch s.NetNS.NSMode {
 	case specgen.Path:
 		if _, err := os.Stat(s.NetNS.Value); err != nil {
-			return errors.Wrapf(err, "cannot find specified network namespace path %s", s.NetNS.Value)
+			return errors.Wrap(err, "cannot find specified network namespace path")
 		}
 		if err := g.AddOrReplaceLinuxNamespace(string(spec.NetworkNamespace), s.NetNS.Value); err != nil {
 			return err