From f262673b60b77cf831a92b6b6bb8eec2762dc118 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 8 Dec 2020 15:09:59 +0100 Subject: [PATCH] cleanup: return error type in lookupRBDImageMetadataStash() Signed-off-by: Niels de Vos --- internal/rbd/rbd_util.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index 7713392b6..93b450b16 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -1117,7 +1117,7 @@ func lookupRBDImageMetadataStash(path string) (rbdImageMetadataStash, error) { encodedBytes, err := ioutil.ReadFile(fPath) // #nosec - intended reading from fPath if err != nil { if !os.IsNotExist(err) { - return imgMeta, fmt.Errorf("failed to read stashed JSON image metadata from path (%s): (%v)", fPath, err) + return imgMeta, fmt.Errorf("failed to read stashed JSON image metadata from path (%s): %w", fPath, err) } return imgMeta, util.JoinErrors(ErrMissingStash, err) @@ -1125,7 +1125,7 @@ func lookupRBDImageMetadataStash(path string) (rbdImageMetadataStash, error) { err = json.Unmarshal(encodedBytes, &imgMeta) if err != nil { - return imgMeta, fmt.Errorf("failed to unmarshall stashed JSON image metadata from path (%s): (%v)", fPath, err) + return imgMeta, fmt.Errorf("failed to unmarshall stashed JSON image metadata from path (%s): %w", fPath, err) } return imgMeta, nil