deleted file mode 100644

@@ -1,54 +0,0 @@

-package errdefs

-

-// ErrNotFound signals that the requested object doesn't exist

-type ErrNotFound interface {

-	NotFound()

-}

-

-// ErrInvalidParameter signals that the user input is invalid

-type ErrInvalidParameter interface {

-	InvalidParameter()

-}

-

-// ErrConflict signals that some internal state conflicts with the requested action and can't be performed.

-// A change in state should be able to clear this error.

-type ErrConflict interface {

-	Conflict()

-}

-

-// ErrUnauthorized is used to signify that the user is not authorized to perform a specific action

-type ErrUnauthorized interface {

-	Unauthorized()

-}

-

-// ErrUnavailable signals that the requested action/subsystem is not available.

-type ErrUnavailable interface {

-	Unavailable()

-}

-

-// ErrForbidden signals that the requested action cannot be performed under any circumstances.

-// When a ErrForbidden is returned, the caller should never retry the action.

-type ErrForbidden interface {

-	Forbidden()

-}

-

-// ErrSystem signals that some internal error occurred.

-// An example of this would be a failed mount request.

-type ErrSystem interface {

-	ErrSystem()

-}

-

-// ErrNotModified signals that an action can't be performed because it's already in the desired state

-type ErrNotModified interface {

-	NotModified()

-}

-

-// ErrNotImplemented signals that the requested action/feature is not implemented on the system as configured.

-type ErrNotImplemented interface {

-	NotImplemented()

-}

-

-// ErrUnknown signals that the kind of error that occurred is not known.

-type ErrUnknown interface {

-	Unknown()

-}

deleted file mode 100644

@@ -1,8 +0,0 @@

-// Package errdefs defines a set of error interfaces that packages should use for communicating classes of errors.

-// Errors that cross the package boundary should implement one (and only one) of these interfaces.

-//

-// Packages should not reference these interfaces directly, only implement them.

-// To check if a particular error implements one of these interfaces, there are helper

-// functions provided (e.g. `Is<SomeError>`) which can be used rather than asserting the interfaces directly.

-// If you must assert on these interfaces, be sure to check the causal chain (`err.Cause()`).

-package errdefs

deleted file mode 100644

@@ -1,86 +0,0 @@

-package errdefs

-

-type causer interface {

-	Cause() error

-}

-

-func getImplementer(err error) error {

-	switch e := err.(type) {

-	case

-		ErrNotFound,

-		ErrInvalidParameter,

-		ErrConflict,

-		ErrUnauthorized,

-		ErrUnavailable,

-		ErrForbidden,

-		ErrSystem,

-		ErrNotModified,

-		ErrNotImplemented,

-		ErrUnknown:

-		return e

-	case causer:

-		return getImplementer(e.Cause())

-	default:

-		return err

-	}

-}

-

-// IsNotFound returns if the passed in error is an ErrNotFound

-func IsNotFound(err error) bool {

-	_, ok := getImplementer(err).(ErrNotFound)

-	return ok

-}

-

-// IsInvalidParameter returns if the passed in error is an ErrInvalidParameter

-func IsInvalidParameter(err error) bool {

-	_, ok := getImplementer(err).(ErrInvalidParameter)

-	return ok

-}

-

-// IsConflict returns if the passed in error is an ErrConflict

-func IsConflict(err error) bool {

-	_, ok := getImplementer(err).(ErrConflict)

-	return ok

-}

-

-// IsUnauthorized returns if the the passed in error is an ErrUnauthorized

-func IsUnauthorized(err error) bool {

-	_, ok := getImplementer(err).(ErrUnauthorized)

-	return ok

-}

-

-// IsUnavailable returns if the passed in error is an ErrUnavailable

-func IsUnavailable(err error) bool {

-	_, ok := getImplementer(err).(ErrUnavailable)

-	return ok

-}

-

-// IsForbidden returns if the passed in error is an ErrForbidden

-func IsForbidden(err error) bool {

-	_, ok := getImplementer(err).(ErrForbidden)

-	return ok

-}

-

-// IsSystem returns if the passed in error is an ErrSystem

-func IsSystem(err error) bool {

-	_, ok := getImplementer(err).(ErrSystem)

-	return ok

-}

-

-// IsNotModified returns if the passed in error is a NotModified error

-func IsNotModified(err error) bool {

-	_, ok := getImplementer(err).(ErrNotModified)

-	return ok

-}

-

-// IsNotImplemented returns if the passed in error is an ErrNotImplemented

-func IsNotImplemented(err error) bool {

-	_, ok := getImplementer(err).(ErrNotImplemented)

-	return ok

-}

-

-// IsUnknown returns if the passed in error is an ErrUnknown

-func IsUnknown(err error) bool {

-	_, ok := getImplementer(err).(ErrUnknown)

-	return ok

-}

@@ -4,9 +4,9 @@ import (

 	"fmt"

 	"net/http"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/versions"

+	"github.com/docker/docker/errdefs"

 	"github.com/gorilla/mux"

 	"github.com/sirupsen/logrus"

 	"google.golang.org/grpc"

@@ -35,7 +35,7 @@ func GetHTTPErrorStatusCode(err error) int {

 		statusCode = http.StatusNotFound

 	case errdefs.IsInvalidParameter(err):

 		statusCode = http.StatusBadRequest

-	case errdefs.IsConflict(err):

+	case errdefs.IsConflict(err) || errdefs.IsAlreadyExists(err):

 		statusCode = http.StatusConflict

 	case errdefs.IsUnauthorized(err):

 		statusCode = http.StatusUnauthorized

@@ -47,7 +47,7 @@ func GetHTTPErrorStatusCode(err error) int {

 		statusCode = http.StatusNotModified

 	case errdefs.IsNotImplemented(err):

 		statusCode = http.StatusNotImplemented

-	case errdefs.IsSystem(err) || errdefs.IsUnknown(err):

+	case errdefs.IsSystem(err) || errdefs.IsUnknown(err) || errdefs.IsDataLoss(err) || errdefs.IsDeadline(err) || errdefs.IsCancelled(err):

 		statusCode = http.StatusInternalServerError

 	default:

 		statusCode = statusCodeFromGRPCError(err)

@@ -6,6 +6,7 @@ import (

 	"net/http"

 	"strings"

+	"github.com/docker/docker/errdefs"

 	"github.com/pkg/errors"

 	"github.com/sirupsen/logrus"

 	"golang.org/x/net/context"

@@ -45,20 +46,6 @@ func CloseStreams(streams ...interface{}) {

 	}

 }

-type validationError struct {

-	cause error

-}

-

-func (e validationError) Error() string {

-	return e.cause.Error()

-}

-

-func (e validationError) Cause() error {

-	return e.cause

-}

-

-func (e validationError) InvalidParameter() {}

-

 // CheckForJSON makes sure that the request's Content-Type is application/json.

 func CheckForJSON(r *http.Request) error {

 	ct := r.Header.Get("Content-Type")

@@ -74,7 +61,7 @@ func CheckForJSON(r *http.Request) error {

 	if matchesContentType(ct, "application/json") {

 		return nil

 	}

-	return validationError{errors.Errorf("Content-Type specified (%s) must be 'application/json'", ct)}

+	return errdefs.InvalidParameter(errors.Errorf("Content-Type specified (%s) must be 'application/json'", ct))

 }

 // ParseForm ensures the request form is parsed even with invalid content types.

@@ -84,7 +71,7 @@ func ParseForm(r *http.Request) error {

 		return nil

 	}

 	if err := r.ParseForm(); err != nil && !strings.HasPrefix(err.Error(), "mime:") {

-		return validationError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	return nil

 }

@@ -18,6 +18,7 @@ import (

 	"github.com/docker/docker/api/types/backend"

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/versions"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/progress"

 	"github.com/docker/docker/pkg/streamformatter"

@@ -83,7 +84,7 @@ func newImageBuildOptions(ctx context.Context, r *http.Request) (*types.ImageBui

 		}

 		p := system.ParsePlatform(apiPlatform)

 		if err := system.ValidatePlatform(p); err != nil {

-			return nil, validationError{fmt.Errorf("invalid platform: %s", err)}

+			return nil, errdefs.InvalidParameter(errors.Errorf("invalid platform: %s", err))

 		}

 		options.Platform = p.OS

 	}

@@ -104,14 +105,14 @@ func newImageBuildOptions(ctx context.Context, r *http.Request) (*types.ImageBui

 	}

 	if runtime.GOOS != "windows" && options.SecurityOpt != nil {

-		return nil, validationError{fmt.Errorf("The daemon on this platform does not support setting security options on build")}

+		return nil, errdefs.InvalidParameter(errors.New("The daemon on this platform does not support setting security options on build"))

 	}

 	var buildUlimits = []*units.Ulimit{}

 	ulimitsJSON := r.FormValue("ulimits")

 	if ulimitsJSON != "" {

 		if err := json.Unmarshal([]byte(ulimitsJSON), &buildUlimits); err != nil {

-			return nil, errors.Wrap(validationError{err}, "error reading ulimit settings")

+			return nil, errors.Wrap(errdefs.InvalidParameter(err), "error reading ulimit settings")

 		}

 		options.Ulimits = buildUlimits

 	}

@@ -132,7 +133,7 @@ func newImageBuildOptions(ctx context.Context, r *http.Request) (*types.ImageBui

 	if buildArgsJSON != "" {

 		var buildArgs = map[string]*string{}

 		if err := json.Unmarshal([]byte(buildArgsJSON), &buildArgs); err != nil {

-			return nil, errors.Wrap(validationError{err}, "error reading build args")

+			return nil, errors.Wrap(errdefs.InvalidParameter(err), "error reading build args")

 		}

 		options.BuildArgs = buildArgs

 	}

@@ -141,7 +142,7 @@ func newImageBuildOptions(ctx context.Context, r *http.Request) (*types.ImageBui

 	if labelsJSON != "" {

 		var labels = map[string]string{}

 		if err := json.Unmarshal([]byte(labelsJSON), &labels); err != nil {

-			return nil, errors.Wrap(validationError{err}, "error reading labels")

+			return nil, errors.Wrap(errdefs.InvalidParameter(err), "error reading labels")

 		}

 		options.Labels = labels

 	}

@@ -167,16 +168,6 @@ func (br *buildRouter) postPrune(ctx context.Context, w http.ResponseWriter, r *

 	return httputils.WriteJSON(w, http.StatusOK, report)

 }

-type validationError struct {

-	cause error

-}

-

-func (e validationError) Error() string {

-	return e.cause.Error()

-}

-

-func (e validationError) InvalidParameter() {}

-

 func (br *buildRouter) postBuild(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	var (

 		notVerboseBuffer = bytes.NewBuffer(nil)

@@ -210,7 +201,7 @@ func (br *buildRouter) postBuild(ctx context.Context, w http.ResponseWriter, r *

 	buildOptions.AuthConfigs = getAuthConfigs(r.Header)

 	if buildOptions.Squash && !br.daemon.HasExperimental() {

-		return validationError{errors.New("squash is only supported with experimental mode")}

+		return errdefs.InvalidParameter(errors.New("squash is only supported with experimental mode"))

 	}

 	out := io.Writer(output)

@@ -5,20 +5,6 @@ import (

 	"github.com/docker/docker/api/server/router"

 )

-type validationError struct {

-	cause error

-}

-

-func (e validationError) Error() string {

-	return e.cause.Error()

-}

-

-func (e validationError) Cause() error {

-	return e.cause

-}

-

-func (e validationError) InvalidParameter() {}

-

 // containerRouter is a router to talk with the container controller

 type containerRouter struct {

 	backend Backend

@@ -8,7 +8,6 @@ import (

 	"strconv"

 	"syscall"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/server/httputils"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

@@ -16,6 +15,7 @@ import (

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/versions"

 	containerpkg "github.com/docker/docker/container"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/signal"

 	"github.com/pkg/errors"

@@ -88,7 +88,7 @@ func (s *containerRouter) getContainersLogs(ctx context.Context, w http.Response

 	// with the appropriate status code.

 	stdout, stderr := httputils.BoolValue(r, "stdout"), httputils.BoolValue(r, "stderr")

 	if !(stdout || stderr) {

-		return validationError{errors.New("Bad parameters: you must choose at least one stream")}

+		return errdefs.InvalidParameter(errors.New("Bad parameters: you must choose at least one stream"))

 	}

 	containerName := vars["name"]

@@ -203,7 +203,7 @@ func (s *containerRouter) postContainersKill(ctx context.Context, w http.Respons

 	if sigStr := r.Form.Get("signal"); sigStr != "" {

 		var err error

 		if sig, err = signal.ParseSignal(sigStr); err != nil {

-			return validationError{err}

+			return errdefs.InvalidParameter(err)

 		}

 	}

@@ -468,11 +468,11 @@ func (s *containerRouter) postContainersResize(ctx context.Context, w http.Respo

 	height, err := strconv.Atoi(r.Form.Get("h"))

 	if err != nil {

-		return validationError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	width, err := strconv.Atoi(r.Form.Get("w"))

 	if err != nil {

-		return validationError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	return s.backend.ContainerResize(vars["name"], height, width)

@@ -490,7 +490,7 @@ func (s *containerRouter) postContainersAttach(ctx context.Context, w http.Respo

 	hijacker, ok := w.(http.Hijacker)

 	if !ok {

-		return validationError{errors.Errorf("error attaching to container %s, hijack connection missing", containerName)}

+		return errdefs.InvalidParameter(errors.Errorf("error attaching to container %s, hijack connection missing", containerName))

 	}

 	setupStreams := func() (io.ReadCloser, io.Writer, io.Writer, error) {

@@ -611,7 +611,7 @@ func (s *containerRouter) postContainersPrune(ctx context.Context, w http.Respon

 	pruneFilters, err := filters.FromJSON(r.Form.Get("filters"))

 	if err != nil {

-		return validationError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	pruneReport, err := s.backend.ContainersPrune(ctx, pruneFilters)

@@ -10,6 +10,7 @@ import (

 	"github.com/docker/docker/api/server/httputils"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/versions"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/stdcopy"

 	"github.com/sirupsen/logrus"

 	"golang.org/x/net/context"

@@ -137,11 +138,11 @@ func (s *containerRouter) postContainerExecResize(ctx context.Context, w http.Re

 	}

 	height, err := strconv.Atoi(r.Form.Get("h"))

 	if err != nil {

-		return validationError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	width, err := strconv.Atoi(r.Form.Get("w"))

 	if err != nil {

-		return validationError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	return s.backend.ContainerExecResize(vars["name"], height, width)

@@ -15,6 +15,7 @@ import (

 	"github.com/docker/docker/api/types/backend"

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/versions"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/system"

@@ -144,20 +145,6 @@ func (s *imageRouter) postImagesCreate(ctx context.Context, w http.ResponseWrite

 	return nil

 }

-type validationError struct {

-	cause error

-}

-

-func (e validationError) Error() string {

-	return e.cause.Error()

-}

-

-func (e validationError) Cause() error {

-	return e.cause

-}

-

-func (validationError) InvalidParameter() {}

-

 func (s *imageRouter) postImagesPush(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	metaHeaders := map[string][]string{}

 	for k, v := range r.Header {

@@ -181,7 +168,7 @@ func (s *imageRouter) postImagesPush(ctx context.Context, w http.ResponseWriter,

 	} else {

 		// the old format is supported for compatibility if there was no authConfig header

 		if err := json.NewDecoder(r.Body).Decode(authConfig); err != nil {

-			return errors.Wrap(validationError{err}, "Bad parameters and missing X-Registry-Auth")

+			return errors.Wrap(errdefs.InvalidParameter(err), "Bad parameters and missing X-Registry-Auth")

 		}

 	}

@@ -2,7 +2,6 @@ package network

 import (

 	"encoding/json"

-	"fmt"

 	"net/http"

 	"strconv"

 	"strings"

@@ -14,6 +13,7 @@ import (

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/network"

 	"github.com/docker/docker/api/types/versions"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/libnetwork"

 	netconst "github.com/docker/libnetwork/datastore"

 	"github.com/docker/libnetwork/networkdb"

@@ -101,22 +101,8 @@ func (e ambigousResultsError) Error() string {

 func (ambigousResultsError) InvalidParameter() {}

-type conflictError struct {

-	cause error

-}

-

-func (e conflictError) Error() string {

-	return e.cause.Error()

-}

-

-func (e conflictError) Cause() error {

-	return e.cause

-}

-

-func (e conflictError) Conflict() {}

-

 func nameConflict(name string) error {

-	return conflictError{libnetwork.NetworkNameError(name)}

+	return errdefs.Conflict(libnetwork.NetworkNameError(name))

 }

 func (n *networkRouter) getNetwork(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

@@ -589,7 +575,7 @@ func (n *networkRouter) findUniqueNetwork(term string) (types.NetworkResource, e

 		}

 	}

 	if len(listByFullName) > 1 {

-		return types.NetworkResource{}, fmt.Errorf("network %s is ambiguous (%d matches found based on name)", term, len(listByFullName))

+		return types.NetworkResource{}, errdefs.InvalidParameter(errors.Errorf("network %s is ambiguous (%d matches found based on name)", term, len(listByFullName)))

 	}

 	// Find based on partial ID, returns true only if no duplicates

@@ -599,8 +585,8 @@ func (n *networkRouter) findUniqueNetwork(term string) (types.NetworkResource, e

 		}

 	}

 	if len(listByPartialID) > 1 {

-		return types.NetworkResource{}, fmt.Errorf("network %s is ambiguous (%d matches found based on ID prefix)", term, len(listByPartialID))

+		return types.NetworkResource{}, errdefs.InvalidParameter(errors.Errorf("network %s is ambiguous (%d matches found based on ID prefix)", term, len(listByPartialID)))

 	}

-	return types.NetworkResource{}, libnetwork.ErrNoSuchNetwork(term)

+	return types.NetworkResource{}, errdefs.NotFound(libnetwork.ErrNoSuchNetwork(term))

 }

@@ -3,27 +3,14 @@ package session

 import (

 	"net/http"

+	"github.com/docker/docker/errdefs"

 	"golang.org/x/net/context"

 )

-type invalidRequest struct {

-	cause error

-}

-

-func (e invalidRequest) Error() string {

-	return e.cause.Error()

-}

-

-func (e invalidRequest) Cause() error {

-	return e.cause

-}

-

-func (e invalidRequest) InvalidParameter() {}

-

 func (sr *sessionRouter) startSession(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	err := sr.backend.HandleHTTPRequest(ctx, w, r)

 	if err != nil {

-		return invalidRequest{err}

+		return errdefs.InvalidParameter(err)

 	}

 	return nil

 }

@@ -12,6 +12,7 @@ import (

 	"github.com/docker/docker/api/types/filters"

 	types "github.com/docker/docker/api/types/swarm"

 	"github.com/docker/docker/api/types/versions"

+	"github.com/docker/docker/errdefs"

 	"github.com/pkg/errors"

 	"github.com/sirupsen/logrus"

 	"golang.org/x/net/context"

@@ -57,20 +58,6 @@ func (sr *swarmRouter) inspectCluster(ctx context.Context, w http.ResponseWriter

 	return httputils.WriteJSON(w, http.StatusOK, swarm)

 }

-type invalidRequestError struct {

-	err error

-}

-

-func (e invalidRequestError) Error() string {

-	return e.err.Error()

-}

-

-func (e invalidRequestError) Cause() error {

-	return e.err

-}

-

-func (e invalidRequestError) InvalidParameter() {}

-

 func (sr *swarmRouter) updateCluster(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	var swarm types.Spec

 	if err := json.NewDecoder(r.Body).Decode(&swarm); err != nil {

@@ -81,7 +68,7 @@ func (sr *swarmRouter) updateCluster(ctx context.Context, w http.ResponseWriter,

 	version, err := strconv.ParseUint(rawVersion, 10, 64)

 	if err != nil {

 		err := fmt.Errorf("invalid swarm version '%s': %v", rawVersion, err)

-		return invalidRequestError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	var flags types.UpdateFlags

@@ -90,7 +77,7 @@ func (sr *swarmRouter) updateCluster(ctx context.Context, w http.ResponseWriter,

 		rot, err := strconv.ParseBool(value)

 		if err != nil {

 			err := fmt.Errorf("invalid value for rotateWorkerToken: %s", value)

-			return invalidRequestError{err}

+			return errdefs.InvalidParameter(err)

 		}

 		flags.RotateWorkerToken = rot

@@ -100,7 +87,7 @@ func (sr *swarmRouter) updateCluster(ctx context.Context, w http.ResponseWriter,

 		rot, err := strconv.ParseBool(value)

 		if err != nil {

 			err := fmt.Errorf("invalid value for rotateManagerToken: %s", value)

-			return invalidRequestError{err}

+			return errdefs.InvalidParameter(err)

 		}

 		flags.RotateManagerToken = rot

@@ -109,7 +96,7 @@ func (sr *swarmRouter) updateCluster(ctx context.Context, w http.ResponseWriter,

 	if value := r.URL.Query().Get("rotateManagerUnlockKey"); value != "" {

 		rot, err := strconv.ParseBool(value)

 		if err != nil {

-			return invalidRequestError{fmt.Errorf("invalid value for rotateManagerUnlockKey: %s", value)}

+			return errdefs.InvalidParameter(fmt.Errorf("invalid value for rotateManagerUnlockKey: %s", value))

 		}

 		flags.RotateManagerUnlockKey = rot

@@ -153,7 +140,7 @@ func (sr *swarmRouter) getServices(ctx context.Context, w http.ResponseWriter, r

 	}

 	filter, err := filters.FromJSON(r.Form.Get("filters"))

 	if err != nil {

-		return invalidRequestError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	services, err := sr.backend.GetServices(basictypes.ServiceListOptions{Filters: filter})

@@ -172,7 +159,7 @@ func (sr *swarmRouter) getService(ctx context.Context, w http.ResponseWriter, r

 		insertDefaults, err = strconv.ParseBool(value)

 		if err != nil {

 			err := fmt.Errorf("invalid value for insertDefaults: %s", value)

-			return errors.Wrapf(invalidRequestError{err}, "invalid value for insertDefaults: %s", value)

+			return errors.Wrapf(errdefs.InvalidParameter(err), "invalid value for insertDefaults: %s", value)

 		}

 	}

@@ -218,7 +205,7 @@ func (sr *swarmRouter) updateService(ctx context.Context, w http.ResponseWriter,

 	version, err := strconv.ParseUint(rawVersion, 10, 64)

 	if err != nil {

 		err := fmt.Errorf("invalid service version '%s': %v", rawVersion, err)

-		return invalidRequestError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	var flags basictypes.ServiceUpdateOptions

@@ -311,7 +298,7 @@ func (sr *swarmRouter) updateNode(ctx context.Context, w http.ResponseWriter, r

 	version, err := strconv.ParseUint(rawVersion, 10, 64)

 	if err != nil {

 		err := fmt.Errorf("invalid node version '%s': %v", rawVersion, err)

-		return invalidRequestError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	if err := sr.backend.UpdateNode(vars["id"], version, node); err != nil {

@@ -417,13 +404,13 @@ func (sr *swarmRouter) getSecret(ctx context.Context, w http.ResponseWriter, r *

 func (sr *swarmRouter) updateSecret(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	var secret types.SecretSpec

 	if err := json.NewDecoder(r.Body).Decode(&secret); err != nil {

-		return invalidRequestError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	rawVersion := r.URL.Query().Get("version")

 	version, err := strconv.ParseUint(rawVersion, 10, 64)

 	if err != nil {

-		return invalidRequestError{fmt.Errorf("invalid secret version")}

+		return errdefs.InvalidParameter(fmt.Errorf("invalid secret version"))

 	}

 	id := vars["id"]

@@ -484,13 +471,13 @@ func (sr *swarmRouter) getConfig(ctx context.Context, w http.ResponseWriter, r *

 func (sr *swarmRouter) updateConfig(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	var config types.ConfigSpec

 	if err := json.NewDecoder(r.Body).Decode(&config); err != nil {

-		return invalidRequestError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	rawVersion := r.URL.Query().Get("version")

 	version, err := strconv.ParseUint(rawVersion, 10, 64)

 	if err != nil {

-		return invalidRequestError{fmt.Errorf("invalid config version")}

+		return errdefs.InvalidParameter(fmt.Errorf("invalid config version"))

 	}

 	id := vars["id"]

@@ -17,6 +17,7 @@ import (

 	"github.com/docker/docker/builder/dockerfile/parser"

 	"github.com/docker/docker/builder/fscache"

 	"github.com/docker/docker/builder/remotecontext"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/idtools"

 	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/stringid"

@@ -225,7 +226,7 @@ func (b *Builder) build(source builder.Source, dockerfile *parser.Result) (*buil

 		if instructions.IsUnknownInstruction(err) {

 			buildsFailed.WithValues(metricsUnknownInstructionError).Inc()

 		}

-		return nil, validationError{err}

+		return nil, errdefs.InvalidParameter(err)

 	}

 	if b.options.Target != "" {

 		targetIx, found := instructions.HasStage(stages, b.options.Target)

@@ -363,7 +364,7 @@ func BuildFromConfig(config *container.Config, changes []string) (*container.Con

 	dockerfile, err := parser.Parse(bytes.NewBufferString(strings.Join(changes, "\n")))

 	if err != nil {

-		return nil, validationError{err}

+		return nil, errdefs.InvalidParameter(err)

 	}

 	os := runtime.GOOS

@@ -378,7 +379,7 @@ func BuildFromConfig(config *container.Config, changes []string) (*container.Con

 	// ensure that the commands are valid

 	for _, n := range dockerfile.AST.Children {

 		if !validCommitCommands[n.Value] {

-			return nil, validationError{errors.Errorf("%s is not a valid change command", n.Value)}

+			return nil, errdefs.InvalidParameter(errors.Errorf("%s is not a valid change command", n.Value))

 		}

 	}

@@ -390,7 +391,7 @@ func BuildFromConfig(config *container.Config, changes []string) (*container.Con

 	for _, n := range dockerfile.AST.Children {

 		cmd, err := instructions.ParseCommand(n)

 		if err != nil {

-			return nil, validationError{err}

+			return nil, errdefs.InvalidParameter(err)

 		}

 		commands = append(commands, cmd)

 	}

@@ -402,7 +403,7 @@ func BuildFromConfig(config *container.Config, changes []string) (*container.Con

 	for _, cmd := range commands {

 		err := dispatch(dispatchRequest, cmd)

 		if err != nil {

-			return nil, validationError{err}

+			return nil, errdefs.InvalidParameter(err)

 		}

 		dispatchRequest.state.updateRunConfig()

 	}

@@ -20,6 +20,7 @@ import (

 	"github.com/docker/docker/builder"

 	"github.com/docker/docker/builder/dockerfile/instructions"

 	"github.com/docker/docker/builder/dockerfile/parser"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/docker/docker/pkg/signal"

@@ -510,7 +511,7 @@ func dispatchStopSignal(d dispatchRequest, c *instructions.StopSignalCommand) er

 	_, err := signal.ParseSignal(c.Signal)

 	if err != nil {

-		return validationError{err}

+		return errdefs.InvalidParameter(err)

 	}

 	d.state.runConfig.StopSignal = c.Signal

 	return d.builder.commit(d.state, fmt.Sprintf("STOPSIGNAL %v", c.Signal))

deleted file mode 100644

@@ -1,15 +0,0 @@

-package dockerfile

-

-type validationError struct {

-	err error

-}

-

-func (e validationError) Error() string {

-	return e.err.Error()

-}

-

-func (e validationError) InvalidParameter() {}

-

-func (e validationError) Cause() error {

-	return e.err

-}

@@ -27,6 +27,7 @@ import (

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/builder"

 	"github.com/docker/docker/builder/dockerfile/instructions"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/system"

 	"github.com/docker/docker/runconfig/opts"

 	"github.com/pkg/errors"

@@ -37,7 +38,7 @@ func dispatch(d dispatchRequest, cmd instructions.Command) (err error) {

 		optionsOS := system.ParsePlatform(d.builder.options.Platform).OS

 		err := c.CheckPlatform(optionsOS)

 		if err != nil {

-			return validationError{err}

+			return errdefs.InvalidParameter(err)

 		}

 	}

 	runConfigEnv := d.state.runConfig.Env

@@ -48,7 +49,7 @@ func dispatch(d dispatchRequest, cmd instructions.Command) (err error) {

 			return d.shlex.ProcessWord(word, envs)

 		})

 		if err != nil {

-			return validationError{err}

+			return errdefs.InvalidParameter(err)

 		}

 	}

deleted file mode 100644

@@ -1,75 +0,0 @@

-package remotecontext

-

-type notFoundError string

-

-func (e notFoundError) Error() string {

-	return string(e)

-}

-

-func (notFoundError) NotFound() {}

-

-type requestError string

-

-func (e requestError) Error() string {

-	return string(e)

-}

-

-func (e requestError) InvalidParameter() {}

-

-type unauthorizedError string

-

-func (e unauthorizedError) Error() string {

-	return string(e)

-}

-

-func (unauthorizedError) Unauthorized() {}

-

-type forbiddenError string

-

-func (e forbiddenError) Error() string {

-	return string(e)

-}

-

-func (forbiddenError) Forbidden() {}

-

-type dnsError struct {

-	cause error

-}

-

-func (e dnsError) Error() string {

-	return e.cause.Error()

-}

-

-func (e dnsError) NotFound() {}

-

-func (e dnsError) Cause() error {

-	return e.cause

-}

-

-type systemError struct {

-	cause error

-}

-

-func (e systemError) Error() string {

-	return e.cause.Error()

-}

-

-func (e systemError) SystemError() {}

-