github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Eliminate misuses of errors.Wrapf

Browse Source 
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 <jostarks@microsoft.com>
This commit is contained in:
John Starks 2018-11-29 14:26:53 -08:00
parent b0b375f605
commit 6daf8b7782
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
errdefs/grpc.go
View File

@ -95,7 +95,7 @@ func FromGRPC(err error) error {
msg := rebaseMessage(cls, err) msg := rebaseMessage(cls, err)
if msg != "" { if msg != "" {
err = errors.Wrapf(cls, msg) err = errors.Wrap(cls, msg)
} else { } else {
err = errors.WithStack(cls) err = errors.WithStack(cls)
} }

2
filters/parser.go
View File

@ -71,7 +71,7 @@ func ParseAll(ss ...string) (Filter, error) {
for _, s := range ss { for _, s := range ss {
f, err := Parse(s) f, err := Parse(s)
if err != nil { if err != nil {
return nil, errors.Wrapf(errdefs.ErrInvalidArgument, err.Error()) return nil, errors.Wrap(errdefs.ErrInvalidArgument, err.Error())
} }
fs = append(fs, f) fs = append(fs, f)

2
metadata/containers.go
View File

@ -72,7 +72,7 @@ func (s *containerStore) List(ctx context.Context, fs ...string) ([]containers.C
filter, err := filters.ParseAll(fs...) filter, err := filters.ParseAll(fs...)
if err != nil { if err != nil {
return nil, errors.Wrapf(errdefs.ErrInvalidArgument, err.Error()) return nil, errors.Wrap(errdefs.ErrInvalidArgument, err.Error())
} }
bkt := getContainersBucket(s.tx, namespace) bkt := getContainersBucket(s.tx, namespace)

2
metadata/images.go
View File

@ -84,7 +84,7 @@ func (s *imageStore) List(ctx context.Context, fs ...string) ([]images.Image, er
filter, err := filters.ParseAll(fs...) filter, err := filters.ParseAll(fs...)
if err != nil { if err != nil {
return nil, errors.Wrapf(errdefs.ErrInvalidArgument, err.Error()) return nil, errors.Wrap(errdefs.ErrInvalidArgument, err.Error())
} }
var m []images.Image var m []images.Image

2
metadata/leases.go
View File

@ -122,7 +122,7 @@ func (lm *LeaseManager) List(ctx context.Context, fs ...string) ([]leases.Lease,
filter, err := filters.ParseAll(fs...) filter, err := filters.ParseAll(fs...)
if err != nil { if err != nil {
return nil, errors.Wrapf(errdefs.ErrInvalidArgument, err.Error()) return nil, errors.Wrap(errdefs.ErrInvalidArgument, err.Error())
} }
var ll []leases.Lease var ll []leases.Lease

2
windows/io.go
View File

@ -107,7 +107,7 @@ func newPipeSet(ctx context.Context, io runtime.IO) (*pipeSet, error) {
if err == nil { if err == nil {
err = e err = e
} else { } else {
err = errors.Wrapf(err, e.Error()) err = errors.Wrap(err, e.Error())
} }
} }
} }