From 4878dff3e2c89382699c29c10dc5036367275575 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 5 Oct 2020 12:33:53 -0700 Subject: 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 --- pkg/checkpoint/checkpoint_restore.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'pkg/checkpoint/checkpoint_restore.go') diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go index 2a73efe36..e1f6703f4 100644 --- a/pkg/checkpoint/checkpoint_restore.go +++ b/pkg/checkpoint/checkpoint_restore.go @@ -22,15 +22,9 @@ import ( // crImportFromJSON imports the JSON files stored in the exported // checkpoint tarball func crImportFromJSON(filePath string, v interface{}) error { - jsonFile, err := os.Open(filePath) + content, err := ioutil.ReadFile(filePath) if err != nil { - return errors.Wrapf(err, "Failed to open container definition %s for restore", filePath) - } - defer errorhandling.CloseQuiet(jsonFile) - - content, err := ioutil.ReadAll(jsonFile) - if err != nil { - return errors.Wrapf(err, "Failed to read container definition %s for restore", filePath) + return errors.Wrap(err, "Failed to read container definition for restore") } json := jsoniter.ConfigCompatibleWithStandardLibrary if err = json.Unmarshal(content, v); err != nil { @@ -47,7 +41,7 @@ func CRImportCheckpoint(ctx context.Context, runtime *libpod.Runtime, input stri // tarball to a temporary directory archiveFile, err := os.Open(input) if err != nil { - return nil, errors.Wrapf(err, "Failed to open checkpoint archive %s for import", input) + return nil, errors.Wrap(err, "Failed to open checkpoint archive for import") } defer errorhandling.CloseQuiet(archiveFile) options := &archive.TarOptions{ -- cgit v1.2.3-54-g00ecf