diff --git a/pkg/lib/configreader/errors.go b/pkg/lib/configreader/errors.go index 952d2c73d5..eb466bf8dd 100644 --- a/pkg/lib/configreader/errors.go +++ b/pkg/lib/configreader/errors.go @@ -139,7 +139,7 @@ func ErrorMustHavePrefix(provided string, prefix string) error { } func ErrorInvalidInterface(provided interface{}, allowed interface{}, allowedVals ...interface{}) error { - allAllowedVals := append(allowedVals, allowed) + allAllowedVals := append([]interface{}{allowed}, allowedVals...) return errors.WithStack(&errors.Error{ Kind: ErrInvalidInterface, Message: fmt.Sprintf("invalid value (got %s, must be %s)", s.UserStr(provided), s.UserStrsOr(allAllowedVals)), @@ -147,7 +147,7 @@ func ErrorInvalidInterface(provided interface{}, allowed interface{}, allowedVal } func ErrorInvalidFloat64(provided float64, allowed float64, allowedVals ...float64) error { - allAllowedVals := append(allowedVals, allowed) + allAllowedVals := append([]float64{allowed}, allowedVals...) return errors.WithStack(&errors.Error{ Kind: ErrInvalidFloat64, Message: fmt.Sprintf("invalid value (got %s, must be %s)", s.UserStr(provided), s.UserStrsOr(allAllowedVals)), @@ -155,7 +155,7 @@ func ErrorInvalidFloat64(provided float64, allowed float64, allowedVals ...float } func ErrorInvalidFloat32(provided float32, allowed float32, allowedVals ...float32) error { - allAllowedVals := append(allowedVals, allowed) + allAllowedVals := append([]float32{allowed}, allowedVals...) return errors.WithStack(&errors.Error{ Kind: ErrInvalidFloat32, Message: fmt.Sprintf("invalid value (got %s, must be %s)", s.UserStr(provided), s.UserStrsOr(allAllowedVals)), @@ -163,7 +163,7 @@ func ErrorInvalidFloat32(provided float32, allowed float32, allowedVals ...float } func ErrorInvalidInt64(provided int64, allowed int64, allowedVals ...int64) error { - allAllowedVals := append(allowedVals, allowed) + allAllowedVals := append([]int64{allowed}, allowedVals...) return errors.WithStack(&errors.Error{ Kind: ErrInvalidInt64, Message: fmt.Sprintf("invalid value (got %s, must be %s)", s.UserStr(provided), s.UserStrsOr(allAllowedVals)), @@ -171,7 +171,7 @@ func ErrorInvalidInt64(provided int64, allowed int64, allowedVals ...int64) erro } func ErrorInvalidInt32(provided int32, allowed int32, allowedVals ...int32) error { - allAllowedVals := append(allowedVals, allowed) + allAllowedVals := append([]int32{allowed}, allowedVals...) return errors.WithStack(&errors.Error{ Kind: ErrInvalidInt32, Message: fmt.Sprintf("invalid value (got %s, must be %s)", s.UserStr(provided), s.UserStrsOr(allAllowedVals)), @@ -179,7 +179,7 @@ func ErrorInvalidInt32(provided int32, allowed int32, allowedVals ...int32) erro } func ErrorInvalidInt(provided int, allowed int, allowedVals ...int) error { - allAllowedVals := append(allowedVals, allowed) + allAllowedVals := append([]int{allowed}, allowedVals...) return errors.WithStack(&errors.Error{ Kind: ErrInvalidInt, Message: fmt.Sprintf("invalid value (got %s, must be %s)", s.UserStr(provided), s.UserStrsOr(allAllowedVals)), @@ -187,7 +187,7 @@ func ErrorInvalidInt(provided int, allowed int, allowedVals ...int) error { } func ErrorInvalidStr(provided string, allowed string, allowedVals ...string) error { - allAllowedVals := append(allowedVals, allowed) + allAllowedVals := append([]string{allowed}, allowedVals...) return errors.WithStack(&errors.Error{ Kind: ErrInvalidStr, Message: fmt.Sprintf("invalid value (got %s, must be %s)", s.UserStr(provided), s.UserStrsOr(allAllowedVals)), @@ -237,7 +237,7 @@ func ErrorNonStringKeyFound(key interface{}) error { } func ErrorInvalidPrimitiveType(provided interface{}, allowedType PrimitiveType, allowedTypes ...PrimitiveType) error { - allAllowedTypes := append(allowedTypes, allowedType) + allAllowedTypes := append([]PrimitiveType{allowedType}, allowedTypes...) return errors.WithStack(&errors.Error{ Kind: ErrInvalidPrimitiveType, Message: fmt.Sprintf("%s: invalid type (expected %s)", s.UserStr(provided), s.StrsOr(PrimitiveTypes(allAllowedTypes).StringList())), diff --git a/pkg/operator/endpoints/errors.go b/pkg/operator/endpoints/errors.go index 28f9e425dd..fd0791da3f 100644 --- a/pkg/operator/endpoints/errors.go +++ b/pkg/operator/endpoints/errors.go @@ -100,7 +100,7 @@ func ErrorPathParamRequired(param string) error { } func ErrorAnyQueryParamRequired(param string, params ...string) error { - allParams := append(params, param) + allParams := append([]string{param}, params...) return errors.WithStack(&errors.Error{ Kind: ErrAnyQueryParamRequired, Message: fmt.Sprintf("query params required: %s", s.UserStrsOr(allParams)), @@ -108,7 +108,7 @@ func ErrorAnyQueryParamRequired(param string, params ...string) error { } func ErrorAnyPathParamRequired(param string, params ...string) error { - allParams := append(params, param) + allParams := append([]string{param}, params...) return errors.WithStack(&errors.Error{ Kind: ErrAnyPathParamRequired, Message: fmt.Sprintf("path params required: %s", s.UserStrsOr(allParams)), diff --git a/pkg/types/spec/errors.go b/pkg/types/spec/errors.go index 68d9667ba7..a96c5c6e9e 100644 --- a/pkg/types/spec/errors.go +++ b/pkg/types/spec/errors.go @@ -102,7 +102,7 @@ func ErrorDuplicateEndpoint(apiName string) error { } func ErrorSpecifyAllOrNone(val string, vals ...string) error { - allVals := append(vals, val) + allVals := append([]string{val}, vals...) message := fmt.Sprintf("please specify all or none of %s", s.UserStrsAnd(allVals)) if len(allVals) == 2 { message = fmt.Sprintf("please specify both %s and %s or neither of them", s.UserStr(allVals[0]), s.UserStr(allVals[1])) @@ -115,7 +115,7 @@ func ErrorSpecifyAllOrNone(val string, vals ...string) error { } func ErrorOneOfPrerequisitesNotDefined(argName string, prerequisite string, prerequisites ...string) error { - allPrerequisites := append(prerequisites, prerequisite) + allPrerequisites := append([]string{prerequisite}, prerequisites...) message := fmt.Sprintf("%s specified without specifying %s", s.UserStr(argName), s.UserStrsOr(allPrerequisites)) return errors.WithStack(&errors.Error{