Remove excessive error wrapping

In case os.Open[File], os.Mkdir[All], ioutil.ReadFile and the like
fails, the error message already contains the file name and the
operation that fails, so there is no need to wrap the error with
something like "open %s failed".

While at it

 - replace a few places with os.Open, ioutil.ReadAll with
   ioutil.ReadFile.

 - replace errors.Wrapf with errors.Wrap for cases where there
   are no %-style arguments.

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

7 files changed, 22 insertions, 32 deletions

diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 0514fb46f..d64d3ab87 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -496,7 +496,7 @@ func (c *Container) setupStorage(ctx context.Context) error {
 
 	artifacts := filepath.Join(c.config.StaticDir, artifactsDir)
 	if err := os.MkdirAll(artifacts, 0755); err != nil {
-		return errors.Wrapf(err, "error creating artifacts directory %q", artifacts)
+		return errors.Wrap(err, "error creating artifacts directory")
 	}
 
 	return nil
@@ -1820,7 +1820,7 @@ func (c *Container) appendStringToRundir(destFile, output string) (string, error
 
 	f, err := os.OpenFile(destFileName, os.O_APPEND|os.O_WRONLY, 0600)
 	if err != nil {
-		return "", errors.Wrapf(err, "unable to open %s", destFileName)
+		return "", err
 	}
 	defer f.Close()
 
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 514cdaee1..2f107446f 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -835,13 +835,13 @@ func (c *Container) checkpointRestoreLabelLog(fileName string) error {
 
 	logFile, err := os.OpenFile(dumpLog, os.O_CREATE, 0600)
 	if err != nil {
-		return errors.Wrapf(err, "failed to create CRIU log file %q", dumpLog)
+		return errors.Wrap(err, "failed to create CRIU log file")
 	}
 	if err := logFile.Close(); err != nil {
-		logrus.Errorf("unable to close log file: %q", err)
+		logrus.Error(err)
 	}
 	if err = label.SetFileLabel(dumpLog, c.MountLabel()); err != nil {
-		return errors.Wrapf(err, "failed to label CRIU log file %q", dumpLog)
+		return err
 	}
 	return nil
 }
@@ -919,7 +919,7 @@ func (c *Container) checkpoint(ctx context.Context, options ContainerCheckpointO
 func (c *Container) importCheckpoint(input string) error {
 	archiveFile, err := os.Open(input)
 	if err != nil {
-		return errors.Wrapf(err, "Failed to open checkpoint archive %s for import", input)
+		return errors.Wrap(err, "Failed to open checkpoint archive for import")
 	}
 
 	defer archiveFile.Close()
@@ -1116,7 +1116,7 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti
 			// Only do this if a rootfs-diff.tar actually exists
 			rootfsDiffFile, err := os.Open(rootfsDiffPath)
 			if err != nil {
-				return errors.Wrapf(err, "Failed to open root file-system diff file %s", rootfsDiffPath)
+				return errors.Wrap(err, "Failed to open root file-system diff file")
 			}
 			defer rootfsDiffFile.Close()
 			if err := c.runtime.ApplyDiffTarStream(c.ID(), rootfsDiffFile); err != nil {
@@ -1125,16 +1125,10 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti
 		}
 		deletedFilesPath := filepath.Join(c.bundlePath(), "deleted.files")
 		if _, err := os.Stat(deletedFilesPath); err == nil {
-			deletedFilesFile, err := os.Open(deletedFilesPath)
-			if err != nil {
-				return errors.Wrapf(err, "Failed to open deleted files file %s", deletedFilesPath)
-			}
-			defer deletedFilesFile.Close()
-
 			var deletedFiles []string
-			deletedFilesJSON, err := ioutil.ReadAll(deletedFilesFile)
+			deletedFilesJSON, err := ioutil.ReadFile(deletedFilesPath)
 			if err != nil {
-				return errors.Wrapf(err, "Failed to read deleted files file %s", deletedFilesPath)
+				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)
diff --git a/libpod/lock/file/file_lock.go b/libpod/lock/file/file_lock.go
index e50d67321..2643c9211 100644
--- a/libpod/lock/file/file_lock.go
+++ b/libpod/lock/file/file_lock.go
@@ -26,7 +26,7 @@ func CreateFileLock(path string) (*FileLocks, error) {
 		return nil, errors.Wrapf(syscall.EEXIST, "directory %s exists", path)
 	}
 	if err := os.MkdirAll(path, 0711); err != nil {
-		return nil, errors.Wrapf(err, "cannot create %s", path)
+		return nil, err
 	}
 
 	locks := new(FileLocks)
@@ -40,7 +40,7 @@ func CreateFileLock(path string) (*FileLocks, error) {
 func OpenFileLock(path string) (*FileLocks, error) {
 	_, err := os.Stat(path)
 	if err != nil {
-		return nil, errors.Wrapf(err, "accessing directory %s", path)
+		return nil, err
 	}
 
 	locks := new(FileLocks)
@@ -84,7 +84,7 @@ func (locks *FileLocks) AllocateLock() (uint32, error) {
 			if os.IsExist(err) {
 				continue
 			}
-			return 0, errors.Wrapf(err, "creating lock file")
+			return 0, errors.Wrap(err, "creating lock file")
 		}
 		f.Close()
 		break
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
index c0508ce39..d16bdc973 100644
--- a/libpod/networking_linux.go
+++ b/libpod/networking_linux.go
@@ -662,12 +662,12 @@ func (r *Runtime) setupNetNS(ctr *Container) error {
 	nsPath := fmt.Sprintf("/var/run/netns/cni-%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
 
 	if err := os.MkdirAll(filepath.Dir(nsPath), 0711); err != nil {
-		return errors.Wrapf(err, "cannot create %s", filepath.Dir(nsPath))
+		return err
 	}
 
 	mountPointFd, err := os.Create(nsPath)
 	if err != nil {
-		return errors.Wrapf(err, "cannot open %s", nsPath)
+		return err
 	}
 	if err := mountPointFd.Close(); err != nil {
 		return err
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index 1d4f33794..d9812c7e1 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -157,15 +157,13 @@ func newConmonOCIRuntime(name string, paths []string, conmonPath string, runtime
 	if err := os.MkdirAll(runtime.exitsDir, 0750); err != nil {
 		// The directory is allowed to exist
 		if !os.IsExist(err) {
-			return nil, errors.Wrapf(err, "error creating OCI runtime exit files directory %s",
-				runtime.exitsDir)
+			return nil, errors.Wrapf(err, "error creating OCI runtime exit files directory")
 		}
 	}
 	if err := os.MkdirAll(runtime.socketsDir, 0750); err != nil {
 		// The directory is allowed to exist
 		if !os.IsExist(err) {
-			return nil, errors.Wrapf(err, "error creating OCI runtime attach sockets directory %s",
-				runtime.socketsDir)
+			return nil, errors.Wrap(err, "error creating OCI runtime attach sockets directory")
 		}
 	}
 
diff --git a/libpod/runtime.go b/libpod/runtime.go
index fdd9ebcc8..6918bd1d7 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -251,8 +251,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
 	if err := os.MkdirAll(runtime.config.Engine.StaticDir, 0700); err != nil {
 		// The directory is allowed to exist
 		if !os.IsExist(err) {
-			return errors.Wrapf(err, "error creating runtime static files directory %s",
-				runtime.config.Engine.StaticDir)
+			return errors.Wrap(err, "error creating runtime static files directory")
 		}
 	}
 
@@ -348,7 +347,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
 	if err := os.MkdirAll(runtime.config.Engine.TmpDir, 0751); err != nil {
 		// The directory is allowed to exist
 		if !os.IsExist(err) {
-			return errors.Wrapf(err, "error creating tmpdir %s", runtime.config.Engine.TmpDir)
+			return errors.Wrap(err, "error creating tmpdir")
 		}
 	}
 
@@ -356,7 +355,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
 	if err := os.MkdirAll(filepath.Dir(runtime.config.Engine.EventsLogFilePath), 0700); err != nil {
 		// The directory is allowed to exist
 		if !os.IsExist(err) {
-			return errors.Wrapf(err, "error creating events dirs %s", filepath.Dir(runtime.config.Engine.EventsLogFilePath))
+			return errors.Wrap(err, "error creating events dirs")
 		}
 	}
 
@@ -416,8 +415,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
 	if err := os.MkdirAll(runtime.config.Engine.TmpDir, 0755); err != nil {
 		// The directory is allowed to exist
 		if !os.IsExist(err) {
-			return errors.Wrapf(err, "error creating runtime temporary files directory %s",
-				runtime.config.Engine.TmpDir)
+			return errors.Wrapf(err, "error creating runtime temporary files directory")
 		}
 	}
 
@@ -649,7 +647,7 @@ func (r *Runtime) refresh(alivePath string) error {
 	// Create a file indicating the runtime is alive and ready
 	file, err := os.OpenFile(alivePath, os.O_RDONLY|os.O_CREATE, 0644)
 	if err != nil {
-		return errors.Wrapf(err, "error creating runtime status file %s", alivePath)
+		return errors.Wrap(err, "error creating runtime status file")
 	}
 	defer file.Close()
 
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
index 241448981..ee179ff2c 100644
--- a/libpod/runtime_ctr.go
+++ b/libpod/runtime_ctr.go
@@ -331,7 +331,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai
 		ctr.config.ShmDir = filepath.Join(ctr.bundlePath(), "shm")
 		if err := os.MkdirAll(ctr.config.ShmDir, 0700); err != nil {
 			if !os.IsExist(err) {
-				return nil, errors.Wrapf(err, "unable to create shm %q dir", ctr.config.ShmDir)
+				return nil, errors.Wrap(err, "unable to create shm dir")
 			}
 		}
 		ctr.config.Mounts = append(ctr.config.Mounts, ctr.config.ShmDir)