Stop excessive wrapping of errors

Most of the builtin golang functions like os.Stat and
os.Open report errors including the file system object
path. We should not wrap these errors and put the file path
in a second time, causing stuttering of errors when they
get presented to the user.

This patch tries to cleanup a bunch of these errors.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

1 files changed, 23 insertions, 23 deletions

diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 57d5100cf..b26a60146 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -309,7 +309,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) {
 				fallthrough
 			case "Z":
 				if err := label.Relabel(m.Source, c.MountLabel(), label.IsShared(o)); err != nil {
-					return nil, errors.Wrapf(err, "relabel failed %q", m.Source)
+					return nil, err
 				}
 
 			default:
@@ -360,11 +360,11 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) {
 	for _, overlayVol := range c.config.OverlayVolumes {
 		contentDir, err := overlay.TempDir(c.config.StaticDir, c.RootUID(), c.RootGID())
 		if err != nil {
-			return nil, errors.Wrapf(err, "failed to create TempDir in the %s directory", c.config.StaticDir)
+			return nil, err
 		}
 		overlayMount, err := overlay.Mount(contentDir, overlayVol.Source, overlayVol.Dest, c.RootUID(), c.RootGID(), c.runtime.store.GraphOptions())
 		if err != nil {
-			return nil, errors.Wrapf(err, "creating overlay failed %q", overlayVol.Source)
+			return nil, errors.Wrapf(err, "mounting overlay failed %q", overlayVol.Source)
 		}
 		g.AddMount(overlayMount)
 	}
@@ -811,7 +811,7 @@ func (c *Container) exportCheckpoint(dest string, ignoreRootfs bool) error {
 				return errors.Wrapf(err, "error creating delete files list file %q", deleteFilesList)
 			}
 			if err := ioutil.WriteFile(deleteFilesList, formatJSON, 0600); err != nil {
-				return errors.Wrapf(err, "error creating delete files list file %q", deleteFilesList)
+				return errors.Wrap(err, "error creating delete files list file")
 			}
 
 			includeFiles = append(includeFiles, "deleted.files")
@@ -835,7 +835,7 @@ func (c *Container) exportCheckpoint(dest string, ignoreRootfs bool) error {
 	defer outFile.Close()
 
 	if err := os.Chmod(dest, 0600); err != nil {
-		return errors.Wrapf(err, "cannot chmod %q", dest)
+		return err
 	}
 
 	_, err = io.Copy(outFile, input)
@@ -1059,7 +1059,7 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti
 					if n.Sandbox != "" {
 						MAC, err = net.ParseMAC(n.Mac)
 						if err != nil {
-							return errors.Wrapf(err, "failed to parse MAC %v", n.Mac)
+							return err
 						}
 						break
 					}
@@ -1163,14 +1163,14 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti
 				return errors.Wrapf(err, "failed to read deleted files file")
 			}
 			if err := json.Unmarshal(deletedFilesJSON, &deletedFiles); err != nil {
-				return errors.Wrapf(err, "failed to read deleted files file %s", deletedFilesPath)
+				return errors.Wrapf(err, "failed to unmarshal deleted files file %s", deletedFilesPath)
 			}
 			for _, deleteFile := range deletedFiles {
 				// Using RemoveAll as deletedFiles, which is generated from 'podman diff'
 				// lists completely deleted directories as a single entry: 'D /root'.
 				err = os.RemoveAll(filepath.Join(c.state.Mountpoint, deleteFile))
 				if err != nil {
-					return errors.Wrapf(err, "failed to delete file %s from container %s during restore", deletedFilesPath, c.ID())
+					return errors.Wrapf(err, "failed to delete files from container %s during restore", c.ID())
 				}
 			}
 		}
@@ -1209,7 +1209,7 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti
 // Make standard bind mounts to include in the container
 func (c *Container) makeBindMounts() error {
 	if err := os.Chown(c.state.RunDir, c.RootUID(), c.RootGID()); err != nil {
-		return errors.Wrapf(err, "cannot chown run directory %s", c.state.RunDir)
+		return errors.Wrap(err, "cannot chown run directory")
 	}
 
 	if c.state.BindMounts == nil {
@@ -1227,13 +1227,13 @@ func (c *Container) makeBindMounts() error {
 		if c.config.NetNsCtr == "" {
 			if resolvePath, ok := c.state.BindMounts["/etc/resolv.conf"]; ok {
 				if err := os.Remove(resolvePath); err != nil && !os.IsNotExist(err) {
-					return errors.Wrapf(err, "error removing container %s resolv.conf", c.ID())
+					return errors.Wrapf(err, "container %s", c.ID())
 				}
 				delete(c.state.BindMounts, "/etc/resolv.conf")
 			}
 			if hostsPath, ok := c.state.BindMounts["/etc/hosts"]; ok {
 				if err := os.Remove(hostsPath); err != nil && !os.IsNotExist(err) {
-					return errors.Wrapf(err, "error removing container %s hosts", c.ID())
+					return errors.Wrapf(err, "container %s", c.ID())
 				}
 				delete(c.state.BindMounts, "/etc/hosts")
 			}
@@ -1433,7 +1433,7 @@ func (c *Container) generateResolvConf() (string, error) {
 				if err == nil {
 					resolvConf = definedPath
 				} else if !os.IsNotExist(err) {
-					return "", errors.Wrapf(err, "failed to stat %s", definedPath)
+					return "", err
 				}
 			}
 			break
@@ -1455,7 +1455,7 @@ func (c *Container) generateResolvConf() (string, error) {
 	contents, err := ioutil.ReadFile(resolvPath)
 	// resolv.conf doesn't have to exists
 	if err != nil && !os.IsNotExist(err) {
-		return "", errors.Wrapf(err, "unable to read %s", resolvPath)
+		return "", err
 	}
 
 	// Ensure that the container's /etc/resolv.conf is compatible with its
@@ -1524,7 +1524,7 @@ func (c *Container) generateResolvConf() (string, error) {
 	destPath := filepath.Join(c.state.RunDir, "resolv.conf")
 
 	if err := os.Remove(destPath); err != nil && !os.IsNotExist(err) {
-		return "", errors.Wrapf(err, "error removing resolv.conf for container %s", c.ID())
+		return "", errors.Wrapf(err, "container %s", c.ID())
 	}
 
 	// Build resolv.conf
@@ -1544,7 +1544,7 @@ func (c *Container) generateResolvConf() (string, error) {
 func (c *Container) generateHosts(path string) (string, error) {
 	orig, err := ioutil.ReadFile(path)
 	if err != nil {
-		return "", errors.Wrapf(err, "unable to read %s", path)
+		return "", err
 	}
 	hosts := string(orig)
 	hosts += c.getHosts()
@@ -1947,7 +1947,7 @@ func (c *Container) generatePasswdAndGroup() (string, string, error) {
 			}
 			orig, err := ioutil.ReadFile(originPasswdFile)
 			if err != nil && !os.IsNotExist(err) {
-				return "", "", errors.Wrapf(err, "unable to read passwd file %s", originPasswdFile)
+				return "", "", err
 			}
 			passwdFile, err := c.writeStringToStaticDir("passwd", string(orig)+passwdEntry)
 			if err != nil {
@@ -1966,7 +1966,7 @@ func (c *Container) generatePasswdAndGroup() (string, string, error) {
 
 			f, err := os.OpenFile(containerPasswd, os.O_APPEND|os.O_WRONLY, 0600)
 			if err != nil {
-				return "", "", errors.Wrapf(err, "error opening container %s /etc/passwd", c.ID())
+				return "", "", errors.Wrapf(err, "container %s", c.ID())
 			}
 			defer f.Close()
 
@@ -1993,7 +1993,7 @@ func (c *Container) generatePasswdAndGroup() (string, string, error) {
 			}
 			orig, err := ioutil.ReadFile(originGroupFile)
 			if err != nil && !os.IsNotExist(err) {
-				return "", "", errors.Wrapf(err, "unable to read group file %s", originGroupFile)
+				return "", "", err
 			}
 			groupFile, err := c.writeStringToStaticDir("group", string(orig)+groupEntry)
 			if err != nil {
@@ -2012,7 +2012,7 @@ func (c *Container) generatePasswdAndGroup() (string, string, error) {
 
 			f, err := os.OpenFile(containerGroup, os.O_APPEND|os.O_WRONLY, 0600)
 			if err != nil {
-				return "", "", errors.Wrapf(err, "error opening container %s /etc/group", c.ID())
+				return "", "", errors.Wrapf(err, "container %s", c.ID())
 			}
 			defer f.Close()
 
@@ -2033,13 +2033,13 @@ func (c *Container) copyOwnerAndPerms(source, dest string) error {
 		if os.IsNotExist(err) {
 			return nil
 		}
-		return errors.Wrapf(err, "cannot stat `%s`", dest)
+		return err
 	}
 	if err := os.Chmod(dest, info.Mode()); err != nil {
-		return errors.Wrapf(err, "cannot chmod `%s`", dest)
+		return err
 	}
 	if err := os.Chown(dest, int(info.Sys().(*syscall.Stat_t).Uid), int(info.Sys().(*syscall.Stat_t).Gid)); err != nil {
-		return errors.Wrapf(err, "cannot chown `%s`", dest)
+		return err
 	}
 	return nil
 }
@@ -2130,7 +2130,7 @@ func (c *Container) checkFileExistsInRootfs(file string) (bool, error) {
 		if os.IsNotExist(err) {
 			return false, nil
 		}
-		return false, errors.Wrapf(err, "error accessing container %s file %q", c.ID(), file)
+		return false, errors.Wrapf(err, "container %s", c.ID())
 	}
 	if stat.IsDir() {
 		return false, nil