Fix golangci-lint errors

estesp · estesp · commit 9365a1b01a63 · 2020-07-08T10:16:38.000-04:00
Signed-off-by: Phil Estes &lt;estesp@linux.vnet.ibm.com&gt;
diff --git a/commands/ls.go b/commands/ls.go
@@ -44,8 +44,10 @@ var LSCmd = &cobra.Command{
 		for _, entry := range bm.Resource {
 			for _, path := range entry.Path {
 				if os.FileMode(entry.Mode)&os.ModeSymlink != 0 {
+					//nolint:unconvert
 					fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v -> %v\n", os.FileMode(entry.Mode), entry.User, entry.Group, humanize.Bytes(uint64(entry.Size)), path, entry.Target)
 				} else {
+					//nolint:unconvert
 					fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\n", os.FileMode(entry.Mode), entry.User, entry.Group, humanize.Bytes(uint64(entry.Size)), path)
 				}
 
diff --git a/context.go b/context.go
@@ -596,7 +596,7 @@ func (c *context) Walk(fn filepath.WalkFunc) error {
 			return err
 		}
 	}
-	return c.pathDriver.Walk(root, func(p string, fi os.FileInfo, err error) error {
+	return c.pathDriver.Walk(root, func(p string, fi os.FileInfo, _ error) error {
 		contained, err := c.containWithRoot(p, root)
 		return fn(contained, fi, err)
 	})
@@ -613,12 +613,6 @@ func (c *context) fullpath(p string) (string, error) {
 	return p, nil
 }
 
-// contain cleans and santizes the filesystem path p to be an absolute path,
-// effectively relative to the context root.
-func (c *context) contain(p string) (string, error) {
-	return c.containWithRoot(p, c.root)
-}
-
 // containWithRoot cleans and santizes the filesystem path p to be an absolute path,
 // effectively relative to the passed root. Extra care should be used when calling this
 // instead of contain. This is needed for Walk, as if context root is a symlink,
diff --git a/continuityfs/fuse.go b/continuityfs/fuse.go
@@ -131,7 +131,7 @@ type fileHandler struct {
 func (h *fileHandler) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error {
 	if h.offset != req.Offset {
 		if seeker, ok := h.reader.(io.Seeker); ok {
-			if _, err := seeker.Seek(req.Offset, os.SEEK_SET); err != nil {
+			if _, err := seeker.Seek(req.Offset, io.SeekStart); err != nil {
 				logrus.Debugf("Error seeking: %v", err)
 				return err
 			}
diff --git a/devices/devices_unix.go b/devices/devices_unix.go
@@ -32,6 +32,7 @@ func DeviceInfo(fi os.FileInfo) (uint64, uint64, error) {
 		return 0, 0, fmt.Errorf("cannot extract device from os.FileInfo")
 	}
 
+	//nolint:unconvert
 	dev := uint64(sys.Rdev)
 	return uint64(unix.Major(dev)), uint64(unix.Minor(dev)), nil
 }
diff --git a/digests.go b/digests.go
@@ -88,13 +88,9 @@ func digestsMatch(as, bs []digest.Digest) bool {
 	}
 
 	disjoint := len(as) + len(bs)
-	if len(uniqified) == disjoint {
-		// if these two sets have the same cardinality, we know both sides
-		// didn't share any digests.
-		return false
-	}
-
-	return true
+	// if these two sets have the same cardinality, we know both sides
+	// didn't share any digests.
+	return len(uniqified) != disjoint
 }
 
 type digestSlice []digest.Digest
diff --git a/driver/driver_windows.go b/driver/driver_windows.go
@@ -1,3 +1,5 @@
+// +build go1.13
+
 /*
    Copyright The containerd Authors.
 
@@ -14,8 +16,6 @@
    limitations under the License.
 */
 
-// +build go1.13
-
 // Go 1.13 is the minimally supported version for Windows.
 // Earlier golang releases have bug in os.Readlink
 // (see https://github.com/golang/go/issues/30463).
diff --git a/fs/fstest/continuity_util.go b/fs/fstest/continuity_util.go
@@ -47,7 +47,7 @@ func (l resourceListDifference) HasDiff() bool {
 	}
 
 	for _, add := range l.Additions {
-		if ok, _ := metadataFiles[add.Path()]; !ok {
+		if ok := metadataFiles[add.Path()]; !ok {
 			return true
 		}
 	}
@@ -66,7 +66,7 @@ func (l resourceListDifference) String() string {
 	for _, upt := range l.Updates {
 		fmt.Fprintf(buf, "~ %s\n", upt.String())
 	}
-	return string(buf.Bytes())
+	return buf.String()
 }
 
 // diffManifest compares two resource lists and returns the list
diff --git a/fs/fstest/testsuite.go b/fs/fstest/testsuite.go
@@ -210,7 +210,7 @@ var (
 	}
 
 	// Hardlink name before with modification
-	// Tests link is created for unmodified files when new hardlinked file is seen first
+	// Tests link is created for unmodified files when a new hard linked file is seen first
 	hardlinkBeforeUnmodified = []Applier{
 		baseApplier,
 		Apply(
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/containerd/continuity
 
-go 1.11
+go 1.13
 
 require (
 	bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898
diff --git a/groups_unix.go b/groups_unix.go
@@ -14,6 +14,7 @@
    limitations under the License.
 */
 
+//nolint:unused,deadcode
 package continuity
 
 import (
diff --git a/hardlinks.go b/hardlinks.go
@@ -53,7 +53,7 @@ func (hlm *hardlinkManager) Add(fi os.FileInfo, resource Resource) error {
 }
 
 // Merge processes the current state of the hardlink manager and merges any
-// shared nodes into hardlinked resources.
+// shared nodes into hard linked resources.
 func (hlm *hardlinkManager) Merge() ([]Resource, error) {
 	var resources []Resource
 	for key, linked := range hlm.hardlinks {
diff --git a/hardlinks_unix.go b/hardlinks_unix.go
@@ -48,5 +48,6 @@ func newHardlinkKey(fi os.FileInfo) (hardlinkKey, error) {
 		return hardlinkKey{}, errNotAHardLink
 	}
 
+	//nolint:unconvert
 	return hardlinkKey{dev: uint64(sys.Dev), inode: uint64(sys.Ino)}, nil
 }
diff --git a/ioutils_test.go b/ioutils_test.go
@@ -41,7 +41,7 @@ func TestAtomicWriteFile(t *testing.T) {
 		t.Fatalf("Error reading from file: %v", err)
 	}
 
-	if bytes.Compare(actual, expected) != 0 {
+	if !bytes.Equal(actual, expected) {
 		t.Fatalf("Data mismatch, expected %q, got %q", expected, actual)
 	}
 
diff --git a/manifest.go b/manifest.go
@@ -114,11 +114,13 @@ func BuildManifest(ctx Context) (*Manifest, error) {
 	}
 
 	// merge and post-process the hardlinks.
+	// nolint:misspell
 	hardlinked, err := hardlinks.Merge()
 	if err != nil {
 		return nil, err
 	}
 
+	// nolint:misspell
 	for _, resource := range hardlinked {
 		resourcesByPath[resource.Path()] = resource
 	}
diff --git a/manifest_test.go b/manifest_test.go
@@ -120,7 +120,7 @@ func TestWalkFS(t *testing.T) {
 		// },
 
 		// TODO(stevvooe): Must add tests for xattrs, with symlinks,
-		// directorys and regular files.
+		// directories and regular files.
 
 		{
 			kind: rnamedpipe,
diff --git a/resource_test.go b/resource_test.go
@@ -14,6 +14,7 @@
    limitations under the License.
 */
 
+//nolint:unused,deadcode
 package continuity
 
 type resourceUpdate struct {
diff --git a/sysx/xattr_unsupported.go b/sysx/xattr_unsupported.go
@@ -23,7 +23,7 @@ import (
 	"runtime"
 )
 
-var unsupported = errors.New("extended attributes unsupported on " + runtime.GOOS)
+var errUnsupported = errors.New("extended attributes unsupported on " + runtime.GOOS)
 
 // Listxattr calls syscall listxattr and reads all content
 // and returns a string array
@@ -33,17 +33,17 @@ func Listxattr(path string) ([]string, error) {
 
 // Removexattr calls syscall removexattr
 func Removexattr(path string, attr string) (err error) {
-	return unsupported
+	return errUnsupported
 }
 
 // Setxattr calls syscall setxattr
 func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	return unsupported
+	return errUnsupported
 }
 
 // Getxattr calls syscall getxattr
 func Getxattr(path, attr string) ([]byte, error) {
-	return []byte{}, unsupported
+	return []byte{}, errUnsupported
 }
 
 // LListxattr lists xattrs, not following symlinks
@@ -53,12 +53,12 @@ func LListxattr(path string) ([]string, error) {
 
 // LRemovexattr removes an xattr, not following symlinks
 func LRemovexattr(path string, attr string) (err error) {
-	return unsupported
+	return errUnsupported
 }
 
 // LSetxattr sets an xattr, not following symlinks
 func LSetxattr(path string, attr string, data []byte, flags int) (err error) {
-	return unsupported
+	return errUnsupported
 }
 
 // LGetxattr gets an xattr, not following symlinks
diff --git a/testutil_test.go b/testutil_test.go
@@ -14,6 +14,7 @@
    limitations under the License.
 */
 
+//nolint:unused,deadcode
 package continuity
 
 import (

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ type fileHandler struct {`
`131`	`131`	`func (h fileHandler) Read(ctx context.Context, req fuse.ReadRequest, resp *fuse.ReadResponse) error {`
`132`	`132`	`if h.offset != req.Offset {`
`133`	`133`	`if seeker, ok := h.reader.(io.Seeker); ok {`
`134`		`- if _, err := seeker.Seek(req.Offset, os.SEEK_SET); err != nil {`
	`134`	`+ if _, err := seeker.Seek(req.Offset, io.SeekStart); err != nil {`
`135`	`135`	`logrus.Debugf("Error seeking: %v", err)`
`136`	`136`	`return err`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ func DeviceInfo(fi os.FileInfo) (uint64, uint64, error) {`
`32`	`32`	`return 0, 0, fmt.Errorf("cannot extract device from os.FileInfo")`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ //nolint:unconvert`
`35`	`36`	`dev := uint64(sys.Rdev)`
`36`	`37`	`return uint64(unix.Major(dev)), uint64(unix.Minor(dev)), nil`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func (l resourceListDifference) HasDiff() bool {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`for _, add := range l.Additions {`
`50`		`- if ok, _ := metadataFiles[add.Path()]; !ok {`
	`50`	`+ if ok := metadataFiles[add.Path()]; !ok {`
`51`	`51`	`return true`
`52`	`52`	`}`
`53`	`53`	`}`
`@@ -66,7 +66,7 @@ func (l resourceListDifference) String() string {`
`66`	`66`	`for _, upt := range l.Updates {`
`67`	`67`	`fmt.Fprintf(buf, "~ %s\n", upt.String())`
`68`	`68`	`}`
`69`		`- return string(buf.Bytes())`
	`69`	`+ return buf.String()`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`// diffManifest compares two resource lists and returns the list`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ var (`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`// Hardlink name before with modification`
`213`		`- // Tests link is created for unmodified files when new hardlinked file is seen first`
	`213`	`+ // Tests link is created for unmodified files when a new hard linked file is seen first`
`214`	`214`	`hardlinkBeforeUnmodified = []Applier{`
`215`	`215`	`baseApplier,`
`216`	`216`	`Apply(`