migrate Podman to containers/common/libimage

Migrate the Podman code base over to `common/libimage` which replaces
`libpod/image` and a lot of glue code entirely.

Note that I tried to leave bread crumbs for changed tests.

Miscellaneous changes:

 * Some errors yield different messages which required to alter some
   tests.

 * I fixed some pre-existing issues in the code.  Others were marked as
   `//TODO`s to prevent the PR from exploding.

 * The `NamesHistory` of an image is returned as is from the storage.
   Previously, we did some filtering which I think is undesirable.
   Instead we should return the data as stored in the storage.

 * Touched handlers use the ABI interfaces where possible.

 * Local image resolution: previously Podman would match "foo" on
   "myfoo".  This behaviour has been changed and Podman will now
   only match on repository boundaries such that "foo" would match
   "my/foo" but not "myfoo".  I consider the old behaviour to be a
   bug, at the very least an exotic corner case.

 * Futhermore, "foo:none" does *not* resolve to a local image "foo"
   without tag anymore.  It's a hill I am (almost) willing to die on.

 * `image prune` prints the IDs of pruned images.  Previously, in some
   cases, the names were printed instead.  The API clearly states ID,
   so we should stick to it.

 * Compat endpoint image removal with _force_ deletes the entire not
   only the specified tag.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

2 files changed, 23 insertions, 42 deletions

diff --git a/pkg/api/handlers/utils/errors.go b/pkg/api/handlers/utils/errors.go
index d22ad414f..4a8005bfd 100644
--- a/pkg/api/handlers/utils/errors.go
+++ b/pkg/api/handlers/utils/errors.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/containers/podman/v3/libpod/define"
 	"github.com/containers/podman/v3/pkg/errorhandling"
+	"github.com/containers/storage"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 )
@@ -49,7 +50,7 @@ func ContainerNotFound(w http.ResponseWriter, name string, err error) {
 }
 
 func ImageNotFound(w http.ResponseWriter, name string, err error) {
-	if errors.Cause(err) != define.ErrNoSuchImage {
+	if errors.Cause(err) != storage.ErrImageUnknown {
 		InternalServerError(w, err)
 	}
 	msg := fmt.Sprintf("No such image: %s", name)
diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go
index da3c9e985..2662cd368 100644
--- a/pkg/api/handlers/utils/images.go
+++ b/pkg/api/handlers/utils/images.go
@@ -3,15 +3,14 @@ package utils
 import (
 	"fmt"
 	"net/http"
-	"strings"
 
+	"github.com/containers/common/libimage"
+	"github.com/containers/common/pkg/filters"
 	"github.com/containers/image/v5/docker"
 	"github.com/containers/image/v5/storage"
 	"github.com/containers/image/v5/transports/alltransports"
 	"github.com/containers/image/v5/types"
 	"github.com/containers/podman/v3/libpod"
-	"github.com/containers/podman/v3/libpod/image"
-	"github.com/containers/podman/v3/pkg/util"
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"
 )
@@ -54,7 +53,7 @@ func ParseStorageReference(name string) (types.ImageReference, error) {
 
 // GetImages is a common function used to get images for libpod and other compatibility
 // mechanisms
-func GetImages(w http.ResponseWriter, r *http.Request) ([]*image.Image, error) {
+func GetImages(w http.ResponseWriter, r *http.Request) ([]*libimage.Image, error) {
 	decoder := r.Context().Value("decoder").(*schema.Decoder)
 	runtime := r.Context().Value("runtime").(*libpod.Runtime)
 	query := struct {
@@ -65,56 +64,37 @@ func GetImages(w http.ResponseWriter, r *http.Request) ([]*image.Image, error) {
 		// This is where you can override the golang default value for one of fields
 	}
 
-	filterMap, err := util.PrepareFilters(r)
-	if err != nil {
-		return nil, err
-	}
-
 	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
 		return nil, err
 	}
-	var filters = []string{}
 	if _, found := r.URL.Query()["digests"]; found && query.Digests {
 		UnSupportedParameter("digests")
 	}
-	var images []*image.Image
 
-	queryFilters := *filterMap
+	filterList, err := filters.FiltersFromRequest(r)
+	if err != nil {
+		return nil, err
+	}
 	if !IsLibpodRequest(r) && len(query.Filter) > 0 { // Docker 1.24 compatibility
-		if queryFilters == nil {
-			queryFilters = make(map[string][]string)
-		}
-		queryFilters["reference"] = append(queryFilters["reference"], query.Filter)
+		filterList = append(filterList, "reference="+query.Filter)
 	}
 
-	if len(queryFilters) > 0 {
-		for k, v := range queryFilters {
-			filters = append(filters, fmt.Sprintf("%s=%s", k, strings.Join(v, "=")))
-		}
-		images, err = runtime.ImageRuntime().GetImagesWithFilters(filters)
-		if err != nil {
-			return images, err
-		}
-	} else {
-		images, err = runtime.ImageRuntime().GetImages()
-		if err != nil {
-			return images, err
-		}
-	}
-	if query.All {
-		return images, nil
+	if !query.All {
+		// Filter intermediate images unless we want to list *all*.
+		// NOTE: it's a positive filter, so `intermediate=false` means
+		// to display non-intermediate images.
+		filterList = append(filterList, "intermediate=false")
 	}
+	listOptions := &libimage.ListImagesOptions{Filters: filterList}
+	return runtime.LibimageRuntime().ListImages(r.Context(), nil, listOptions)
+}
 
-	filter, err := runtime.ImageRuntime().IntermediateFilter(r.Context(), images)
+func GetImage(r *http.Request, name string) (*libimage.Image, error) {
+	runtime := r.Context().Value("runtime").(*libpod.Runtime)
+	lookupOptions := &libimage.LookupImageOptions{IgnorePlatform: true}
+	image, _, err := runtime.LibimageRuntime().LookupImage(name, lookupOptions)
 	if err != nil {
 		return nil, err
 	}
-	images = image.FilterImages(images, []image.ResultFilter{filter})
-
-	return images, nil
-}
-
-func GetImage(r *http.Request, name string) (*image.Image, error) {
-	runtime := r.Context().Value("runtime").(*libpod.Runtime)
-	return runtime.ImageRuntime().NewFromLocal(name)
+	return image, err
 }