Improve an error message

We are seeing > reference "[overlay@...]quay.io/...@sha256:..." does not resolve to an image ID: identifier is not an image which is misleading; hide the ErrNoSuchImage text. Signed-off-by: Miloslav Trmač <[email protected]>
containers · Oct 25, 2024 · 3a74378 · 3a74378
1 parent 94e0c4f
commit 3a74378
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/storage/storage_reference.go b/storage/storage_reference.go
@@ -153,7 +153,9 @@ func (s *storageReference) resolveImage(sys *types.SystemContext) (*storage.Imag
 	}
 	if s.id == "" {
 		logrus.Debugf("reference %q does not resolve to an image ID", s.StringWithinTransport())
-		return nil, fmt.Errorf("reference %q does not resolve to an image ID: %w", s.StringWithinTransport(), ErrNoSuchImage)
+		// %.0w makes the error visible to error.Unwrap() without including any text.
+		// ErrNoSuchImage ultimately is “identifier is not an image”, which is not helpful for identifying the root cause.
+		return nil, fmt.Errorf("reference %q does not resolve to an image ID%.0w", s.StringWithinTransport(), ErrNoSuchImage)
 	}
 	if loadedImage == nil {
 		img, err := s.transport.store.Image(s.id)