From 7bf72862424419918b4f4f72a0b925b45e173e3e Mon Sep 17 00:00:00 2001
From: Malte Poll <1780588+malt3@users.noreply.github.com>
Date: Fri, 13 Jan 2023 10:15:49 +0100
Subject: [PATCH] cli: include search paths for image info json in error
 message printed to user (#963)

---
 cli/internal/image/image.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/cli/internal/image/image.go b/cli/internal/image/image.go
index 49af298f6..44715836f 100644
--- a/cli/internal/image/image.go
+++ b/cli/internal/image/image.go
@@ -54,11 +54,22 @@ func (f *Fetcher) FetchReference(ctx context.Context, config *config.Config) (st
 		Version: ver.Version,
 	}
 
+	url, err := imgInfoReq.URL()
+	if err != nil {
+		return "", err
+	}
+
 	imgInfo, err := getFromFile(f.fs, imgInfoReq)
 	if err != nil && errors.Is(err, fs.ErrNotExist) {
 		imgInfo, err = f.fetcher.FetchImageInfo(ctx, imgInfoReq)
 	}
-	if err != nil {
+
+	var notFoundErr *fetcher.NotFoundError
+	switch {
+	case errors.As(err, &notFoundErr):
+		overridePath := imageInfoFilename(imgInfoReq)
+		return "", fmt.Errorf("image info file not found locally at %q or remotely at %s", overridePath, url)
+	case err != nil:
 		return "", err
 	}