Fix lint failures

AkihiroSuda · AkihiroSuda · commit 2c9f5778f04d · 2025-07-15T18:39:38.000+09:00
```
oci/spec_opts.go:581: File is not `gofmt`-ed with `-s` (gofmt)
                // and the OCI Runtime Spec has no definition about the max UID,
                // the runc implementation is known to require the UID to be &lt;= MaxInt32.
                //
                // containerd follows runc's limitation here.
                //
                // In future we may relax this limitation to allow MaxUint32 - 2,
                // or, amend the OCI Runtime Spec to codify the implementation limitation.
Error: pkg/cri/streaming/internal/wsstream/conn.go:72:1: Duplicate words (be) found (dupword)
// be valid) and data written by the server to the client is base64 encoded.
^
Error: services/introspection/local.go:98:59: printf: non-constant format string in call to github.com/containerd/errdefs.ToGRPCf (govet)
		return nil, errdefs.ToGRPCf(errdefs.ErrInvalidArgument, err.Error())
		                                                        ^
Error: services/content/contentserver/contentserver.go:134:52: printf: non-constant format string in call to google.golang.org/grpc/status.Errorf (govet)
		return nil, status.Errorf(codes.InvalidArgument, err.Error())
		                                                 ^
Error: filters/parser.go:211:27: printf: non-constant format string in call to (*github.com/containerd/containerd/filters.parser).mkerr (govet)
		return "", p.mkerr(pos, p.scanner.err)
		                        ^
Error: filters/parser.go:232:26: printf: non-constant format string in call to (*github.com/containerd/containerd/filters.parser).mkerr (govet)
		return 0, p.mkerr(pos, p.scanner.err)
		                       ^
Error: filters/parser.go:247:27: printf: non-constant format string in call to (*github.com/containerd/containerd/filters.parser).mkerr (govet)
		return "", p.mkerr(pos, p.scanner.err)
		                        ^
Error: remotes/docker/fetcher_test.go:149:31: printf: non-constant format string in call to fmt.Errorf (govet)
			mockedErr:      fmt.Errorf(http.StatusText(http.StatusRequestTimeout)),
			                           ^
Error: remotes/docker/fetcher_test.go:157:31: printf: non-constant format string in call to fmt.Errorf (govet)
			mockedErr:      fmt.Errorf(http.StatusText(http.StatusTooManyRequests)),
			                           ^
Error: cio/io_test.go:46:5: SA4032: due to the file's build constraints, runtime.GOOS will never equal "windows" (staticcheck)
	if runtime.GOOS == "windows" {
	   ^
Error: cio/io_test.go:79:5: SA4032: due to the file's build constraints, runtime.GOOS will never equal "windows" (staticcheck)
	if runtime.GOOS == "windows" {
	   ^
Error: archive/tar.go:335:2: directive `//nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA` is unused for linter "staticcheck" (nolintlint)
	//nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA
	^
Error: images/archive/importer.go:97:3: directive `//nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA` is unused for linter "staticcheck" (nolintlint)
		//nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA
		^
Error: pkg/cri/server/image_pull.go:335:38: directive `//nolint:staticcheck` is unused for linter "staticcheck" (nolintlint)
		tlsConfig.BuildNameToCertificate() //nolint:staticcheck
```

Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
diff --git a/archive/tar.go b/archive/tar.go
@@ -332,7 +332,6 @@ func createTarFile(ctx context.Context, path, extractDir string, hdr *tar.Header
 			}
 		}
 
-	//nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA
 	case tar.TypeReg, tar.TypeRegA:
 		file, err := openFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, hdrInfo.Mode())
 		if err != nil {
diff --git a/cio/io_test.go b/cio/io_test.go
@@ -26,7 +26,6 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"syscall"
 	"testing"
@@ -43,10 +42,6 @@ func assertHasPrefix(t *testing.T, s, prefix string) {
 }
 
 func TestNewFIFOSetInDir(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("NewFIFOSetInDir has different behaviour on windows")
-	}
-
 	root := t.TempDir()
 
 	fifos, err := NewFIFOSetInDir(root, "theid", true)
@@ -76,9 +71,6 @@ func TestNewFIFOSetInDir(t *testing.T) {
 }
 
 func TestNewAttach(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("setupFIFOProducers not yet implemented on windows")
-	}
 	var (
 		expectedStdin  = "this is the stdin"
 		expectedStdout = "this is the stdout"
diff --git a/filters/parser.go b/filters/parser.go
@@ -208,7 +208,7 @@ func (p *parser) field() (string, error) {
 	case tokenQuoted:
 		return p.unquote(pos, s, false)
 	case tokenIllegal:
-		return "", p.mkerr(pos, p.scanner.err)
+		return "", p.mkerr(pos, "%s", p.scanner.err)
 	}
 
 	return "", p.mkerr(pos, "expected field or quoted")
@@ -229,7 +229,7 @@ func (p *parser) operator() (operator, error) {
 			return 0, p.mkerr(pos, "unsupported operator %q", s)
 		}
 	case tokenIllegal:
-		return 0, p.mkerr(pos, p.scanner.err)
+		return 0, p.mkerr(pos, "%s", p.scanner.err)
 	}
 
 	return 0, p.mkerr(pos, `expected an operator ("=="|"!="|"~=")`)
@@ -244,7 +244,7 @@ func (p *parser) value(allowAltQuotes bool) (string, error) {
 	case tokenQuoted:
 		return p.unquote(pos, s, allowAltQuotes)
 	case tokenIllegal:
-		return "", p.mkerr(pos, p.scanner.err)
+		return "", p.mkerr(pos, "%s", p.scanner.err)
 	}
 
 	return "", p.mkerr(pos, "expected value or quoted")
diff --git a/images/archive/importer.go b/images/archive/importer.go
@@ -94,7 +94,6 @@ func ImportIndex(ctx context.Context, store content.Store, reader io.Reader, opt
 			symlinks[hdr.Name] = path.Join(path.Dir(hdr.Name), hdr.Linkname)
 		}
 
-		//nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA
 		if hdr.Typeflag != tar.TypeReg && hdr.Typeflag != tar.TypeRegA {
 			if hdr.Typeflag != tar.TypeDir {
 				log.G(ctx).WithField("file", hdr.Name).Debug("file type ignored")
diff --git a/oci/spec_opts.go b/oci/spec_opts.go
@@ -578,13 +578,13 @@ func WithUser(userstr string) SpecOpts {
 		setProcess(s)
 		s.Process.User.AdditionalGids = nil
 		// While the Linux kernel allows the max UID to be MaxUint32 - 2,
-                // and the OCI Runtime Spec has no definition about the max UID,
-                // the runc implementation is known to require the UID to be <= MaxInt32.
-                //
-                // containerd follows runc's limitation here.
-                //
-                // In future we may relax this limitation to allow MaxUint32 - 2,
-                // or, amend the OCI Runtime Spec to codify the implementation limitation.
+		// and the OCI Runtime Spec has no definition about the max UID,
+		// the runc implementation is known to require the UID to be <= MaxInt32.
+		//
+		// containerd follows runc's limitation here.
+		//
+		// In future we may relax this limitation to allow MaxUint32 - 2,
+		// or, amend the OCI Runtime Spec to codify the implementation limitation.
 		const (
 			minUserID  = 0
 			maxUserID  = math.MaxInt32
diff --git a/pkg/cri/server/image_pull.go b/pkg/cri/server/image_pull.go
@@ -332,7 +332,7 @@ func (c *criService) getTLSConfig(registryTLSConfig criconfig.TLSConfig) (*tls.C
 			tlsConfig.Certificates = []tls.Certificate{cert}
 		}
 		// TODO(thaJeztah): verify if we should ignore the deprecation; see https://github.com/containerd/containerd/pull/7349/files#r990644833
-		tlsConfig.BuildNameToCertificate() //nolint:staticcheck
+		tlsConfig.BuildNameToCertificate()
 	}
 
 	if registryTLSConfig.CAFile != "" {
diff --git a/pkg/cri/streaming/internal/wsstream/conn.go b/pkg/cri/streaming/internal/wsstream/conn.go
@@ -69,7 +69,7 @@ const ChannelWebSocketProtocol = "channel.k8s.io"
 // should prefix their messages with this channel char. When used for remote execution, the channel
 // numbers are by convention defined to match the POSIX file-descriptors assigned to STDIN, STDOUT,
 // and STDERR ('0', '1', and '2'). The data received on the server is base64 decoded (and must be
-// be valid) and data written by the server to the client is base64 encoded.
+// valid) and data written by the server to the client is base64 encoded.
 //
 // Example client session:
 //
diff --git a/remotes/docker/fetcher_test.go b/remotes/docker/fetcher_test.go
@@ -19,6 +19,7 @@ package docker
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"math/rand"
@@ -146,15 +147,15 @@ func TestDockerFetcherOpen(t *testing.T) {
 		}, {
 			name:           "should return StatusRequestTimeout after 5 retries",
 			mockedStatus:   http.StatusRequestTimeout,
-			mockedErr:      fmt.Errorf(http.StatusText(http.StatusRequestTimeout)),
+			mockedErr:      errors.New(http.StatusText(http.StatusRequestTimeout)),
 			want:           nil,
 			wantErr:        true,
 			wantPlainError: true,
 			retries:        5,
 		}, {
 			name:           "should return StatusTooManyRequests after 5 retries",
 			mockedStatus:   http.StatusTooManyRequests,
-			mockedErr:      fmt.Errorf(http.StatusText(http.StatusTooManyRequests)),
+			mockedErr:      errors.New(http.StatusText(http.StatusTooManyRequests)),
 			want:           nil,
 			wantErr:        true,
 			wantPlainError: true,
diff --git a/services/content/contentserver/contentserver.go b/services/content/contentserver/contentserver.go
@@ -131,7 +131,7 @@ func (s *service) List(req *api.ListContentRequest, session api.Content_ListServ
 func (s *service) Delete(ctx context.Context, req *api.DeleteContentRequest) (*ptypes.Empty, error) {
 	log.G(ctx).WithField("digest", req.Digest).Debugf("delete content")
 	if err := req.Digest.Validate(); err != nil {
-		return nil, status.Errorf(codes.InvalidArgument, err.Error())
+		return nil, status.Errorf(codes.InvalidArgument, "%s", err.Error())
 	}
 
 	if err := s.store.Delete(ctx, req.Digest); err != nil {
diff --git a/services/introspection/local.go b/services/introspection/local.go
@@ -95,7 +95,7 @@ func (l *Local) UpdateLocal(root string) {
 func (l *Local) Plugins(ctx context.Context, req *api.PluginsRequest, _ ...grpc.CallOption) (*api.PluginsResponse, error) {
 	filter, err := filters.ParseAll(req.Filters...)
 	if err != nil {
-		return nil, errdefs.ToGRPCf(errdefs.ErrInvalidArgument, err.Error())
+		return nil, errdefs.ToGRPCf(errdefs.ErrInvalidArgument, "%s", err.Error())
 	}
 
 	var plugins []api.Plugin

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,6 @@ func createTarFile(ctx context.Context, path, extractDir string, hdr *tar.Header`
`332`	`332`	`}`
`333`	`333`	`}`
`334`	`334`
`335`		`- //nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA`
`336`	`335`	`case tar.TypeReg, tar.TypeRegA:`
`337`	`336`	`file, err := openFile(path, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, hdrInfo.Mode())`
`338`	`337`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ func (p *parser) field() (string, error) {`
`208`	`208`	`case tokenQuoted:`
`209`	`209`	`return p.unquote(pos, s, false)`
`210`	`210`	`case tokenIllegal:`
`211`		`- return "", p.mkerr(pos, p.scanner.err)`
	`211`	`+ return "", p.mkerr(pos, "%s", p.scanner.err)`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`return "", p.mkerr(pos, "expected field or quoted")`
`@@ -229,7 +229,7 @@ func (p *parser) operator() (operator, error) {`
`229`	`229`	`return 0, p.mkerr(pos, "unsupported operator %q", s)`
`230`	`230`	`}`
`231`	`231`	`case tokenIllegal:`
`232`		`- return 0, p.mkerr(pos, p.scanner.err)`
	`232`	`+ return 0, p.mkerr(pos, "%s", p.scanner.err)`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	return 0, p.mkerr(pos, `expected an operator ("=="\|"!="\|"~=")`)
`@@ -244,7 +244,7 @@ func (p *parser) value(allowAltQuotes bool) (string, error) {`
`244`	`244`	`case tokenQuoted:`
`245`	`245`	`return p.unquote(pos, s, allowAltQuotes)`
`246`	`246`	`case tokenIllegal:`
`247`		`- return "", p.mkerr(pos, p.scanner.err)`
	`247`	`+ return "", p.mkerr(pos, "%s", p.scanner.err)`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`return "", p.mkerr(pos, "expected value or quoted")`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ func ImportIndex(ctx context.Context, store content.Store, reader io.Reader, opt`
`94`	`94`	`symlinks[hdr.Name] = path.Join(path.Dir(hdr.Name), hdr.Linkname)`
`95`	`95`	`}`
`96`	`96`
`97`		`- //nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA`
`98`	`97`	`if hdr.Typeflag != tar.TypeReg && hdr.Typeflag != tar.TypeRegA {`
`99`	`98`	`if hdr.Typeflag != tar.TypeDir {`
`100`	`99`	`log.G(ctx).WithField("file", hdr.Name).Debug("file type ignored")`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ func (c criService) getTLSConfig(registryTLSConfig criconfig.TLSConfig) (tls.C`
`332`	`332`	`tlsConfig.Certificates = []tls.Certificate{cert}`
`333`	`333`	`}`
`334`	`334`	`// TODO(thaJeztah): verify if we should ignore the deprecation; see https://github.com/containerd/containerd/pull/7349/files#r990644833`
`335`		`- tlsConfig.BuildNameToCertificate() //nolint:staticcheck`
	`335`	`+ tlsConfig.BuildNameToCertificate()`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`if registryTLSConfig.CAFile != "" {`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func (s service) List(req api.ListContentRequest, session api.Content_ListServ`
`131`	`131`	`func (s service) Delete(ctx context.Context, req api.DeleteContentRequest) (*ptypes.Empty, error) {`
`132`	`132`	`log.G(ctx).WithField("digest", req.Digest).Debugf("delete content")`
`133`	`133`	`if err := req.Digest.Validate(); err != nil {`
`134`		`- return nil, status.Errorf(codes.InvalidArgument, err.Error())`
	`134`	`+ return nil, status.Errorf(codes.InvalidArgument, "%s", err.Error())`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`if err := s.store.Delete(ctx, req.Digest); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func (l *Local) UpdateLocal(root string) {`
`95`	`95`	`func (l Local) Plugins(ctx context.Context, req api.PluginsRequest, _ ...grpc.CallOption) (*api.PluginsResponse, error) {`
`96`	`96`	`filter, err := filters.ParseAll(req.Filters...)`
`97`	`97`	`if err != nil {`
`98`		`- return nil, errdefs.ToGRPCf(errdefs.ErrInvalidArgument, err.Error())`
	`98`	`+ return nil, errdefs.ToGRPCf(errdefs.ErrInvalidArgument, "%s", err.Error())`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`var plugins []api.Plugin`