From 6daf8b77829b2d2d1ad9e2ef9f1e9fc6cebb3e13 Mon Sep 17 00:00:00 2001 From: John Starks Date: Thu, 29 Nov 2018 14:26:53 -0800 Subject: [PATCH] Eliminate misuses of errors.Wrapf In many cases code is calling errors.Wrapf with an arbitrary string instead of a format string. This causes confusing errors when the wrapped error message contains '%' characters. This change replaces such calls with calls to errors.Wrap. Signed-off-by: John Starks --- errdefs/grpc.go | 2 +- filters/parser.go | 2 +- metadata/containers.go | 2 +- metadata/images.go | 2 +- metadata/leases.go | 2 +- windows/io.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/errdefs/grpc.go b/errdefs/grpc.go index 4eab03ab8..b1542f13d 100644 --- a/errdefs/grpc.go +++ b/errdefs/grpc.go @@ -95,7 +95,7 @@ func FromGRPC(err error) error { msg := rebaseMessage(cls, err) if msg != "" { - err = errors.Wrapf(cls, msg) + err = errors.Wrap(cls, msg) } else { err = errors.WithStack(cls) } diff --git a/filters/parser.go b/filters/parser.go index 9dced523b..2be23574e 100644 --- a/filters/parser.go +++ b/filters/parser.go @@ -71,7 +71,7 @@ func ParseAll(ss ...string) (Filter, error) { for _, s := range ss { f, err := Parse(s) if err != nil { - return nil, errors.Wrapf(errdefs.ErrInvalidArgument, err.Error()) + return nil, errors.Wrap(errdefs.ErrInvalidArgument, err.Error()) } fs = append(fs, f) diff --git a/metadata/containers.go b/metadata/containers.go index 6e5622c36..af8224786 100644 --- a/metadata/containers.go +++ b/metadata/containers.go @@ -72,7 +72,7 @@ func (s *containerStore) List(ctx context.Context, fs ...string) ([]containers.C filter, err := filters.ParseAll(fs...) if err != nil { - return nil, errors.Wrapf(errdefs.ErrInvalidArgument, err.Error()) + return nil, errors.Wrap(errdefs.ErrInvalidArgument, err.Error()) } bkt := getContainersBucket(s.tx, namespace) diff --git a/metadata/images.go b/metadata/images.go index 6ae9dc855..762f6fb1a 100644 --- a/metadata/images.go +++ b/metadata/images.go @@ -84,7 +84,7 @@ func (s *imageStore) List(ctx context.Context, fs ...string) ([]images.Image, er filter, err := filters.ParseAll(fs...) if err != nil { - return nil, errors.Wrapf(errdefs.ErrInvalidArgument, err.Error()) + return nil, errors.Wrap(errdefs.ErrInvalidArgument, err.Error()) } var m []images.Image diff --git a/metadata/leases.go b/metadata/leases.go index 635c3b3c3..a3c1701d8 100644 --- a/metadata/leases.go +++ b/metadata/leases.go @@ -122,7 +122,7 @@ func (lm *LeaseManager) List(ctx context.Context, fs ...string) ([]leases.Lease, filter, err := filters.ParseAll(fs...) if err != nil { - return nil, errors.Wrapf(errdefs.ErrInvalidArgument, err.Error()) + return nil, errors.Wrap(errdefs.ErrInvalidArgument, err.Error()) } var ll []leases.Lease diff --git a/windows/io.go b/windows/io.go index 03fcdf840..ab0b1ea16 100644 --- a/windows/io.go +++ b/windows/io.go @@ -107,7 +107,7 @@ func newPipeSet(ctx context.Context, io runtime.IO) (*pipeSet, error) { if err == nil { err = e } else { - err = errors.Wrapf(err, e.Error()) + err = errors.Wrap(err, e.Error()) } } }