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>

1 files changed, 15 insertions, 29 deletions

diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go
index 2b4cef1bb..bca92a4af 100644
--- a/pkg/api/handlers/libpod/system.go
+++ b/pkg/api/handlers/libpod/system.go
@@ -4,21 +4,19 @@ import (
 	"net/http"
 
 	"github.com/containers/podman/v3/libpod"
-	"github.com/containers/podman/v3/pkg/api/handlers/compat"
 	"github.com/containers/podman/v3/pkg/api/handlers/utils"
 	"github.com/containers/podman/v3/pkg/domain/entities"
 	"github.com/containers/podman/v3/pkg/domain/infra/abi"
+	"github.com/containers/podman/v3/pkg/util"
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"
 )
 
 // SystemPrune removes unused data
 func SystemPrune(w http.ResponseWriter, r *http.Request) {
-	var (
-		decoder           = r.Context().Value("decoder").(*schema.Decoder)
-		runtime           = r.Context().Value("runtime").(*libpod.Runtime)
-		systemPruneReport = new(entities.SystemPruneReport)
-	)
+	decoder := r.Context().Value("decoder").(*schema.Decoder)
+	runtime := r.Context().Value("runtime").(*libpod.Runtime)
+
 	query := struct {
 		All     bool `schema:"all"`
 		Volumes bool `schema:"volumes"`
@@ -29,39 +27,27 @@ func SystemPrune(w http.ResponseWriter, r *http.Request) {
 			errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
 		return
 	}
-
-	podPruneReport, err := PodPruneHelper(r)
+	filterMap, err := util.PrepareFilters(r)
 	if err != nil {
-		utils.InternalServerError(w, err)
+		utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest,
+			errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
 		return
 	}
-	systemPruneReport.PodPruneReport = podPruneReport
 
-	// We could parallelize this, should we?
-	containerPruneReports, err := compat.PruneContainersHelper(r, nil)
-	if err != nil {
-		utils.InternalServerError(w, err)
-		return
-	}
-	systemPruneReport.ContainerPruneReports = containerPruneReports
+	containerEngine := abi.ContainerEngine{Libpod: runtime}
 
-	imagePruneReports, err := runtime.ImageRuntime().PruneImages(r.Context(), query.All, nil)
+	pruneOptions := entities.SystemPruneOptions{
+		All:     query.All,
+		Volume:  query.Volumes,
+		Filters: *filterMap,
+	}
+	report, err := containerEngine.SystemPrune(r.Context(), pruneOptions)
 	if err != nil {
 		utils.InternalServerError(w, err)
 		return
 	}
 
-	systemPruneReport.ImagePruneReports = imagePruneReports
-
-	if query.Volumes {
-		volumePruneReports, err := pruneVolumesHelper(r)
-		if err != nil {
-			utils.InternalServerError(w, err)
-			return
-		}
-		systemPruneReport.VolumePruneReports = volumePruneReports
-	}
-	utils.WriteResponse(w, http.StatusOK, systemPruneReport)
+	utils.WriteResponse(w, http.StatusOK, report)
 }
 
 func DiskUsage(w http.ResponseWriter, r *http.Request) {