Merge pull request #2951 from crosbymichael/lint-relase11

estesp · web-flow · commit 9979a1a9362e · 2019-01-23T13:12:43.000-05:00
[release/1.1] fix: linter issue
diff --git a/.gometalinter.json b/.gometalinter.json
@@ -10,7 +10,6 @@
 
   "Enable": [
     "structcheck",
-    "unused",
     "varcheck",
     "staticcheck",
     "unconvert",
diff --git a/archive/tar.go b/archive/tar.go
@@ -284,7 +284,7 @@ func applyNaive(ctx context.Context, root string, tr *tar.Reader, options ApplyO
 			linkBasename := filepath.Base(hdr.Linkname)
 			srcHdr = aufsHardlinks[linkBasename]
 			if srcHdr == nil {
-				return 0, fmt.Errorf("Invalid aufs hardlink")
+				return 0, fmt.Errorf("invalid aufs hardlink")
 			}
 			p, err := fs.RootPath(aufsTempdir, linkBasename)
 			if err != nil {
diff --git a/archive/tar_test.go b/archive/tar_test.go
@@ -239,7 +239,7 @@ func TestBreakouts(t *testing.T) {
 			if err != nil {
 				return err
 			}
-			if bytes.Compare(b, content) != 0 {
+			if !bytes.Equal(b, content) {
 				return errors.Errorf("content differs: expected %v, got %v", content, b)
 			}
 			return nil
@@ -1073,7 +1073,7 @@ func fileEntry(name string, expected []byte, mode int) tarEntryValidator {
 		if hdr.Mode != int64(mode) {
 			return errors.Errorf("wrong mode %o, expected %o", hdr.Mode, mode)
 		}
-		if bytes.Compare(b, expected) != 0 {
+		if !bytes.Equal(b, expected) {
 			return errors.Errorf("different file content")
 		}
 		return nil
diff --git a/archive/tar_windows.go b/archive/tar_windows.go
@@ -74,7 +74,7 @@ func tarName(p string) (string, error) {
 	// in file names, it is mostly safe to replace however we must
 	// check just in case
 	if strings.Contains(p, "/") {
-		return "", fmt.Errorf("Windows path contains forward slash: %s", p)
+		return "", fmt.Errorf("windows path contains forward slash: %s", p)
 	}
 
 	return strings.Replace(p, string(os.PathSeparator), "/", -1), nil
@@ -130,11 +130,7 @@ func skipFile(hdr *tar.Header) bool {
 	// specific or Linux-specific, this warning should be changed to an error
 	// to cater for the situation where someone does manage to upload a Linux
 	// image but have it tagged as Windows inadvertently.
-	if strings.Contains(hdr.Name, ":") {
-		return true
-	}
-
-	return false
+	return strings.Contains(hdr.Name, ":")
 }
 
 // handleTarTypeBlockCharFifo is an OS-specific helper function used by
diff --git a/container_linux_test.go b/container_linux_test.go
@@ -838,7 +838,7 @@ func TestShimSigkilled(t *testing.T) {
 	}
 
 	pid := task.Pid()
-	if pid <= 0 {
+	if pid < 1 {
 		t.Fatalf("invalid task pid %d", pid)
 	}
 
@@ -901,7 +901,7 @@ func TestDaemonRestartWithRunningShim(t *testing.T) {
 	}
 
 	pid := task.Pid()
-	if pid <= 0 {
+	if pid < 1 {
 		t.Fatalf("invalid task pid %d", pid)
 	}
 
@@ -1130,7 +1130,7 @@ func testUserNamespaces(t *testing.T, readonlyRootFS bool) {
 		t.Fatal(err)
 	}
 
-	if pid := task.Pid(); pid <= 0 {
+	if pid := task.Pid(); pid < 1 {
 		t.Errorf("invalid task pid %d", pid)
 	}
 	if err := task.Start(ctx); err != nil {
diff --git a/container_test.go b/container_test.go
@@ -134,7 +134,7 @@ func TestContainerStart(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if pid := task.Pid(); pid <= 0 {
+	if pid := task.Pid(); pid < 1 {
 		t.Errorf("invalid task pid %d", pid)
 	}
 	if err := task.Start(ctx); err != nil {
@@ -433,7 +433,7 @@ func TestContainerPids(t *testing.T) {
 	}
 
 	pid := task.Pid()
-	if pid <= 0 {
+	if pid < 1 {
 		t.Errorf("invalid task pid %d", pid)
 	}
 	processes, err := task.Pids(ctx)
@@ -783,7 +783,7 @@ func TestWaitStoppedTask(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if pid := task.Pid(); pid <= 0 {
+	if pid := task.Pid(); pid < 1 {
 		t.Errorf("invalid task pid %d", pid)
 	}
 	if err := task.Start(ctx); err != nil {
diff --git a/content/local/locks.go b/content/local/locks.go
@@ -47,7 +47,5 @@ func unlock(ref string) {
 	locksMu.Lock()
 	defer locksMu.Unlock()
 
-	if _, ok := locks[ref]; ok {
-		delete(locks, ref)
-	}
+	delete(locks, ref)
 }
diff --git a/contrib/seccomp/seccomp.go b/contrib/seccomp/seccomp.go
@@ -37,10 +37,10 @@ func WithProfile(profile string) oci.SpecOpts {
 		s.Linux.Seccomp = &specs.LinuxSeccomp{}
 		f, err := ioutil.ReadFile(profile)
 		if err != nil {
-			return fmt.Errorf("Cannot load seccomp profile %q: %v", profile, err)
+			return fmt.Errorf("cannot load seccomp profile %q: %v", profile, err)
 		}
 		if err := json.Unmarshal(f, s.Linux.Seccomp); err != nil {
-			return fmt.Errorf("Decoding seccomp profile failed %q: %v", profile, err)
+			return fmt.Errorf("decoding seccomp profile failed %q: %v", profile, err)
 		}
 		return nil
 	}
diff --git a/diff/apply/apply.go b/diff/apply/apply.go
@@ -58,7 +58,7 @@ func (s *fsApplier) Apply(ctx context.Context, desc ocispec.Descriptor, mounts [
 	defer func() {
 		if err == nil {
 			log.G(ctx).WithFields(logrus.Fields{
-				"d":     time.Now().Sub(t1),
+				"d":     time.Since(t1),
 				"dgst":  desc.Digest,
 				"size":  desc.Size,
 				"media": desc.MediaType,
diff --git a/diff/windows/windows.go b/diff/windows/windows.go
@@ -92,7 +92,7 @@ func (s windowsDiff) Apply(ctx context.Context, desc ocispec.Descriptor, mounts
 	defer func() {
 		if err == nil {
 			log.G(ctx).WithFields(logrus.Fields{
-				"d":     time.Now().Sub(t1),
+				"d":     time.Since(t1),
 				"dgst":  desc.Digest,
 				"size":  desc.Size,
 				"media": desc.MediaType,
diff --git a/filters/scanner.go b/filters/scanner.go
@@ -185,7 +185,6 @@ func (s *scanner) scanQuoted(quote rune) {
 			ch = s.next()
 		}
 	}
-	return
 }
 
 func (s *scanner) scanEscape(quote rune) rune {
diff --git a/metadata/content.go b/metadata/content.go
@@ -681,7 +681,7 @@ func (cs *contentStore) garbageCollect(ctx context.Context) (d time.Duration, er
 	t1 := time.Now()
 	defer func() {
 		if err == nil {
-			d = time.Now().Sub(t1)
+			d = time.Since(t1)
 		}
 		cs.l.Unlock()
 	}()
diff --git a/metadata/db.go b/metadata/db.go
@@ -154,7 +154,7 @@ func (m *DB) Init(ctx context.Context) error {
 				if err := m.migrate(tx); err != nil {
 					return errors.Wrapf(err, "failed to migrate to %s.%d", m.schema, m.version)
 				}
-				log.G(ctx).WithField("d", time.Now().Sub(t0)).Debugf("finished database migration to %s.%d", m.schema, m.version)
+				log.G(ctx).WithField("d", time.Since(t0)).Debugf("finished database migration to %s.%d", m.schema, m.version)
 			}
 		}
 
@@ -306,7 +306,7 @@ func (m *DB) GarbageCollect(ctx context.Context) (gc.Stats, error) {
 				m.cleanupSnapshotter(snapshotterName)
 
 				sl.Lock()
-				stats.SnapshotD[snapshotterName] = time.Now().Sub(st1)
+				stats.SnapshotD[snapshotterName] = time.Since(st1)
 				sl.Unlock()
 
 				wg.Done()
@@ -321,15 +321,15 @@ func (m *DB) GarbageCollect(ctx context.Context) (gc.Stats, error) {
 		go func() {
 			ct1 := time.Now()
 			m.cleanupContent()
-			stats.ContentD = time.Now().Sub(ct1)
+			stats.ContentD = time.Since(ct1)
 			wg.Done()
 		}()
 		m.dirtyCS = false
 	}
 
 	m.dirtyL.Unlock()
 
-	stats.MetaD = time.Now().Sub(t1)
+	stats.MetaD = time.Since(t1)
 	m.wlock.Unlock()
 
 	wg.Wait()
diff --git a/metadata/snapshot.go b/metadata/snapshot.go
@@ -628,7 +628,7 @@ func (s *snapshotter) garbageCollect(ctx context.Context) (d time.Duration, err
 			}
 		}
 		if err == nil {
-			d = time.Now().Sub(t1)
+			d = time.Since(t1)
 		}
 	}()
 
diff --git a/mount/mountinfo_linux.go b/mount/mountinfo_linux.go
@@ -75,13 +75,13 @@ func parseInfoFile(r io.Reader) ([]Info, error) {
 		if _, err := fmt.Sscanf(text, mountinfoFormat,
 			&p.ID, &p.Parent, &p.Major, &p.Minor,
 			&p.Root, &p.Mountpoint, &p.Options, &optionalFields); err != nil {
-			return nil, fmt.Errorf("Scanning '%s' failed: %s", text, err)
+			return nil, fmt.Errorf("scanning '%s' failed: %s", text, err)
 		}
 		// Safe as mountinfo encodes mountpoints with spaces as \040.
 		index := strings.Index(text, " - ")
 		postSeparatorFields := strings.Fields(text[index+3:])
 		if len(postSeparatorFields) < 3 {
-			return nil, fmt.Errorf("Error found less than 3 fields post '-' in %q", text)
+			return nil, fmt.Errorf("found less than 3 fields post '-' in %q", text)
 		}
 
 		if optionalFields != "-" {
diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -42,10 +42,7 @@ var (
 
 // IsSkipPlugin returns true if the error is skipping the plugin
 func IsSkipPlugin(err error) bool {
-	if errors.Cause(err) == ErrSkipPlugin {
-		return true
-	}
-	return false
+	return errors.Cause(err) == ErrSkipPlugin
 }
 
 // Type is the type of the plugin
diff --git a/progress/escape.go b/progress/escape.go
@@ -19,6 +19,6 @@ package progress
 const (
 	escape = "\x1b"
 	reset  = escape + "[0m"
-	red    = escape + "[31m" // nolint: unused, varcheck
+	red    = escape + "[31m" // nolint: staticcheck, varcheck
 	green  = escape + "[32m"
 )
diff --git a/remotes/docker/auth.go b/remotes/docker/auth.go
@@ -79,8 +79,8 @@ func init() {
 		var t octetType
 		isCtl := c <= 31 || c == 127
 		isChar := 0 <= c && c <= 127
-		isSeparator := strings.IndexRune(" \t\"(),/:;<=>?@[]\\{}", rune(c)) >= 0
-		if strings.IndexRune(" \t\r\n", rune(c)) >= 0 {
+		isSeparator := strings.ContainsRune(" \t\"(),/:;<=>?@[]\\{}", rune(c))
+		if strings.ContainsRune(" \t\r\n", rune(c)) {
 			t |= isSpace
 		}
 		if isChar && !isCtl && !isSeparator {
diff --git a/services/containers/local.go b/services/containers/local.go
@@ -132,9 +132,7 @@ func (l *local) Update(ctx context.Context, req *api.UpdateContainerRequest, _ .
 	if err := l.withStoreUpdate(ctx, func(ctx context.Context, store containers.Store) error {
 		var fieldpaths []string
 		if req.UpdateMask != nil && len(req.UpdateMask.Paths) > 0 {
-			for _, path := range req.UpdateMask.Paths {
-				fieldpaths = append(fieldpaths, path)
-			}
+			fieldpaths = append(fieldpaths, req.UpdateMask.Paths...)
 		}
 
 		updated, err := store.Update(ctx, container, fieldpaths...)
diff --git a/services/images/local.go b/services/images/local.go
@@ -138,9 +138,7 @@ func (l *local) Update(ctx context.Context, req *imagesapi.UpdateImageRequest, _
 	)
 
 	if req.UpdateMask != nil && len(req.UpdateMask.Paths) > 0 {
-		for _, path := range req.UpdateMask.Paths {
-			fieldpaths = append(fieldpaths, path)
-		}
+		fieldpaths = append(fieldpaths, req.UpdateMask.Paths...)
 	}
 
 	updated, err := l.store.Update(ctx, image, fieldpaths...)
diff --git a/testutil/helpers_unix.go b/testutil/helpers_unix.go
@@ -49,7 +49,7 @@ func RequiresRootM() {
 		fmt.Fprintln(os.Stderr, "skipping test that requires root")
 		os.Exit(0)
 	}
-	if 0 != os.Getuid() {
+	if os.Getuid() != 0 {
 		fmt.Fprintln(os.Stderr, "This test must be run as root.")
 		os.Exit(1)
 	}

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ func applyNaive(ctx context.Context, root string, tr *tar.Reader, options ApplyO`
`284`	`284`	`linkBasename := filepath.Base(hdr.Linkname)`
`285`	`285`	`srcHdr = aufsHardlinks[linkBasename]`
`286`	`286`	`if srcHdr == nil {`
`287`		`- return 0, fmt.Errorf("Invalid aufs hardlink")`
	`287`	`+ return 0, fmt.Errorf("invalid aufs hardlink")`
`288`	`288`	`}`
`289`	`289`	`p, err := fs.RootPath(aufsTempdir, linkBasename)`
`290`	`290`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ func TestBreakouts(t *testing.T) {`
`239`	`239`	`if err != nil {`
`240`	`240`	`return err`
`241`	`241`	`}`
`242`		`- if bytes.Compare(b, content) != 0 {`
	`242`	`+ if !bytes.Equal(b, content) {`
`243`	`243`	`return errors.Errorf("content differs: expected %v, got %v", content, b)`
`244`	`244`	`}`
`245`	`245`	`return nil`
`@@ -1073,7 +1073,7 @@ func fileEntry(name string, expected []byte, mode int) tarEntryValidator {`
`1073`	`1073`	`if hdr.Mode != int64(mode) {`
`1074`	`1074`	`return errors.Errorf("wrong mode %o, expected %o", hdr.Mode, mode)`
`1075`	`1075`	`}`
`1076`		`- if bytes.Compare(b, expected) != 0 {`
	`1076`	`+ if !bytes.Equal(b, expected) {`
`1077`	`1077`	`return errors.Errorf("different file content")`
`1078`	`1078`	`}`
`1079`	`1079`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -838,7 +838,7 @@ func TestShimSigkilled(t *testing.T) {`
`838`	`838`	`}`
`839`	`839`
`840`	`840`	`pid := task.Pid()`
`841`		`- if pid <= 0 {`
	`841`	`+ if pid < 1 {`
`842`	`842`	`t.Fatalf("invalid task pid %d", pid)`
`843`	`843`	`}`
`844`	`844`
`@@ -901,7 +901,7 @@ func TestDaemonRestartWithRunningShim(t *testing.T) {`
`901`	`901`	`}`
`902`	`902`
`903`	`903`	`pid := task.Pid()`
`904`		`- if pid <= 0 {`
	`904`	`+ if pid < 1 {`
`905`	`905`	`t.Fatalf("invalid task pid %d", pid)`
`906`	`906`	`}`
`907`	`907`
`@@ -1130,7 +1130,7 @@ func testUserNamespaces(t *testing.T, readonlyRootFS bool) {`
`1130`	`1130`	`t.Fatal(err)`
`1131`	`1131`	`}`
`1132`	`1132`
`1133`		`- if pid := task.Pid(); pid <= 0 {`
	`1133`	`+ if pid := task.Pid(); pid < 1 {`
`1134`	`1134`	`t.Errorf("invalid task pid %d", pid)`
`1135`	`1135`	`}`
`1136`	`1136`	`if err := task.Start(ctx); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func TestContainerStart(t *testing.T) {`
`134`	`134`	`t.Fatal(err)`
`135`	`135`	`}`
`136`	`136`
`137`		`- if pid := task.Pid(); pid <= 0 {`
	`137`	`+ if pid := task.Pid(); pid < 1 {`
`138`	`138`	`t.Errorf("invalid task pid %d", pid)`
`139`	`139`	`}`
`140`	`140`	`if err := task.Start(ctx); err != nil {`
`@@ -433,7 +433,7 @@ func TestContainerPids(t *testing.T) {`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`pid := task.Pid()`
`436`		`- if pid <= 0 {`
	`436`	`+ if pid < 1 {`
`437`	`437`	`t.Errorf("invalid task pid %d", pid)`
`438`	`438`	`}`
`439`	`439`	`processes, err := task.Pids(ctx)`
`@@ -783,7 +783,7 @@ func TestWaitStoppedTask(t *testing.T) {`
`783`	`783`	`t.Fatal(err)`
`784`	`784`	`}`
`785`	`785`
`786`		`- if pid := task.Pid(); pid <= 0 {`
	`786`	`+ if pid := task.Pid(); pid < 1 {`
`787`	`787`	`t.Errorf("invalid task pid %d", pid)`
`788`	`788`	`}`
`789`	`789`	`if err := task.Start(ctx); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,5 @@ func unlock(ref string) {`
`47`	`47`	`locksMu.Lock()`
`48`	`48`	`defer locksMu.Unlock()`
`49`	`49`
`50`		`- if _, ok := locks[ref]; ok {`
`51`		`- delete(locks, ref)`
`52`		`- }`
	`50`	`+ delete(locks, ref)`
`53`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ func WithProfile(profile string) oci.SpecOpts {`
`37`	`37`	`s.Linux.Seccomp = &specs.LinuxSeccomp{}`
`38`	`38`	`f, err := ioutil.ReadFile(profile)`
`39`	`39`	`if err != nil {`
`40`		`- return fmt.Errorf("Cannot load seccomp profile %q: %v", profile, err)`
	`40`	`+ return fmt.Errorf("cannot load seccomp profile %q: %v", profile, err)`
`41`	`41`	`}`
`42`	`42`	`if err := json.Unmarshal(f, s.Linux.Seccomp); err != nil {`
`43`		`- return fmt.Errorf("Decoding seccomp profile failed %q: %v", profile, err)`
	`43`	`+ return fmt.Errorf("decoding seccomp profile failed %q: %v", profile, err)`
`44`	`44`	`}`
`45`	`45`	`return nil`
`46`	`46`	`}`