From af50bcec69a4e4179cfb3e074481bcbb1a1c0f03 Mon Sep 17 00:00:00 2001 From: James Rawlings Date: Fri, 8 Feb 2019 21:14:53 +0000 Subject: [PATCH] let's return errors when warming a cache (#553) * let's return errors when warming a cache * Fix lint error in warm.go --- pkg/cache/warm.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/cache/warm.go b/pkg/cache/warm.go index fc7b6b6c8..02bb550fe 100644 --- a/pkg/cache/warm.go +++ b/pkg/cache/warm.go @@ -37,25 +37,23 @@ func WarmCache(opts *config.WarmerOptions) error { for _, image := range images { cacheRef, err := name.NewTag(image, name.WeakValidation) if err != nil { - errors.Wrap(err, fmt.Sprintf("Failed to verify image name: %s", image)) + return errors.Wrap(err, fmt.Sprintf("Failed to verify image name: %s", image)) } img, err := remote.Image(cacheRef) if err != nil { - errors.Wrap(err, fmt.Sprintf("Failed to retrieve image: %s", image)) + return errors.Wrap(err, fmt.Sprintf("Failed to retrieve image: %s", image)) } digest, err := img.Digest() if err != nil { - errors.Wrap(err, fmt.Sprintf("Failed to retrieve digest: %s", image)) + return errors.Wrap(err, fmt.Sprintf("Failed to retrieve digest: %s", image)) } cachePath := path.Join(cacheDir, digest.String()) err = tarball.WriteToFile(cachePath, cacheRef, img) if err != nil { - errors.Wrap(err, fmt.Sprintf("Failed to write %s to cache", image)) - } else { - logrus.Debugf("Wrote %s to cache", image) + return errors.Wrap(err, fmt.Sprintf("Failed to write %s to cache", image)) } - + logrus.Debugf("Wrote %s to cache", image) } return nil }