Kaynağa Gözat

Merge pull request #41068 from thaJeztah/api_types_remove_errdefs

api/types: remove errdefs dependency
Brian Goff 5 yıl önce
ebeveyn
işleme
0a82354344

+ 1 - 1
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 {
 	if err := network.ValidateFilters(filter); err != nil {
-		return err
+		return errdefs.InvalidParameter(err)
 	}
 	}
 
 
 	var list []types.NetworkResource
 	var list []types.NetworkResource

+ 1 - 2
api/types/network/network.go

@@ -1,7 +1,6 @@
 package network // import "github.com/docker/docker/api/types/network"
 package network // import "github.com/docker/docker/api/types/network"
 import (
 import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/errdefs"
 )
 )
 
 
 // Address represents an IP address
 // 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.
 // ValidateFilters validates the list of filter args with the available filters.
 func ValidateFilters(filter filters.Args) error {
 func ValidateFilters(filter filters.Args) error {
-	return errdefs.InvalidParameter(filter.Validate(acceptedFilters))
+	return filter.Validate(acceptedFilters)
 }
 }