diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-02-11 12:40:41 -0600 |
|---|---|---|
| committer | Brent Baude <bbaude@redhat.com> | 2020-02-11 12:42:58 -0600 |
| commit | ad4a92c5e53f222bd99d2b55e175eef48d077cf4 (patch) | |
| tree | 06bcf014a9d176232d182a257a3b5f835596ef67 /pkg/api | |
| parent | 86b5a89d1afb641196214ed9c57e83e617776c5f (diff) | |
| download | podman-ad4a92c5e53f222bd99d2b55e175eef48d077cf4.tar.gz podman-ad4a92c5e53f222bd99d2b55e175eef48d077cf4.tar.bz2 podman-ad4a92c5e53f222bd99d2b55e175eef48d077cf4.zip | |
Fix container filters
container filters were being double encoded (maybe triple) which resulted in the wrong encoding representation of filters being sent by the go-bindings. Also, on the server side, Filter needed to be changed to Filter to decode properly. Finally, due to the changed return type of List Containers, the go bindings return values needed to be changed.
Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/libpod/containers.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go index a64ed446c..e11e26510 100644 --- a/pkg/api/handlers/libpod/containers.go +++ b/pkg/api/handlers/libpod/containers.go @@ -56,7 +56,7 @@ func ListContainers(w http.ResponseWriter, r *http.Request) { decoder := r.Context().Value("decoder").(*schema.Decoder) query := struct { All bool `schema:"all"` - Filter map[string][]string `schema:"filter"` + Filters map[string][]string `schema:"filters"` Last int `schema:"last"` Namespace bool `schema:"namespace"` Pod bool `schema:"pod"` @@ -71,6 +71,7 @@ func ListContainers(w http.ResponseWriter, r *http.Request) { errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String())) return } + runtime := r.Context().Value("runtime").(*libpod.Runtime) opts := shared.PsOptions{ All: query.All, @@ -82,8 +83,8 @@ func ListContainers(w http.ResponseWriter, r *http.Request) { Pod: query.Pod, Sync: query.Sync, } - if len(query.Filter) > 0 { - for k, v := range query.Filter { + if len(query.Filters) > 0 { + for k, v := range query.Filters { for _, val := range v { generatedFunc, err := shared.GenerateContainerFilterFuncs(k, val, runtime) if err != nil { |