diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-30 05:13:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 05:13:49 +0100 |
| commit | 7f0771fa9401c26e942c67788bebc0041dfa3311 (patch) | |
| tree | dc5d925da58c4658b26ba850ead3b09d67226e10 /pkg/api | |
| parent | 9c9f02aad773051fa742a874844f08f2fb567d3b (diff) | |
| parent | 76afb50f3ae41a3cc43fca8cc41a2d2f1f1b6dcc (diff) | |
| download | podman-7f0771fa9401c26e942c67788bebc0041dfa3311.tar.gz podman-7f0771fa9401c26e942c67788bebc0041dfa3311.tar.bz2 podman-7f0771fa9401c26e942c67788bebc0041dfa3311.zip | |
Merge pull request #8809 from bblenard/bblenard-dev
Consolidate filter logic to pkg subdirectory
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/compat/containers_prune.go | 4 | ||||
| -rw-r--r-- | pkg/api/handlers/utils/pods.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/api/handlers/compat/containers_prune.go b/pkg/api/handlers/compat/containers_prune.go index 2cfeebcce..a1e35dd97 100644 --- a/pkg/api/handlers/compat/containers_prune.go +++ b/pkg/api/handlers/compat/containers_prune.go @@ -4,9 +4,9 @@ import ( "net/http" "github.com/containers/podman/v2/libpod" - lpfilters "github.com/containers/podman/v2/libpod/filters" "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/filters" "github.com/docker/docker/api/types" "github.com/gorilla/schema" "github.com/pkg/errors" @@ -29,7 +29,7 @@ func PruneContainers(w http.ResponseWriter, r *http.Request) { } filterFuncs := make([]libpod.ContainerFilter, 0, len(query.Filters)) for k, v := range query.Filters { - generatedFunc, err := lpfilters.GenerateContainerFilterFuncs(k, v, runtime) + generatedFunc, err := filters.GenerateContainerFilterFuncs(k, v, runtime) if err != nil { utils.InternalServerError(w, err) return diff --git a/pkg/api/handlers/utils/pods.go b/pkg/api/handlers/utils/pods.go index 7506dbfd1..0fe3a308b 100644 --- a/pkg/api/handlers/utils/pods.go +++ b/pkg/api/handlers/utils/pods.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/containers/podman/v2/libpod" - lpfilters "github.com/containers/podman/v2/libpod/filters" "github.com/containers/podman/v2/pkg/domain/entities" + dfilters "github.com/containers/podman/v2/pkg/domain/filters" "github.com/gorilla/schema" ) @@ -31,7 +31,7 @@ func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport filters := make([]libpod.PodFilter, 0, len(query.Filters)) for k, v := range query.Filters { - f, err := lpfilters.GeneratePodFilterFunc(k, v) + f, err := dfilters.GeneratePodFilterFunc(k, v) if err != nil { return nil, err } |