clean-up "nolint" comments, remove unused ones

thaJeztah · thaJeztah · commit 95655f4ceedc · 2023-03-08T00:11:35.000+01:00
- fix "nolint" comments to be in the correct format (`//nolint:<linters>[,<linter>` no leading space, required colon (`:`) and linters. - remove "nolint" comments for errcheck, which is disabled in our config. - remove "nolint" comments that were no longer needed (nolintlint). - where known, add a comment describing why a "nolint" was applied. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 29c7fc9) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/archive/tar_unix.go b/archive/tar_unix.go
@@ -62,8 +62,7 @@ func setHeaderForSpecialDevice(hdr *tar.Header, name string, fi os.FileInfo) err
 		return errors.New("unsupported stat type")
 	}
 
-	// Rdev is int32 on darwin/bsd, int64 on linux/solaris
-	rdev := uint64(s.Rdev) //nolint:unconvert
+	rdev := uint64(s.Rdev) //nolint:unconvert // rdev is int32 on darwin/bsd, int64 on linux/solaris
 
 	// Currently go does not fill in the major/minors
 	if s.Mode&syscall.S_IFBLK != 0 ||
diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go
@@ -36,9 +36,7 @@ import (
 	exec "golang.org/x/sys/execabs"
 )
 
-// the following nolint is for shutting up gometalinter on non-linux.
-//
-//nolint:unused
+//nolint:unused // Ignore on non-Linux
 func newDaemonWithConfig(t *testing.T, configTOML string) (*Client, *daemon, func()) {
 	if testing.Short() {
 		t.Skip()
diff --git a/oci/spec_opts.go b/oci/spec_opts.go
@@ -76,7 +76,6 @@ func setLinux(s *Spec) {
 	}
 }
 
-// nolint
 func setResources(s *Spec) {
 	if s.Linux != nil {
 		if s.Linux.Resources == nil {
@@ -90,7 +89,7 @@ func setResources(s *Spec) {
 	}
 }
 
-// nolint
+//nolint:unused // not used on all platforms
 func setCPU(s *Spec) {
 	setResources(s)
 	if s.Linux != nil {
diff --git a/oci/spec_opts_linux_test.go b/oci/spec_opts_linux_test.go
@@ -31,7 +31,7 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-// nolint:gosec
+//nolint:gosec
 func TestWithUserID(t *testing.T) {
 	t.Parallel()
 
@@ -87,7 +87,7 @@ guest:x:405:100:guest:/dev/null:/sbin/nologin
 	}
 }
 
-// nolint:gosec
+//nolint:gosec
 func TestWithUsername(t *testing.T) {
 	t.Parallel()
 
@@ -150,7 +150,7 @@ guest:x:405:100:guest:/dev/null:/sbin/nologin
 
 }
 
-// nolint:gosec
+//nolint:gosec
 func TestWithAdditionalGIDs(t *testing.T) {
 	t.Parallel()
 	expectedPasswd := `root:x:0:0:root:/root:/bin/ash
diff --git a/oci/spec_opts_nonlinux.go b/oci/spec_opts_nonlinux.go
@@ -29,21 +29,21 @@ import (
 // WithAllCurrentCapabilities propagates the effective capabilities of the caller process to the container process.
 // The capability set may differ from WithAllKnownCapabilities when running in a container.
 //
-//nolint:deadcode,unused
+//nolint:unused
 var WithAllCurrentCapabilities = func(ctx context.Context, client Client, c *containers.Container, s *Spec) error {
 	return WithCapabilities(nil)(ctx, client, c, s)
 }
 
 // WithAllKnownCapabilities sets all the known linux capabilities for the container process
 //
-//nolint:deadcode,unused
+//nolint:unused
 var WithAllKnownCapabilities = func(ctx context.Context, client Client, c *containers.Container, s *Spec) error {
 	return WithCapabilities(nil)(ctx, client, c, s)
 }
 
 // WithCPUShares sets the container's cpu shares
 //
-//nolint:deadcode,unused
+//nolint:unused
 func WithCPUShares(shares uint64) SpecOpts {
 	return func(ctx context.Context, _ Client, c *containers.Container, s *Spec) error {
 		return nil
diff --git a/oci/utils_unix.go b/oci/utils_unix.go
@@ -127,7 +127,7 @@ func getDevices(path, containerPath string) ([]specs.LinuxDevice, error) {
 
 // TODO consider adding these consts to the OCI runtime-spec.
 const (
-	wildcardDevice = "a" //nolint // currently unused, but should be included when upstreaming to OCI runtime-spec.
+	wildcardDevice = "a" //nolint:deadcode,unused,varcheck // currently unused, but should be included when upstreaming to OCI runtime-spec.
 	blockDevice    = "b"
 	charDevice     = "c" // or "u"
 	fifoDevice     = "p"
@@ -148,7 +148,7 @@ func DeviceFromPath(path string) (*specs.LinuxDevice, error) {
 	}
 
 	var (
-		devNumber = uint64(stat.Rdev) //nolint: unconvert // the type is 32bit on mips.
+		devNumber = uint64(stat.Rdev) //nolint:unconvert // the type is 32bit on mips.
 		major     = unix.Major(devNumber)
 		minor     = unix.Minor(devNumber)
 	)
diff --git a/pkg/cri/opts/container.go b/pkg/cri/opts/container.go
@@ -83,7 +83,7 @@ func WithVolumes(volumeMounts map[string]string) containerd.NewContainerOpts {
 		// if it fails but not RM snapshot data.
 		// refer to https://github.com/containerd/containerd/pull/1868
 		// https://github.com/containerd/containerd/pull/1785
-		defer os.Remove(root) //nolint:errcheck
+		defer os.Remove(root)
 
 		unmounter := func(mountPath string) {
 			if uerr := mount.Unmount(mountPath, 0); uerr != nil {
diff --git a/pkg/cri/server/service.go b/pkg/cri/server/service.go
@@ -113,7 +113,7 @@ type criService struct {
 	baseOCISpecs map[string]*oci.Spec
 	// allCaps is the list of the capabilities.
 	// When nil, parsed from CapEff of /proc/self/status.
-	allCaps []string // nolint
+	allCaps []string //nolint:unused // Ignore on non-Linux
 	// unpackDuplicationSuppressor is used to make sure that there is only
 	// one in-flight fetch request or unpack handler for a given descriptor's
 	// or chain ID.
diff --git a/pkg/cri/store/container/container.go b/pkg/cri/store/container/container.go
@@ -205,6 +205,6 @@ func (s *Store) Delete(id string) {
 		c.IO.Close()
 	}
 	s.labels.Release(c.ProcessLabel)
-	s.idIndex.Delete(id) //nolint:errcheck
+	s.idIndex.Delete(id)
 	delete(s.containers, id)
 }
diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go
@@ -250,6 +250,6 @@ func (s *store) delete(id, ref string) {
 		return
 	}
 	// Remove the image if it is not referenced any more.
-	s.digestSet.Remove(digest) //nolint:errcheck
+	s.digestSet.Remove(digest)
 	delete(s.images, digest.String())
 }
diff --git a/pkg/cri/store/sandbox/sandbox.go b/pkg/cri/store/sandbox/sandbox.go
@@ -156,6 +156,6 @@ func (s *Store) Delete(id string) {
 		return
 	}
 	s.labels.Release(s.sandboxes[id].ProcessLabel)
-	s.idIndex.Delete(id) //nolint:errcheck
+	s.idIndex.Delete(id)
 	delete(s.sandboxes, id)
 }
diff --git a/pkg/netns/netns_linux.go b/pkg/netns/netns_linux.go
@@ -77,7 +77,7 @@ func newNS(baseDir string) (nsPath string, err error) {
 	defer func() {
 		// Ensure the mount point is cleaned up on errors
 		if err != nil {
-			os.RemoveAll(nsPath) //nolint:errcheck
+			os.RemoveAll(nsPath)
 		}
 	}()
 
@@ -107,7 +107,7 @@ func newNS(baseDir string) (nsPath string, err error) {
 		}
 
 		// Put this thread back to the orig ns, since it might get reused (pre go1.10)
-		defer origNS.Set() //nolint:errcheck
+		defer origNS.Set()
 
 		// bind mount the netns from the current thread (from /proc) onto the
 		// mount point. This causes the namespace to persist, even when there
@@ -214,6 +214,6 @@ func (n *NetNS) Do(f func(cnins.NetNS) error) error {
 	if err != nil {
 		return fmt.Errorf("get netns fd: %w", err)
 	}
-	defer ns.Close() //nolint:errcheck
+	defer ns.Close()
 	return ns.Do(f)
 }
diff --git a/pkg/progress/escape.go b/pkg/progress/escape.go
@@ -19,6 +19,6 @@ package progress
 const (
 	escape = "\x1b"
 	reset  = escape + "[0m"
-	red    = escape + "[31m" //nolint:deadcode, varcheck, unused
+	red    = escape + "[31m" //nolint:deadcode,unused,varcheck
 	green  = escape + "[32m"
 )
diff --git a/pkg/runtimeoptions/v1/doc.go b/pkg/runtimeoptions/v1/doc.go
@@ -14,4 +14,4 @@
    limitations under the License.
 */
 
-package runtimeoptions_v1 //nolint
+package runtimeoptions_v1 //nolint:revive // Ignore var-naming: don't use an underscore in package name (revive)

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,7 @@ func setHeaderForSpecialDevice(hdr *tar.Header, name string, fi os.FileInfo) err`
`62`	`62`	`return errors.New("unsupported stat type")`
`63`	`63`	`}`
`64`	`64`
`65`		`- // Rdev is int32 on darwin/bsd, int64 on linux/solaris`
`66`		`- rdev := uint64(s.Rdev) //nolint:unconvert`
	`65`	`+ rdev := uint64(s.Rdev) //nolint:unconvert // rdev is int32 on darwin/bsd, int64 on linux/solaris`
`67`	`66`
`68`	`67`	`// Currently go does not fill in the major/minors`
`69`	`68`	`if s.Mode&syscall.S_IFBLK != 0 \|\|`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ func setLinux(s *Spec) {`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`-// nolint`
`80`	`79`	`func setResources(s *Spec) {`
`81`	`80`	`if s.Linux != nil {`
`82`	`81`	`if s.Linux.Resources == nil {`
`@@ -90,7 +89,7 @@ func setResources(s *Spec) {`
`90`	`89`	`}`
`91`	`90`	`}`
`92`	`91`
`93`		`-// nolint`
	`92`	`+//nolint:unused // not used on all platforms`
`94`	`93`	`func setCPU(s *Spec) {`
`95`	`94`	`setResources(s)`
`96`	`95`	`if s.Linux != nil {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`"golang.org/x/sys/unix"`
`32`	`32`	`)`
`33`	`33`
`34`		`-// nolint:gosec`
	`34`	`+//nolint:gosec`
`35`	`35`	`func TestWithUserID(t *testing.T) {`
`36`	`36`	`t.Parallel()`
`37`	`37`
`@@ -87,7 +87,7 @@ guest:x:405:100:guest:/dev/null:/sbin/nologin`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`-// nolint:gosec`
	`90`	`+//nolint:gosec`
`91`	`91`	`func TestWithUsername(t *testing.T) {`
`92`	`92`	`t.Parallel()`
`93`	`93`
`@@ -150,7 +150,7 @@ guest:x:405:100:guest:/dev/null:/sbin/nologin`
`150`	`150`
`151`	`151`	`}`
`152`	`152`
`153`		`-// nolint:gosec`
	`153`	`+//nolint:gosec`
`154`	`154`	`func TestWithAdditionalGIDs(t *testing.T) {`
`155`	`155`	`t.Parallel()`
`156`	`156`	expectedPasswd := `root:x:0:0:root:/root:/bin/ash
Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,6 @@ func (s *Store) Delete(id string) {`
`205`	`205`	`c.IO.Close()`
`206`	`206`	`}`
`207`	`207`	`s.labels.Release(c.ProcessLabel)`
`208`		`- s.idIndex.Delete(id) //nolint:errcheck`
	`208`	`+ s.idIndex.Delete(id)`
`209`	`209`	`delete(s.containers, id)`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,6 @@ func (s *store) delete(id, ref string) {`
`250`	`250`	`return`
`251`	`251`	`}`
`252`	`252`	`// Remove the image if it is not referenced any more.`
`253`		`- s.digestSet.Remove(digest) //nolint:errcheck`
	`253`	`+ s.digestSet.Remove(digest)`
`254`	`254`	`delete(s.images, digest.String())`
`255`	`255`	`}`