v2 bloat pruning phase 2

this is second phase of removing unneeded bloat in the remote client. this is important to be able to reduce the client size as well as possible native compilation for windows/mac.

Signed-off-by: Brent Baude <bbaude@redhat.com>

4 files changed, 29 insertions, 45 deletions

diff --git a/pkg/api/handlers/compat/containers_prune.go b/pkg/api/handlers/compat/containers_prune.go
index bf3aecd65..b4e98ac1f 100644
--- a/pkg/api/handlers/compat/containers_prune.go
+++ b/pkg/api/handlers/compat/containers_prune.go
@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/containers/libpod/libpod"
+	lpfilters "github.com/containers/libpod/libpod/filters"
 	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/docker/docker/api/types"
@@ -15,6 +16,7 @@ func PruneContainers(w http.ResponseWriter, r *http.Request) {
 	var (
 		delContainers []string
 		space         int64
+		filterFuncs   []libpod.ContainerFilter
 	)
 	runtime := r.Context().Value("runtime").(*libpod.Runtime)
 	decoder := r.Context().Value("decoder").(*schema.Decoder)
@@ -26,11 +28,15 @@ func PruneContainers(w http.ResponseWriter, r *http.Request) {
 		utils.Error(w, "Something went wrong.", http.StatusBadRequest, errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
 		return
 	}
-
-	filterFuncs, err := utils.GenerateFilterFuncsFromMap(runtime, query.Filters)
-	if err != nil {
-		utils.InternalServerError(w, err)
-		return
+	for k, v := range query.Filters {
+		for _, val := range v {
+			generatedFunc, err := lpfilters.GenerateContainerFilterFuncs(k, val, runtime)
+			if err != nil {
+				utils.InternalServerError(w, err)
+				return
+			}
+			filterFuncs = append(filterFuncs, generatedFunc)
+		}
 	}
 	prunedContainers, pruneErrors, err := runtime.PruneContainers(filterFuncs)
 	if err != nil {
diff --git a/pkg/api/handlers/libpod/volumes.go b/pkg/api/handlers/libpod/volumes.go
index 5a6fc021e..18c561a0d 100644
--- a/pkg/api/handlers/libpod/volumes.go
+++ b/pkg/api/handlers/libpod/volumes.go
@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/containers/libpod/cmd/podman/shared"
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/domain/filters"
+	"github.com/containers/libpod/pkg/domain/infra/abi/parse"
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"
 )
@@ -46,7 +46,7 @@ func CreateVolume(w http.ResponseWriter, r *http.Request) {
 		volumeOptions = append(volumeOptions, libpod.WithVolumeLabels(input.Label))
 	}
 	if len(input.Options) > 0 {
-		parsedOptions, err := shared.ParseVolumeOptions(input.Options)
+		parsedOptions, err := parse.ParseVolumeOptions(input.Options)
 		if err != nil {
 			utils.InternalServerError(w, err)
 			return
diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go
index bbe4cee3c..d1107f67c 100644
--- a/pkg/api/handlers/utils/containers.go
+++ b/pkg/api/handlers/utils/containers.go
@@ -6,9 +6,10 @@ import (
 	"time"
 
 	"github.com/containers/libpod/cmd/podman/shared"
+	createconfig "github.com/containers/libpod/pkg/spec"
+
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
-	createconfig "github.com/containers/libpod/pkg/spec"
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"
 )
@@ -68,24 +69,6 @@ func WaitContainer(w http.ResponseWriter, r *http.Request) (int32, error) {
 	return con.WaitForConditionWithInterval(interval, condition)
 }
 
-// GenerateFilterFuncsFromMap is used to generate un-executed functions that can be used to filter
-// containers.  It is specifically designed for the RESTFUL API input.
-func GenerateFilterFuncsFromMap(r *libpod.Runtime, filters map[string][]string) ([]libpod.ContainerFilter, error) {
-	var (
-		filterFuncs []libpod.ContainerFilter
-	)
-	for k, v := range filters {
-		for _, val := range v {
-			f, err := shared.GenerateContainerFilterFuncs(k, val, r)
-			if err != nil {
-				return filterFuncs, err
-			}
-			filterFuncs = append(filterFuncs, f)
-		}
-	}
-	return filterFuncs, nil
-}
-
 func CreateContainer(ctx context.Context, w http.ResponseWriter, runtime *libpod.Runtime, cc *createconfig.CreateConfig) {
 	var pod *libpod.Pod
 	ctr, err := shared.CreateContainerFromCreateConfig(runtime, cc, ctx, pod)
diff --git a/pkg/api/handlers/utils/pods.go b/pkg/api/handlers/utils/pods.go
index d47053eda..fb795fa6a 100644
--- a/pkg/api/handlers/utils/pods.go
+++ b/pkg/api/handlers/utils/pods.go
@@ -1,20 +1,19 @@
 package utils
 
 import (
-	"fmt"
 	"net/http"
 
-	"github.com/containers/libpod/cmd/podman/shared"
 	"github.com/containers/libpod/libpod"
+	lpfilters "github.com/containers/libpod/libpod/filters"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/gorilla/schema"
 )
 
 func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport, error) {
 	var (
-		lps    []*entities.ListPodsReport
-		pods   []*libpod.Pod
-		podErr error
+		lps     []*entities.ListPodsReport
+		pods    []*libpod.Pod
+		filters []libpod.PodFilter
 	)
 	runtime := r.Context().Value("runtime").(*libpod.Runtime)
 	decoder := r.Context().Value("decoder").(*schema.Decoder)
@@ -28,28 +27,24 @@ func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport
 	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")
 	}
 
-	if len(query.Filters) > 0 {
-		for k, v := range query.Filters {
-			for _, val := range v {
-				filters = append(filters, fmt.Sprintf("%s=%s", k, val))
+	for k, v := range query.Filters {
+		for _, filter := range v {
+			f, err := lpfilters.GeneratePodFilterFunc(k, filter)
+			if err != nil {
+				return nil, err
 			}
+			filters = append(filters, f)
 		}
-		filterFuncs, err := shared.GenerateFilterFunction(runtime, filters)
-		if err != nil {
-			return nil, err
-		}
-		pods, podErr = shared.FilterAllPodsWithFilterFunc(runtime, filterFuncs...)
-	} else {
-		pods, podErr = runtime.GetAllPods()
 	}
-	if podErr != nil {
-		return nil, podErr
+	pods, err := runtime.Pods(filters...)
+	if err != nil {
+		return nil, err
 	}
+
 	for _, pod := range pods {
 		status, err := pod.GetPodStatus()
 		if err != nil {