Skip to content

Commit b17bab4

Browse files
AkihiroSudaAkihiroSuda
committed
fmt.Errorf: use %w, not %v to wrap errors
Signed-off-by: Akihiro Suda <[email protected]>
1 parent 092b2c8 commit b17bab4

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎context.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ func (c *context) checkoutFile(fp string, rf RegularFile) error {
390390
}
391391
}
392392
if err != nil {
393-
return fmt.Errorf("file content could not be provided: %v", err)
393+
return fmt.Errorf("file content could not be provided: %w", err)
394394
}
395395
defer r.Close()
396396

@@ -422,7 +422,7 @@ func (c *context) Apply(resource Resource) error {
422422
case RegularFile:
423423
if fi == nil {
424424
if err := c.checkoutFile(fp, r); err != nil {
425-
return fmt.Errorf("error checking out file %q: %v", resource.Path(), err)
425+
return fmt.Errorf("error checking out file %q: %w", resource.Path(), err)
426426
}
427427
chmod = false
428428
} else {
@@ -431,26 +431,26 @@ func (c *context) Apply(resource Resource) error {
431431
}
432432
if fi.Size() != r.Size() {
433433
if err := c.checkoutFile(fp, r); err != nil {
434-
return fmt.Errorf("error checking out file %q: %v", resource.Path(), err)
434+
return fmt.Errorf("error checking out file %q: %w", resource.Path(), err)
435435
}
436436
} else {
437437
for _, dgst := range r.Digests() {
438438
f, err := os.Open(fp)
439439
if err != nil {
440-
return fmt.Errorf("failure opening file for read %q: %v", resource.Path(), err)
440+
return fmt.Errorf("failure opening file for read %q: %w", resource.Path(), err)
441441
}
442442
compared, err := dgst.Algorithm().FromReader(f)
443443
if err == nil && dgst != compared {
444444
if err := c.checkoutFile(fp, r); err != nil {
445-
return fmt.Errorf("error checking out file %q: %v", resource.Path(), err)
445+
return fmt.Errorf("error checking out file %q: %w", resource.Path(), err)
446446
}
447447
break
448448
}
449449
if err1 := f.Close(); err == nil {
450450
err = err1
451451
}
452452
if err != nil {
453-
return fmt.Errorf("error checking digest for %q: %v", resource.Path(), err)
453+
return fmt.Errorf("error checking digest for %q: %w", resource.Path(), err)
454454
}
455455
}
456456
}

‎driver/driver_unix.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (d *driver) Mkfifo(path string, mode os.FileMode) error {
5454
func (d *driver) Getxattr(p string) (map[string][]byte, error) {
5555
xattrs, err := sysx.Listxattr(p)
5656
if err != nil {
57-
return nil, fmt.Errorf("listing %s xattrs: %v", p, err)
57+
return nil, fmt.Errorf("listing %s xattrs: %w", p, err)
5858
}
5959

6060
sort.Strings(xattrs)
@@ -63,7 +63,7 @@ func (d *driver) Getxattr(p string) (map[string][]byte, error) {
6363
for _, attr := range xattrs {
6464
value, err := sysx.Getxattr(p, attr)
6565
if err != nil {
66-
return nil, fmt.Errorf("getting %q xattr on %s: %v", attr, p, err)
66+
return nil, fmt.Errorf("getting %q xattr on %s: %w", attr, p, err)
6767
}
6868

6969
// NOTE(stevvooe): This append/copy tricky relies on unique
@@ -82,7 +82,7 @@ func (d *driver) Getxattr(p string) (map[string][]byte, error) {
8282
func (d *driver) Setxattr(path string, attrMap map[string][]byte) error {
8383
for attr, value := range attrMap {
8484
if err := sysx.Setxattr(path, attr, value, 0); err != nil {
85-
return fmt.Errorf("error setting xattr %q on %s: %v", attr, path, err)
85+
return fmt.Errorf("error setting xattr %q on %s: %w", attr, path, err)
8686
}
8787
}
8888

@@ -94,7 +94,7 @@ func (d *driver) Setxattr(path string, attrMap map[string][]byte) error {
9494
func (d *driver) LGetxattr(p string) (map[string][]byte, error) {
9595
xattrs, err := sysx.LListxattr(p)
9696
if err != nil {
97-
return nil, fmt.Errorf("listing %s xattrs: %v", p, err)
97+
return nil, fmt.Errorf("listing %s xattrs: %w", p, err)
9898
}
9999

100100
sort.Strings(xattrs)
@@ -103,7 +103,7 @@ func (d *driver) LGetxattr(p string) (map[string][]byte, error) {
103103
for _, attr := range xattrs {
104104
value, err := sysx.LGetxattr(p, attr)
105105
if err != nil {
106-
return nil, fmt.Errorf("getting %q xattr on %s: %v", attr, p, err)
106+
return nil, fmt.Errorf("getting %q xattr on %s: %w", attr, p, err)
107107
}
108108

109109
// NOTE(stevvooe): This append/copy tricky relies on unique
@@ -122,7 +122,7 @@ func (d *driver) LGetxattr(p string) (map[string][]byte, error) {
122122
func (d *driver) LSetxattr(path string, attrMap map[string][]byte) error {
123123
for attr, value := range attrMap {
124124
if err := sysx.LSetxattr(path, attr, value, 0); err != nil {
125-
return fmt.Errorf("error setting xattr %q on %s: %v", attr, path, err)
125+
return fmt.Errorf("error setting xattr %q on %s: %w", attr, path, err)
126126
}
127127
}
128128

‎hardlinks.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (hlm *hardlinkManager) Merge() ([]Resource, error) {
6363

6464
merged, err := Merge(linked...)
6565
if err != nil {
66-
return nil, fmt.Errorf("error merging hardlink: %v", err)
66+
return nil, fmt.Errorf("error merging hardlink: %w", err)
6767
}
6868

6969
resources = append(resources, merged)

‎manifest.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func BuildManifest(ctx Context) (*Manifest, error) {
7878

7979
if err := ctx.Walk(func(p string, fi os.FileInfo, err error) error {
8080
if err != nil {
81-
return fmt.Errorf("error walking %s: %v", p, err)
81+
return fmt.Errorf("error walking %s: %w", p, err)
8282
}
8383

8484
if p == string(os.PathSeparator) {
@@ -101,7 +101,7 @@ func BuildManifest(ctx Context) (*Manifest, error) {
101101
return nil
102102
} else if err != errNotAHardLink {
103103
// handle any other case where we have a proper error.
104-
return fmt.Errorf("adding hardlink %s: %v", p, err)
104+
return fmt.Errorf("adding hardlink %s: %w", p, err)
105105
}
106106

107107
resourcesByPath[p] = resource

0 commit comments

Comments
 (0)