From f525d8b8431b13359c0e2f6c8be45687eb32a0fd Mon Sep 17 00:00:00 2001
From: Qi Wang <qiwan@redhat.com>
Date: Thu, 22 Oct 2020 15:00:31 -0400
Subject: Do not pass name argument to Load API

Not pass the name argument to Load API. Specify in the document the usage of the optional argument is tagging an additional image.
Close #7337

Signed-off-by: Qi Wang <qiwan@redhat.com>
---
 libpod/runtime_img.go | 52 +++++++++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

(limited to 'libpod')

diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go
index e57890fa2..a2d9a875e 100644
--- a/libpod/runtime_img.go
+++ b/libpod/runtime_img.go
@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"strings"
 
 	"github.com/containers/buildah/imagebuildah"
 	"github.com/containers/image/v5/directory"
@@ -276,56 +275,47 @@ func DownloadFromFile(reader *os.File) (string, error) {
 }
 
 // LoadImage loads a container image into local storage
-func (r *Runtime) LoadImage(ctx context.Context, name, inputFile string, writer io.Writer, signaturePolicy string) (string, error) {
-	var (
-		newImages []*image.Image
-		err       error
-		src       types.ImageReference
-	)
+func (r *Runtime) LoadImage(ctx context.Context, inputFile string, writer io.Writer, signaturePolicy string) (string, error) {
+	if newImages, err := r.LoadAllImageFromArchive(ctx, writer, inputFile, signaturePolicy); err == nil {
+		return newImages, nil
+	}
+	return r.LoadImageFromSingleImageArchive(ctx, writer, inputFile, signaturePolicy)
+}
 
-	if name == "" {
-		newImages, err = r.ImageRuntime().LoadAllImagesFromDockerArchive(ctx, inputFile, signaturePolicy, writer)
-		if err == nil {
-			return getImageNames(newImages), nil
-		}
+// LoadAllImageFromArchive loads all images from the archive of multi-image that inputFile points to.
+func (r *Runtime) LoadAllImageFromArchive(ctx context.Context, writer io.Writer, inputFile, signaturePolicy string) (string, error) {
+	newImages, err := r.ImageRuntime().LoadAllImagesFromDockerArchive(ctx, inputFile, signaturePolicy, writer)
+	if err == nil {
+		return getImageNames(newImages), nil
 	}
+	return "", err
+}
 
+// LoadImageFromSingleImageArchive load image from the archive of single image that inputFile points to.
+func (r *Runtime) LoadImageFromSingleImageArchive(ctx context.Context, writer io.Writer, inputFile, signaturePolicy string) (string, error) {
+	var err error
 	for _, referenceFn := range []func() (types.ImageReference, error){
 		func() (types.ImageReference, error) {
 			return dockerarchive.ParseReference(inputFile)
 		},
 		func() (types.ImageReference, error) {
-			return ociarchive.NewReference(inputFile, name) // name may be ""
-		},
-		func() (types.ImageReference, error) {
-			// prepend "localhost/" to support local image saved with this semantics
-			if !strings.Contains(name, "/") {
-				return ociarchive.NewReference(inputFile, fmt.Sprintf("%s/%s", image.DefaultLocalRegistry, name))
-			}
-			return nil, nil
+			return ociarchive.NewReference(inputFile, "")
 		},
 		func() (types.ImageReference, error) {
 			return directory.NewReference(inputFile)
 		},
 		func() (types.ImageReference, error) {
-			return layout.NewReference(inputFile, name)
-		},
-		func() (types.ImageReference, error) {
-			// prepend "localhost/" to support local image saved with this semantics
-			if !strings.Contains(name, "/") {
-				return layout.NewReference(inputFile, fmt.Sprintf("%s/%s", image.DefaultLocalRegistry, name))
-			}
-			return nil, nil
+			return layout.NewReference(inputFile, "")
 		},
 	} {
-		src, err = referenceFn()
+		src, err := referenceFn()
 		if err == nil && src != nil {
-			if newImages, err = r.ImageRuntime().LoadFromArchiveReference(ctx, src, signaturePolicy, writer); err == nil {
+			if newImages, err := r.ImageRuntime().LoadFromArchiveReference(ctx, src, signaturePolicy, writer); err == nil {
 				return getImageNames(newImages), nil
 			}
 		}
 	}
-	return "", errors.Wrapf(err, "error pulling %q", name)
+	return "", errors.Wrapf(err, "error pulling image")
 }
 
 func getImageNames(images []*image.Image) string {
-- 
cgit v1.2.3-54-g00ecf