diff --git a/api/client/client.go b/api/client/client.go index 0ae78af012..5e737c2d82 100644 --- a/api/client/client.go +++ b/api/client/client.go @@ -9,8 +9,8 @@ import ( "github.com/docker/docker/api/client/lib" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/registry" - "github.com/docker/docker/pkg/parsers/filters" "github.com/docker/docker/runconfig" ) diff --git a/api/client/events.go b/api/client/events.go index a6702e130d..ba0227d8fb 100644 --- a/api/client/events.go +++ b/api/client/events.go @@ -2,11 +2,11 @@ package client import ( "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" Cli "github.com/docker/docker/cli" "github.com/docker/docker/opts" "github.com/docker/docker/pkg/jsonmessage" flag "github.com/docker/docker/pkg/mflag" - "github.com/docker/docker/pkg/parsers/filters" ) // CmdEvents prints a live stream of real time events from the server. diff --git a/api/client/images.go b/api/client/images.go index 895f1b0d56..2fc5304902 100644 --- a/api/client/images.go +++ b/api/client/images.go @@ -8,10 +8,10 @@ import ( "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" Cli "github.com/docker/docker/cli" "github.com/docker/docker/opts" flag "github.com/docker/docker/pkg/mflag" - "github.com/docker/docker/pkg/parsers/filters" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/units" ) diff --git a/api/client/lib/container_list.go b/api/client/lib/container_list.go index 5392894c76..6ffe415856 100644 --- a/api/client/lib/container_list.go +++ b/api/client/lib/container_list.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/docker/docker/api/types" - "github.com/docker/docker/pkg/parsers/filters" + "github.com/docker/docker/api/types/filters" ) // ContainerList returns the list of containers in the docker host. diff --git a/api/client/lib/events.go b/api/client/lib/events.go index 887c6502de..502e765208 100644 --- a/api/client/lib/events.go +++ b/api/client/lib/events.go @@ -6,8 +6,8 @@ import ( "time" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" timetypes "github.com/docker/docker/api/types/time" - "github.com/docker/docker/pkg/parsers/filters" ) // Events returns a stream of events in the daemon in a ReadCloser. diff --git a/api/client/lib/image_list.go b/api/client/lib/image_list.go index 8e4bf4ba80..d0b18ea911 100644 --- a/api/client/lib/image_list.go +++ b/api/client/lib/image_list.go @@ -5,7 +5,7 @@ import ( "net/url" "github.com/docker/docker/api/types" - "github.com/docker/docker/pkg/parsers/filters" + "github.com/docker/docker/api/types/filters" ) // ImageList returns a list of images in the docker host. diff --git a/api/client/lib/volume.go b/api/client/lib/volume.go index afb75b4983..fdcd1cf529 100644 --- a/api/client/lib/volume.go +++ b/api/client/lib/volume.go @@ -6,7 +6,7 @@ import ( "net/url" "github.com/docker/docker/api/types" - "github.com/docker/docker/pkg/parsers/filters" + "github.com/docker/docker/api/types/filters" ) // VolumeList returns the volumes configured in the docker host. diff --git a/api/client/ps.go b/api/client/ps.go index a39bc5c0a9..90c585a513 100644 --- a/api/client/ps.go +++ b/api/client/ps.go @@ -3,10 +3,10 @@ package client import ( "github.com/docker/docker/api/client/ps" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" Cli "github.com/docker/docker/cli" "github.com/docker/docker/opts" flag "github.com/docker/docker/pkg/mflag" - "github.com/docker/docker/pkg/parsers/filters" ) // CmdPs outputs a list of Docker containers. diff --git a/api/client/volume.go b/api/client/volume.go index 1eb790f5ba..a7c686348a 100644 --- a/api/client/volume.go +++ b/api/client/volume.go @@ -5,10 +5,10 @@ import ( "text/tabwriter" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" Cli "github.com/docker/docker/cli" "github.com/docker/docker/opts" flag "github.com/docker/docker/pkg/mflag" - "github.com/docker/docker/pkg/parsers/filters" ) // CmdVolume is the parent subcommand for all volume commands diff --git a/api/common_test.go b/api/common_test.go index aa30099d03..a513c75212 100644 --- a/api/common_test.go +++ b/api/common_test.go @@ -5,8 +5,9 @@ import ( "path/filepath" "testing" - "github.com/docker/docker/api/types" "os" + + "github.com/docker/docker/api/types" ) type ports struct { diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go index 5db04bc2be..da647080d4 100644 --- a/api/server/router/network/network_routes.go +++ b/api/server/router/network/network_routes.go @@ -10,9 +10,9 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/network" "github.com/docker/docker/daemon" - "github.com/docker/docker/pkg/parsers/filters" "github.com/docker/docker/runconfig" "github.com/docker/libnetwork" ) diff --git a/api/server/router/system/backend.go b/api/server/router/system/backend.go index a67f351f3e..21755b78e5 100644 --- a/api/server/router/system/backend.go +++ b/api/server/router/system/backend.go @@ -2,8 +2,8 @@ package system import ( "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" "github.com/docker/docker/pkg/jsonmessage" - "github.com/docker/docker/pkg/parsers/filters" ) // Backend is the methods that need to be implemented to provide diff --git a/api/server/router/system/system_routes.go b/api/server/router/system/system_routes.go index 331f326380..a0ee4e7133 100644 --- a/api/server/router/system/system_routes.go +++ b/api/server/router/system/system_routes.go @@ -9,10 +9,10 @@ import ( "github.com/docker/docker/api" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" timetypes "github.com/docker/docker/api/types/time" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/jsonmessage" - "github.com/docker/docker/pkg/parsers/filters" "golang.org/x/net/context" ) diff --git a/api/types/client.go b/api/types/client.go index c2f2f4d1be..4846e502b7 100644 --- a/api/types/client.go +++ b/api/types/client.go @@ -5,7 +5,7 @@ import ( "io" "net" - "github.com/docker/docker/pkg/parsers/filters" + "github.com/docker/docker/api/types/filters" "github.com/docker/docker/pkg/ulimit" "github.com/docker/docker/runconfig" ) diff --git a/pkg/parsers/filters/parse.go b/api/types/filters/parse.go similarity index 100% rename from pkg/parsers/filters/parse.go rename to api/types/filters/parse.go diff --git a/pkg/parsers/filters/parse_test.go b/api/types/filters/parse_test.go similarity index 100% rename from pkg/parsers/filters/parse_test.go rename to api/types/filters/parse_test.go diff --git a/daemon/daemon.go b/daemon/daemon.go index a690dac107..2e38e6838c 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -22,6 +22,7 @@ import ( "github.com/docker/distribution/reference" "github.com/docker/docker/api" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/container" "github.com/docker/docker/daemon/events" @@ -49,7 +50,6 @@ import ( "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/namesgenerator" "github.com/docker/docker/pkg/nat" - "github.com/docker/docker/pkg/parsers/filters" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/signal" "github.com/docker/docker/pkg/streamformatter" diff --git a/daemon/events/filter.go b/daemon/events/filter.go index e15ca436d4..fa751d54b5 100644 --- a/daemon/events/filter.go +++ b/daemon/events/filter.go @@ -2,8 +2,8 @@ package events import ( "github.com/docker/distribution/reference" + "github.com/docker/docker/api/types/filters" "github.com/docker/docker/pkg/jsonmessage" - "github.com/docker/docker/pkg/parsers/filters" ) // Filter can filter out docker events from a stream diff --git a/daemon/images.go b/daemon/images.go index a2d3d7bac9..9220400271 100644 --- a/daemon/images.go +++ b/daemon/images.go @@ -7,9 +7,9 @@ import ( "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" "github.com/docker/docker/image" "github.com/docker/docker/layer" - "github.com/docker/docker/pkg/parsers/filters" ) var acceptedImageFilterTags = map[string]bool{ @@ -31,7 +31,7 @@ func (daemon *Daemon) Map() map[image.ID]*image.Image { } // Images returns a filtered list of images. filterArgs is a JSON-encoded set -// of filter arguments which will be interpreted by pkg/parsers/filters. +// of filter arguments which will be interpreted by api/types/filters. // filter is a shell glob string applied to repository names. The argument // named all controls whether all images in the graph are filtered, or just // the heads. diff --git a/daemon/list.go b/daemon/list.go index 5bec6bd384..33814da9e2 100644 --- a/daemon/list.go +++ b/daemon/list.go @@ -8,11 +8,11 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" "github.com/docker/docker/container" "github.com/docker/docker/image" "github.com/docker/docker/pkg/graphdb" "github.com/docker/docker/pkg/nat" - "github.com/docker/docker/pkg/parsers/filters" ) // iterationAction represents possible outcomes happening during the container iteration. diff --git a/integration-cli/docker_api_network_test.go b/integration-cli/docker_api_network_test.go index 30435b7b19..d88ae24b44 100644 --- a/integration-cli/docker_api_network_test.go +++ b/integration-cli/docker_api_network_test.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/network" "github.com/docker/docker/pkg/integration/checker" - "github.com/docker/docker/pkg/parsers/filters" "github.com/go-check/check" )