exporter: allow unpack on multi-platform images

fddd129 added an overly broad check for
preventing unpacking scratch objects, which also prevents unpacking any
multi-platform images (which instead use `src.Refs`).

We can push the nil check down into unpackImage, and also use the
`FindRef` result helper to simplify to the Ref(s).

Signed-off-by: Justin Chadwell <[email protected]>

Author: jedevc

exporter/containerimage/export.go

@@ -258,7 +258,7 @@ func (e *imageExporterInstance) Export(ctx context.Context, src *exporter.Source
 				}
 				tagDone(nil)
 
-				if src.Ref != nil && e.unpack {
+				if e.unpack {
 					if err := e.unpackImage(ctx, img, src, session.NewGroup(sessionID)); err != nil {
 						return nil, nil, err
 					}
@@ -366,16 +366,16 @@ func (e *imageExporterInstance) unpackImage(ctx context.Context, img images.Imag
 		return err
 	}
 
-	topLayerRef := src.Ref
-	if len(src.Refs) > 0 {
-		if r, ok := src.Refs[defaultPlatform()]; ok {
-			topLayerRef = r
-		} else {
-			return errors.Errorf("no reference for default platform %s", defaultPlatform())
-		}
+	ref, ok := src.FindRef(defaultPlatform())
+	if !ok {
+		return errors.Errorf("no reference for default platform %s", defaultPlatform())
+	}
+	if ref == nil {
+		// ref has no layers, so nothing to unpack
+		return nil
 	}
 
-	remotes, err := topLayerRef.GetRemotes(ctx, true, e.opts.RefCfg, false, s)
+	remotes, err := ref.GetRemotes(ctx, true, e.opts.RefCfg, false, s)
 	if err != nil {
 		return err
 	}