Review corrections pass #2

Add API review comments to correct documentation and endpoints.  Also, add a libpode prune method to reduce code duplication.  Only used right now for the API but when the remote client is wired, we will switch over there too.

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

2 files changed, 28 insertions, 1 deletions

diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go
index 64d3d378a..2c986db3a 100644
--- a/pkg/api/handlers/utils/containers.go
+++ b/pkg/api/handlers/utils/containers.go
@@ -6,6 +6,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/containers/libpod/cmd/podman/shared"
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/gorilla/mux"
@@ -83,7 +84,7 @@ func WaitContainer(w http.ResponseWriter, r *http.Request) (int32, error) {
 	}
 
 	if len(query.Condition) > 0 {
-		return 0, errors.Errorf("the condition parameter is not supported")
+		UnSupportedParameter("condition")
 	}
 
 	name := mux.Vars(r)["name"]
@@ -101,3 +102,21 @@ func WaitContainer(w http.ResponseWriter, r *http.Request) (int32, error) {
 	}
 	return con.Wait()
 }
+
+// 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
+}
diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go
index 2fd9bffba..f2ce26f1a 100644
--- a/pkg/api/handlers/utils/handler.go
+++ b/pkg/api/handlers/utils/handler.go
@@ -51,3 +51,11 @@ func WriteJSON(w http.ResponseWriter, code int, value interface{}) {
 		logrus.Errorf("unable to write json: %q", err)
 	}
 }
+
+func FilterMapToString(filters map[string][]string) (string, error) {
+	f, err := json.Marshal(filters)
+	if err != nil {
+		return "", err
+	}
+	return string(f), nil
+}