1 files changed, 26 insertions, 44 deletions

diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
index daaf9d018..50d763338 100644
--- a/pkg/api/handlers/libpod/pods.go
+++ b/pkg/api/handlers/libpod/pods.go
@@ -12,6 +12,7 @@ import (
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/api/handlers"
 	"github.com/containers/libpod/pkg/api/handlers/utils"
+	"github.com/containers/libpod/pkg/util"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"
@@ -107,7 +108,7 @@ func Pods(w http.ResponseWriter, r *http.Request) {
 	)
 	decoder := r.Context().Value("decoder").(*schema.Decoder)
 	query := struct {
-		filters []string `schema:"filters"`
+		Filters map[string][]string `schema:"filters"`
 	}{
 		// override any golang type defaults
 	}
@@ -116,10 +117,12 @@ func Pods(w http.ResponseWriter, r *http.Request) {
 			errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
 		return
 	}
-	if len(query.filters) > 0 {
+
+	if _, found := r.URL.Query()["filters"]; found {
 		utils.Error(w, "filters are not implemented yet", http.StatusInternalServerError, define.ErrNotImplemented)
 		return
 	}
+
 	pods, err := runtime.GetAllPods()
 	if err != nil {
 		utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
@@ -163,7 +166,7 @@ func PodStop(w http.ResponseWriter, r *http.Request) {
 		decoder   = r.Context().Value("decoder").(*schema.Decoder)
 	)
 	query := struct {
-		timeout int `schema:"t"`
+		Timeout int `schema:"t"`
 	}{
 		// override any golang type defaults
 	}
@@ -206,8 +209,8 @@ func PodStop(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if query.timeout > 0 {
-		_, stopError = pod.StopWithTimeout(r.Context(), false, query.timeout)
+	if query.Timeout > 0 {
+		_, stopError = pod.StopWithTimeout(r.Context(), false, query.Timeout)
 	} else {
 		_, stopError = pod.Stop(r.Context(), false)
 	}
@@ -265,7 +268,7 @@ func PodDelete(w http.ResponseWriter, r *http.Request) {
 		decoder = r.Context().Value("decoder").(*schema.Decoder)
 	)
 	query := struct {
-		force bool `schema:"force"`
+		Force bool `schema:"force"`
 	}{
 		// override any golang type defaults
 	}
@@ -281,7 +284,7 @@ func PodDelete(w http.ResponseWriter, r *http.Request) {
 		utils.PodNotFound(w, name, err)
 		return
 	}
-	if err := runtime.RemovePod(r.Context(), pod, true, query.force); err != nil {
+	if err := runtime.RemovePod(r.Context(), pod, true, query.Force); err != nil {
 		utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
 		return
 	}
@@ -306,43 +309,14 @@ func PodRestart(w http.ResponseWriter, r *http.Request) {
 
 func PodPrune(w http.ResponseWriter, r *http.Request) {
 	var (
-		err     error
-		pods    []*libpod.Pod
 		runtime = r.Context().Value("runtime").(*libpod.Runtime)
-		decoder = r.Context().Value("decoder").(*schema.Decoder)
 	)
-	query := struct {
-		force bool `schema:"force"`
-	}{
-		// override any golang type defaults
-	}
-
-	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
-		utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest,
-			errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
-		return
-	}
-
-	if query.force {
-		pods, err = runtime.GetAllPods()
-		if err != nil {
-			utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
-			return
-		}
-	} else {
-		// TODO We need to make a libpod.PruneVolumes or this code will be a mess.  Volumes
-		// already does this right.  It will also help clean this code path up with less
-		// conditionals. We do this when we integrate with libpod again.
-		utils.Error(w, "not implemented", http.StatusInternalServerError, errors.New("not implemented"))
+	pruned, err := runtime.PrunePods()
+	if err != nil {
+		utils.InternalServerError(w, err)
 		return
 	}
-	for _, p := range pods {
-		if err := runtime.RemovePod(r.Context(), p, true, query.force); err != nil {
-			utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
-			return
-		}
-	}
-	utils.WriteResponse(w, http.StatusNoContent, "")
+	utils.WriteResponse(w, http.StatusOK, pruned)
 }
 
 func PodPause(w http.ResponseWriter, r *http.Request) {
@@ -384,18 +358,27 @@ func PodKill(w http.ResponseWriter, r *http.Request) {
 	var (
 		runtime = r.Context().Value("runtime").(*libpod.Runtime)
 		decoder = r.Context().Value("decoder").(*schema.Decoder)
+		signal  = "SIGKILL"
 	)
 	query := struct {
-		signal int `schema:"signal"`
+		signal string `schema:"signal"`
 	}{
 		// override any golang type defaults
 	}
-
 	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
 		utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest,
 			errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
 		return
 	}
+	muxVars := mux.Vars(r)
+	if _, found := muxVars["signal"]; found {
+		signal = query.signal
+	}
+
+	sig, err := util.ParseSignal(signal)
+	if err != nil {
+		utils.InternalServerError(w, errors.Wrapf(err, "unable to parse signal value"))
+	}
 	name := mux.Vars(r)["name"]
 	pod, err := runtime.LookupPod(name)
 	if err != nil {
@@ -419,8 +402,7 @@ func PodKill(w http.ResponseWriter, r *http.Request) {
 		utils.Error(w, msg, http.StatusConflict, errors.Errorf("cannot kill a pod with no running containers: %s", pod.ID()))
 		return
 	}
-	// TODO How do we differentiate if a signal was sent vs accepting the pod/container default?
-	_, err = pod.Kill(uint(query.signal))
+	_, err = pod.Kill(uint(sig))
 	if err != nil {
 		utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
 		return