remove unneeded nolint-comments (nolintlint), disable deprecated linters

thaJeztah · thaJeztah · commit e6179af1ea99 · 2023-03-08T00:20:57.000+01:00
Remove nolint-comments that weren't hit by linters, and remove the "structcheck" and "varcheck" linters, as they have been deprecated: WARN [runner] The linter 'structcheck' is deprecated (since v1.49.0) due to: The owner seems to have abandoned the linter. Replaced by unused. WARN [runner] The linter 'varcheck' is deprecated (since v1.49.0) due to: The owner seems to have abandoned the linter. Replaced by unused. WARN [linters context] structcheck is disabled because of generics. You can track the evolution of the generics support by following the golangci/golangci-lint#2649. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit f9c80be) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/.golangci.yml b/.golangci.yml
@@ -6,13 +6,12 @@ linters:
     - gosec
     - ineffassign
     - misspell
+    - nolintlint
     - revive
     - staticcheck
-    - structcheck
     - tenv # Detects using os.Setenv instead of t.Setenv since Go 1.17
     - unconvert
     - unused
-    - varcheck
     - vet
   disable:
     - errcheck
diff --git a/archive/tar_unix.go b/archive/tar_unix.go
@@ -62,7 +62,7 @@ func setHeaderForSpecialDevice(hdr *tar.Header, name string, fi os.FileInfo) err
 		return errors.New("unsupported stat type")
 	}
 
-	rdev := uint64(s.Rdev) //nolint:unconvert // rdev is int32 on darwin/bsd, int64 on linux/solaris
+	rdev := uint64(s.Rdev) //nolint:nolintlint,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/main_test.go b/integration/main_test.go
@@ -210,7 +210,7 @@ func PodSandboxConfigWithCleanup(t *testing.T, name, ns string, opts ...PodSandb
 }
 
 // Set Windows HostProcess on the pod.
-func WithWindowsHostProcessPod(p *runtime.PodSandboxConfig) { //nolint:unused
+func WithWindowsHostProcessPod(p *runtime.PodSandboxConfig) {
 	if p.Windows == nil {
 		p.Windows = &runtime.WindowsPodSandboxConfig{}
 	}
@@ -237,7 +237,7 @@ func WithTestAnnotations() ContainerOpts {
 }
 
 // Add container resource limits.
-func WithResources(r *runtime.LinuxContainerResources) ContainerOpts { //nolint:unused
+func WithResources(r *runtime.LinuxContainerResources) ContainerOpts {
 	return func(c *runtime.ContainerConfig) {
 		if c.Linux == nil {
 			c.Linux = &runtime.LinuxContainerConfig{}
@@ -255,7 +255,7 @@ func WithVolumeMount(hostPath, containerPath string) ContainerOpts {
 	}
 }
 
-func WithWindowsUsername(username string) ContainerOpts { //nolint:unused
+func WithWindowsUsername(username string) ContainerOpts {
 	return func(c *runtime.ContainerConfig) {
 		if c.Windows == nil {
 			c.Windows = &runtime.WindowsContainerConfig{}
@@ -267,7 +267,7 @@ func WithWindowsUsername(username string) ContainerOpts { //nolint:unused
 	}
 }
 
-func WithWindowsHostProcessContainer() ContainerOpts { //nolint:unused
+func WithWindowsHostProcessContainer() ContainerOpts {
 	return func(c *runtime.ContainerConfig) {
 		if c.Windows == nil {
 			c.Windows = &runtime.WindowsContainerConfig{}
@@ -351,7 +351,7 @@ func WithRunAsGroup(gid int64) ContainerOpts {
 }
 
 // WithSupplementalGroups adds supplemental groups.
-func WithSupplementalGroups(gids []int64) ContainerOpts { //nolint:unused
+func WithSupplementalGroups(gids []int64) ContainerOpts {
 	return func(c *runtime.ContainerConfig) {
 		if c.Linux == nil {
 			c.Linux = &runtime.LinuxContainerConfig{}
@@ -574,7 +574,7 @@ func CRIConfig() (*criconfig.Config, error) {
 }
 
 // SandboxInfo gets sandbox info.
-func SandboxInfo(id string) (*runtime.PodSandboxStatus, *server.SandboxInfo, error) { //nolint:unused
+func SandboxInfo(id string) (*runtime.PodSandboxStatus, *server.SandboxInfo, error) {
 	client, err := RawRuntimeClient()
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to get raw runtime client: %w", err)
diff --git a/oci/spec_opts.go b/oci/spec_opts.go
@@ -89,7 +89,7 @@ func setResources(s *Spec) {
 	}
 }
 
-//nolint:unused // not used on all platforms
+//nolint:nolintlint,unused // not used on all platforms
 func setCPU(s *Spec) {
 	setResources(s)
 	if s.Linux != nil {
diff --git a/oci/spec_opts_nonlinux.go b/oci/spec_opts_nonlinux.go
@@ -28,22 +28,16 @@ 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: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: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: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:deadcode,unused,varcheck // currently unused, but should be included when upstreaming to OCI runtime-spec.
+	wildcardDevice = "a" //nolint:deadcode,nolintlint,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:nolintlint,unconvert // the type is 32bit on mips.
 		major     = unix.Major(devNumber)
 		minor     = unix.Minor(devNumber)
 	)
diff --git a/pkg/cri/server/container_stats.go b/pkg/cri/server/container_stats.go
@@ -41,7 +41,7 @@ func (c *criService) ContainerStats(ctx context.Context, in *runtime.ContainerSt
 	}
 
 	cs, err := c.containerMetrics(cntr.Metadata, resp.Metrics[0])
-	if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (stats unimplemented)
+	if err != nil {
 		return nil, fmt.Errorf("failed to decode container metrics: %w", err)
 	}
 	return &runtime.ContainerStatsResponse{Stats: cs}, nil
diff --git a/pkg/cri/server/container_stats_list.go b/pkg/cri/server/container_stats_list.go
@@ -58,7 +58,7 @@ func (c *criService) toCRIContainerStats(
 	containerStats := new(runtime.ListContainerStatsResponse)
 	for _, cntr := range containers {
 		cs, err := c.containerMetrics(cntr.Metadata, statsMap[cntr.ID])
-		if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (metrics unimplemented)
+		if err != nil {
 			return nil, fmt.Errorf("failed to decode container metrics for %q: %w", cntr.ID, err)
 		}
 		containerStats.Stats = append(containerStats.Stats, cs)
diff --git a/pkg/cri/server/sandbox_stats.go b/pkg/cri/server/sandbox_stats.go
@@ -34,12 +34,12 @@ func (c *criService) PodSandboxStats(
 	}
 
 	metrics, err := metricsForSandbox(sandbox)
-	if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics)
+	if err != nil {
 		return nil, fmt.Errorf("failed getting metrics for sandbox %s: %w", r.GetPodSandboxId(), err)
 	}
 
 	podSandboxStats, err := c.podSandboxStats(ctx, sandbox, metrics)
-	if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics)
+	if err != nil {
 		return nil, fmt.Errorf("failed to decode pod sandbox metrics %s: %w", r.GetPodSandboxId(), err)
 	}
 
diff --git a/pkg/cri/server/sandbox_stats_list.go b/pkg/cri/server/sandbox_stats_list.go
@@ -34,12 +34,12 @@ func (c *criService) ListPodSandboxStats(
 	podSandboxStats := new(runtime.ListPodSandboxStatsResponse)
 	for _, sandbox := range sandboxes {
 		metrics, err := metricsForSandbox(sandbox)
-		if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics)
+		if err != nil {
 			return nil, fmt.Errorf("failed to obtain metrics for sandbox %q: %w", sandbox.ID, err)
 		}
 
 		sandboxStats, err := c.podSandboxStats(ctx, sandbox, metrics)
-		if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics)
+		if err != nil {
 			return nil, fmt.Errorf("failed to decode sandbox container metrics for sandbox %q: %w", sandbox.ID, err)
 		}
 		podSandboxStats.Stats = append(podSandboxStats.Stats, sandboxStats)
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:unused // Ignore on non-Linux
+	allCaps []string //nolint:nolintlint,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/metadata.go b/pkg/cri/store/container/metadata.go
@@ -28,10 +28,9 @@ import (
 // 2) Metadata is checkpointed as containerd container label.
 
 // metadataVersion is current version of container metadata.
-const metadataVersion = "v1" // nolint
+const metadataVersion = "v1"
 
 // versionedMetadata is the internal versioned container metadata.
-// nolint
 type versionedMetadata struct {
 	// Version indicates the version of the versioned container metadata.
 	Version string
diff --git a/pkg/cri/store/container/status.go b/pkg/cri/store/container/status.go
@@ -61,10 +61,9 @@ import (
 //                      DELETED
 
 // statusVersion is current version of container status.
-const statusVersion = "v1" // nolint
+const statusVersion = "v1"
 
 // versionedStatus is the internal used versioned container status.
-// nolint
 type versionedStatus struct {
 	// Version indicates the version of the versioned container status.
 	Version string
diff --git a/pkg/cri/store/sandbox/metadata.go b/pkg/cri/store/sandbox/metadata.go
@@ -29,10 +29,9 @@ import (
 // 2) Metadata is checkpointed as containerd container label.
 
 // metadataVersion is current version of sandbox metadata.
-const metadataVersion = "v1" // nolint
+const metadataVersion = "v1"
 
 // versionedMetadata is the internal versioned sandbox metadata.
-// nolint
 type versionedMetadata struct {
 	// Version indicates the version of the versioned sandbox metadata.
 	Version string
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,unused,varcheck
+	red    = escape + "[31m" //nolint:deadcode,nolintlint,unused,varcheck
 	green  = escape + "[32m"
 )

Original file line number	Diff line number	Diff line change
`@@ -62,7 +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 := uint64(s.Rdev) //nolint:unconvert // rdev is int32 on darwin/bsd, int64 on linux/solaris`
	`65`	`+ rdev := uint64(s.Rdev) //nolint:nolintlint,unconvert // rdev is int32 on darwin/bsd, int64 on linux/solaris`
`66`	`66`
`67`	`67`	`// Currently go does not fill in the major/minors`
`68`	`68`	`if s.Mode&syscall.S_IFBLK != 0 \|\|`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ func PodSandboxConfigWithCleanup(t *testing.T, name, ns string, opts ...PodSandb`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`// Set Windows HostProcess on the pod.`
`213`		`-func WithWindowsHostProcessPod(p *runtime.PodSandboxConfig) { //nolint:unused`
	`213`	`+func WithWindowsHostProcessPod(p *runtime.PodSandboxConfig) {`
`214`	`214`	`if p.Windows == nil {`
`215`	`215`	`p.Windows = &runtime.WindowsPodSandboxConfig{}`
`216`	`216`	`}`
`@@ -237,7 +237,7 @@ func WithTestAnnotations() ContainerOpts {`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`// Add container resource limits.`
`240`		`-func WithResources(r *runtime.LinuxContainerResources) ContainerOpts { //nolint:unused`
	`240`	`+func WithResources(r *runtime.LinuxContainerResources) ContainerOpts {`
`241`	`241`	`return func(c *runtime.ContainerConfig) {`
`242`	`242`	`if c.Linux == nil {`
`243`	`243`	`c.Linux = &runtime.LinuxContainerConfig{}`
`@@ -255,7 +255,7 @@ func WithVolumeMount(hostPath, containerPath string) ContainerOpts {`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`
`258`		`-func WithWindowsUsername(username string) ContainerOpts { //nolint:unused`
	`258`	`+func WithWindowsUsername(username string) ContainerOpts {`
`259`	`259`	`return func(c *runtime.ContainerConfig) {`
`260`	`260`	`if c.Windows == nil {`
`261`	`261`	`c.Windows = &runtime.WindowsContainerConfig{}`
`@@ -267,7 +267,7 @@ func WithWindowsUsername(username string) ContainerOpts { //nolint:unused`
`267`	`267`	`}`
`268`	`268`	`}`
`269`	`269`
`270`		`-func WithWindowsHostProcessContainer() ContainerOpts { //nolint:unused`
	`270`	`+func WithWindowsHostProcessContainer() ContainerOpts {`
`271`	`271`	`return func(c *runtime.ContainerConfig) {`
`272`	`272`	`if c.Windows == nil {`
`273`	`273`	`c.Windows = &runtime.WindowsContainerConfig{}`
`@@ -351,7 +351,7 @@ func WithRunAsGroup(gid int64) ContainerOpts {`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`// WithSupplementalGroups adds supplemental groups.`
`354`		`-func WithSupplementalGroups(gids []int64) ContainerOpts { //nolint:unused`
	`354`	`+func WithSupplementalGroups(gids []int64) ContainerOpts {`
`355`	`355`	`return func(c *runtime.ContainerConfig) {`
`356`	`356`	`if c.Linux == nil {`
`357`	`357`	`c.Linux = &runtime.LinuxContainerConfig{}`
`@@ -574,7 +574,7 @@ func CRIConfig() (*criconfig.Config, error) {`
`574`	`574`	`}`
`575`	`575`
`576`	`576`	`// SandboxInfo gets sandbox info.`
`577`		`-func SandboxInfo(id string) (runtime.PodSandboxStatus, server.SandboxInfo, error) { //nolint:unused`
	`577`	`+func SandboxInfo(id string) (runtime.PodSandboxStatus, server.SandboxInfo, error) {`
`578`	`578`	`client, err := RawRuntimeClient()`
`579`	`579`	`if err != nil {`
`580`	`580`	`return nil, nil, fmt.Errorf("failed to get raw runtime client: %w", err)`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func setResources(s *Spec) {`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`92`		`-//nolint:unused // not used on all platforms`
	`92`	`+//nolint:nolintlint,unused // not used on all platforms`
`93`	`93`	`func setCPU(s *Spec) {`
`94`	`94`	`setResources(s)`
`95`	`95`	`if s.Linux != nil {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func (c criService) ContainerStats(ctx context.Context, in runtime.ContainerSt`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`cs, err := c.containerMetrics(cntr.Metadata, resp.Metrics[0])`
`44`		`- if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (stats unimplemented)`
	`44`	`+ if err != nil {`
`45`	`45`	`return nil, fmt.Errorf("failed to decode container metrics: %w", err)`
`46`	`46`	`}`
`47`	`47`	`return &runtime.ContainerStatsResponse{Stats: cs}, nil`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func (c *criService) toCRIContainerStats(`
`58`	`58`	`containerStats := new(runtime.ListContainerStatsResponse)`
`59`	`59`	`for _, cntr := range containers {`
`60`	`60`	`cs, err := c.containerMetrics(cntr.Metadata, statsMap[cntr.ID])`
`61`		`- if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (metrics unimplemented)`
	`61`	`+ if err != nil {`
`62`	`62`	`return nil, fmt.Errorf("failed to decode container metrics for %q: %w", cntr.ID, err)`
`63`	`63`	`}`
`64`	`64`	`containerStats.Stats = append(containerStats.Stats, cs)`
Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,12 @@ func (c *criService) PodSandboxStats(`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`metrics, err := metricsForSandbox(sandbox)`
`37`		`- if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics)`
	`37`	`+ if err != nil {`
`38`	`38`	`return nil, fmt.Errorf("failed getting metrics for sandbox %s: %w", r.GetPodSandboxId(), err)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`podSandboxStats, err := c.podSandboxStats(ctx, sandbox, metrics)`
`42`		`- if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics)`
	`42`	`+ if err != nil {`
`43`	`43`	`return nil, fmt.Errorf("failed to decode pod sandbox metrics %s: %w", r.GetPodSandboxId(), err)`
`44`	`44`	`}`
`45`	`45`