From a1afad3aabb6504a073bc44568fc40fcabc4f775 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 4 Jun 2020 12:14:16 +0200 Subject: [PATCH] api/types: remove errdefs dependency This prevents projects that import only the api/types package from also having to use the errdefs package (and because of that, containerd) as a dependency. Signed-off-by: Sebastiaan van Stijn --- api/server/router/network/network_routes.go | 2 +- api/types/network/network.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go index aa8280c8ac..6fd59fc6f8 100644 --- a/api/server/router/network/network_routes.go +++ b/api/server/router/network/network_routes.go @@ -30,7 +30,7 @@ func (n *networkRouter) getNetworksList(ctx context.Context, w http.ResponseWrit } if err := network.ValidateFilters(filter); err != nil { - return err + return errdefs.InvalidParameter(err) } var list []types.NetworkResource diff --git a/api/types/network/network.go b/api/types/network/network.go index 7927dbfffb..437b184c67 100644 --- a/api/types/network/network.go +++ b/api/types/network/network.go @@ -1,7 +1,6 @@ package network // import "github.com/docker/docker/api/types/network" import ( "github.com/docker/docker/api/types/filters" - "github.com/docker/docker/errdefs" ) // Address represents an IP address @@ -123,5 +122,5 @@ var acceptedFilters = map[string]bool{ // ValidateFilters validates the list of filter args with the available filters. func ValidateFilters(filter filters.Args) error { - return errdefs.InvalidParameter(filter.Validate(acceptedFilters)) + return filter.Validate(acceptedFilters) }