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>

1 files changed, 2 insertions, 2 deletions

diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go
index 4bcf70b0d..ef310d590 100644
--- a/pkg/varlinkapi/images.go
+++ b/pkg/varlinkapi/images.go
@@ -155,7 +155,7 @@ func (i *VarlinkAPI) BuildImage(call iopodman.VarlinkCall, config iopodman.Build
 
 	reader, err := os.Open(contextDir)
 	if err != nil {
-		logrus.Errorf("failed to open the context dir tar file %s", contextDir)
+		logrus.Errorf("failed to open the context dir tar file")
 		return call.ReplyErrorOccurred(fmt.Sprintf("unable to open context dir tar file %s", contextDir))
 	}
 	defer reader.Close()
@@ -166,7 +166,7 @@ func (i *VarlinkAPI) BuildImage(call iopodman.VarlinkCall, config iopodman.Build
 	logrus.Debugf("untar of %s successful", contextDir)
 	defer func() {
 		if err := os.Remove(contextDir); err != nil {
-			logrus.Errorf("unable to delete file '%s': %q", contextDir, err)
+			logrus.Error(err)
 		}
 		if err := os.RemoveAll(newContextDir); err != nil {
 			logrus.Errorf("unable to delete directory '%s': %q", newContextDir, err)