Merge pull request #196 from AkihiroSuda/fix-wrap2

estesp · web-flow · commit cd17c99cc447 · 2022-03-25T12:25:50.000-04:00
Fix wrapping errors
diff --git a/context.go b/context.go
@@ -390,7 +390,7 @@ func (c *context) checkoutFile(fp string, rf RegularFile) error {
 		}
 	}
 	if err != nil {
-		return fmt.Errorf("file content could not be provided: %v", err)
+		return fmt.Errorf("file content could not be provided: %w", err)
 	}
 	defer r.Close()
 
@@ -422,7 +422,7 @@ func (c *context) Apply(resource Resource) error {
 	case RegularFile:
 		if fi == nil {
 			if err := c.checkoutFile(fp, r); err != nil {
-				return fmt.Errorf("error checking out file %q: %v", resource.Path(), err)
+				return fmt.Errorf("error checking out file %q: %w", resource.Path(), err)
 			}
 			chmod = false
 		} else {
@@ -431,26 +431,26 @@ func (c *context) Apply(resource Resource) error {
 			}
 			if fi.Size() != r.Size() {
 				if err := c.checkoutFile(fp, r); err != nil {
-					return fmt.Errorf("error checking out file %q: %v", resource.Path(), err)
+					return fmt.Errorf("error checking out file %q: %w", resource.Path(), err)
 				}
 			} else {
 				for _, dgst := range r.Digests() {
 					f, err := os.Open(fp)
 					if err != nil {
-						return fmt.Errorf("failure opening file for read %q: %v", resource.Path(), err)
+						return fmt.Errorf("failure opening file for read %q: %w", resource.Path(), err)
 					}
 					compared, err := dgst.Algorithm().FromReader(f)
 					if err == nil && dgst != compared {
 						if err := c.checkoutFile(fp, r); err != nil {
-							return fmt.Errorf("error checking out file %q: %v", resource.Path(), err)
+							return fmt.Errorf("error checking out file %q: %w", resource.Path(), err)
 						}
 						break
 					}
 					if err1 := f.Close(); err == nil {
 						err = err1
 					}
 					if err != nil {
-						return fmt.Errorf("error checking digest for %q: %v", resource.Path(), err)
+						return fmt.Errorf("error checking digest for %q: %w", resource.Path(), err)
 					}
 				}
 			}
diff --git a/driver/driver_unix.go b/driver/driver_unix.go
@@ -54,7 +54,7 @@ func (d *driver) Mkfifo(path string, mode os.FileMode) error {
 func (d *driver) Getxattr(p string) (map[string][]byte, error) {
 	xattrs, err := sysx.Listxattr(p)
 	if err != nil {
-		return nil, fmt.Errorf("listing %s xattrs: %v", p, err)
+		return nil, fmt.Errorf("listing %s xattrs: %w", p, err)
 	}
 
 	sort.Strings(xattrs)
@@ -63,7 +63,7 @@ func (d *driver) Getxattr(p string) (map[string][]byte, error) {
 	for _, attr := range xattrs {
 		value, err := sysx.Getxattr(p, attr)
 		if err != nil {
-			return nil, fmt.Errorf("getting %q xattr on %s: %v", attr, p, err)
+			return nil, fmt.Errorf("getting %q xattr on %s: %w", attr, p, err)
 		}
 
 		// NOTE(stevvooe): This append/copy tricky relies on unique
@@ -82,7 +82,7 @@ func (d *driver) Getxattr(p string) (map[string][]byte, error) {
 func (d *driver) Setxattr(path string, attrMap map[string][]byte) error {
 	for attr, value := range attrMap {
 		if err := sysx.Setxattr(path, attr, value, 0); err != nil {
-			return fmt.Errorf("error setting xattr %q on %s: %v", attr, path, err)
+			return fmt.Errorf("error setting xattr %q on %s: %w", attr, path, err)
 		}
 	}
 
@@ -94,7 +94,7 @@ func (d *driver) Setxattr(path string, attrMap map[string][]byte) error {
 func (d *driver) LGetxattr(p string) (map[string][]byte, error) {
 	xattrs, err := sysx.LListxattr(p)
 	if err != nil {
-		return nil, fmt.Errorf("listing %s xattrs: %v", p, err)
+		return nil, fmt.Errorf("listing %s xattrs: %w", p, err)
 	}
 
 	sort.Strings(xattrs)
@@ -103,7 +103,7 @@ func (d *driver) LGetxattr(p string) (map[string][]byte, error) {
 	for _, attr := range xattrs {
 		value, err := sysx.LGetxattr(p, attr)
 		if err != nil {
-			return nil, fmt.Errorf("getting %q xattr on %s: %v", attr, p, err)
+			return nil, fmt.Errorf("getting %q xattr on %s: %w", attr, p, err)
 		}
 
 		// NOTE(stevvooe): This append/copy tricky relies on unique
@@ -122,7 +122,7 @@ func (d *driver) LGetxattr(p string) (map[string][]byte, error) {
 func (d *driver) LSetxattr(path string, attrMap map[string][]byte) error {
 	for attr, value := range attrMap {
 		if err := sysx.LSetxattr(path, attr, value, 0); err != nil {
-			return fmt.Errorf("error setting xattr %q on %s: %v", attr, path, err)
+			return fmt.Errorf("error setting xattr %q on %s: %w", attr, path, err)
 		}
 	}
 
diff --git a/fs/copy.go b/fs/copy.go
@@ -158,7 +158,9 @@ func copyDirectory(dst, src string, inodes map[uint64]string, o *copyDirOpts) er
 			}
 		default:
 			// TODO: Support pipes and sockets
-			return fmt.Errorf("unsupported mode %s: %w", fi.Mode(), err)
+			if err != nil {
+				return fmt.Errorf("unsupported mode %s: %w", fi.Mode(), err)
+			}
 		}
 
 		if err := copyFileInfo(fi, source, target); err != nil {
diff --git a/hardlinks.go b/hardlinks.go
@@ -63,7 +63,7 @@ func (hlm *hardlinkManager) Merge() ([]Resource, error) {
 
 		merged, err := Merge(linked...)
 		if err != nil {
-			return nil, fmt.Errorf("error merging hardlink: %v", err)
+			return nil, fmt.Errorf("error merging hardlink: %w", err)
 		}
 
 		resources = append(resources, merged)
diff --git a/manifest.go b/manifest.go
@@ -78,7 +78,7 @@ func BuildManifest(ctx Context) (*Manifest, error) {
 
 	if err := ctx.Walk(func(p string, fi os.FileInfo, err error) error {
 		if err != nil {
-			return fmt.Errorf("error walking %s: %v", p, err)
+			return fmt.Errorf("error walking %s: %w", p, err)
 		}
 
 		if p == string(os.PathSeparator) {
@@ -101,7 +101,7 @@ func BuildManifest(ctx Context) (*Manifest, error) {
 			return nil
 		} else if err != errNotAHardLink {
 			// handle any other case where we have a proper error.
-			return fmt.Errorf("adding hardlink %s: %v", p, err)
+			return fmt.Errorf("adding hardlink %s: %w", p, err)
 		}
 
 		resourcesByPath[p] = resource

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ func (c *context) checkoutFile(fp string, rf RegularFile) error {`
`390`	`390`	`}`
`391`	`391`	`}`
`392`	`392`	`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)`
`394`	`394`	`}`
`395`	`395`	`defer r.Close()`
`396`	`396`
`@@ -422,7 +422,7 @@ func (c *context) Apply(resource Resource) error {`
`422`	`422`	`case RegularFile:`
`423`	`423`	`if fi == nil {`
`424`	`424`	`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)`
`426`	`426`	`}`
`427`	`427`	`chmod = false`
`428`	`428`	`} else {`
`@@ -431,26 +431,26 @@ func (c *context) Apply(resource Resource) error {`
`431`	`431`	`}`
`432`	`432`	`if fi.Size() != r.Size() {`
`433`	`433`	`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)`
`435`	`435`	`}`
`436`	`436`	`} else {`
`437`	`437`	`for _, dgst := range r.Digests() {`
`438`	`438`	`f, err := os.Open(fp)`
`439`	`439`	`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)`
`441`	`441`	`}`
`442`	`442`	`compared, err := dgst.Algorithm().FromReader(f)`
`443`	`443`	`if err == nil && dgst != compared {`
`444`	`444`	`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)`
`446`	`446`	`}`
`447`	`447`	`break`
`448`	`448`	`}`
`449`	`449`	`if err1 := f.Close(); err == nil {`
`450`	`450`	`err = err1`
`451`	`451`	`}`
`452`	`452`	`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)`
`454`	`454`	`}`
`455`	`455`	`}`
`456`	`456`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func (d *driver) Mkfifo(path string, mode os.FileMode) error {`
`54`	`54`	`func (d *driver) Getxattr(p string) (map[string][]byte, error) {`
`55`	`55`	`xattrs, err := sysx.Listxattr(p)`
`56`	`56`	`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)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`sort.Strings(xattrs)`
`@@ -63,7 +63,7 @@ func (d *driver) Getxattr(p string) (map[string][]byte, error) {`
`63`	`63`	`for _, attr := range xattrs {`
`64`	`64`	`value, err := sysx.Getxattr(p, attr)`
`65`	`65`	`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)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// NOTE(stevvooe): This append/copy tricky relies on unique`
`@@ -82,7 +82,7 @@ func (d *driver) Getxattr(p string) (map[string][]byte, error) {`
`82`	`82`	`func (d *driver) Setxattr(path string, attrMap map[string][]byte) error {`
`83`	`83`	`for attr, value := range attrMap {`
`84`	`84`	`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)`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`@@ -94,7 +94,7 @@ func (d *driver) Setxattr(path string, attrMap map[string][]byte) error {`
`94`	`94`	`func (d *driver) LGetxattr(p string) (map[string][]byte, error) {`
`95`	`95`	`xattrs, err := sysx.LListxattr(p)`
`96`	`96`	`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)`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`sort.Strings(xattrs)`
`@@ -103,7 +103,7 @@ func (d *driver) LGetxattr(p string) (map[string][]byte, error) {`
`103`	`103`	`for _, attr := range xattrs {`
`104`	`104`	`value, err := sysx.LGetxattr(p, attr)`
`105`	`105`	`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)`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`// NOTE(stevvooe): This append/copy tricky relies on unique`
`@@ -122,7 +122,7 @@ func (d *driver) LGetxattr(p string) (map[string][]byte, error) {`
`122`	`122`	`func (d *driver) LSetxattr(path string, attrMap map[string][]byte) error {`
`123`	`123`	`for attr, value := range attrMap {`
`124`	`124`	`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)`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,9 @@ func copyDirectory(dst, src string, inodes map[uint64]string, o *copyDirOpts) er`
`158`	`158`	`}`
`159`	`159`	`default:`
`160`	`160`	`// TODO: Support pipes and sockets`
`161`		`- return fmt.Errorf("unsupported mode %s: %w", fi.Mode(), err)`
	`161`	`+ if err != nil {`
	`162`	`+ return fmt.Errorf("unsupported mode %s: %w", fi.Mode(), err)`
	`163`	`+ }`
`162`	`164`	`}`
`163`	`165`
`164`	`166`	`if err := copyFileInfo(fi, source, target); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func (hlm *hardlinkManager) Merge() ([]Resource, error) {`
`63`	`63`
`64`	`64`	`merged, err := Merge(linked...)`
`65`	`65`	`if err != nil {`
`66`		`- return nil, fmt.Errorf("error merging hardlink: %v", err)`
	`66`	`+ return nil, fmt.Errorf("error merging hardlink: %w", err)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`resources = append(resources, merged)`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func BuildManifest(ctx Context) (*Manifest, error) {`
`78`	`78`
`79`	`79`	`if err := ctx.Walk(func(p string, fi os.FileInfo, err error) error {`
`80`	`80`	`if err != nil {`
`81`		`- return fmt.Errorf("error walking %s: %v", p, err)`
	`81`	`+ return fmt.Errorf("error walking %s: %w", p, err)`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`if p == string(os.PathSeparator) {`
`@@ -101,7 +101,7 @@ func BuildManifest(ctx Context) (*Manifest, error) {`
`101`	`101`	`return nil`
`102`	`102`	`} else if err != errNotAHardLink {`
`103`	`103`	`// 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)`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`resourcesByPath[p] = resource`