Merge pull request #1415 from saschagrunert/perfsprint

Enable and fix `perfsprint` linter

.golangci.yml

@@ -35,6 +35,7 @@ linters:
     - nakedret
     - nilerr
     - nosprintfhostport
+    - perfsprint
     - prealloc
     - predeclared
     - promlinter
@@ -94,7 +95,6 @@ linters:
     # - nolintlint
     # - nonamedreturns
     # - paralleltest
-    # - perfsprint
     # - revive
     # - rowserrcheck
     # - sqlclosecheck

cmd/crictl/attach.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/url"
 
@@ -53,7 +54,7 @@ var runtimeAttachCommand = &cli.Command{
 	Action: func(c *cli.Context) error {
 		id := c.Args().First()
 		if id == "" {
-			return fmt.Errorf("ID cannot be empty")
+			return errors.New("ID cannot be empty")
 		}
 
 		if c.NArg() != 1 {
@@ -84,7 +85,7 @@ var runtimeAttachCommand = &cli.Command{
 // Attach sends an AttachRequest to server, and parses the returned AttachResponse
 func Attach(ctx context.Context, client internalapi.RuntimeService, opts attachOptions) error {
 	if opts.id == "" {
-		return fmt.Errorf("ID cannot be empty")
+		return errors.New("ID cannot be empty")
 
 	}
 	request := &pb.AttachRequest{

cmd/crictl/completion.go

@@ -17,6 +17,7 @@ limitations under the License.
 package main
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 
@@ -136,7 +137,7 @@ Examples:
 		case "zsh":
 			return zshCompletion(c)
 		default:
-			return fmt.Errorf("only bash, zsh or fish are supported")
+			return errors.New("only bash, zsh or fish are supported")
 		}
 	},
 }

cmd/crictl/container.go

@@ -26,6 +26,7 @@ import (
 	"path/filepath"
 	goruntime "runtime"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
@@ -201,7 +202,7 @@ var startContainerCommand = &cli.Command{
 	ArgsUsage: "CONTAINER-ID [CONTAINER-ID...]",
 	Action: func(c *cli.Context) error {
 		if c.NArg() == 0 {
-			return fmt.Errorf("ID cannot be empty")
+			return errors.New("ID cannot be empty")
 		}
 		runtimeClient, err := getRuntimeService(c, 0)
 		if err != nil {
@@ -258,7 +259,7 @@ var updateContainerCommand = &cli.Command{
 	},
 	Action: func(c *cli.Context) error {
 		if c.NArg() == 0 {
-			return fmt.Errorf("ID cannot be empty")
+			return errors.New("ID cannot be empty")
 		}
 		runtimeClient, err := getRuntimeService(c, 0)
 		if err != nil {
@@ -300,7 +301,7 @@ var stopContainerCommand = &cli.Command{
 	},
 	Action: func(c *cli.Context) error {
 		if c.NArg() == 0 {
-			return fmt.Errorf("ID cannot be empty")
+			return errors.New("ID cannot be empty")
 		}
 		runtimeClient, err := getRuntimeService(c, 0)
 		if err != nil {
@@ -412,7 +413,7 @@ var removeContainerCommand = &cli.Command{
 		}
 
 		if errored {
-			return fmt.Errorf("unable to remove container(s)")
+			return errors.New("unable to remove container(s)")
 		}
 		return nil
 	},
@@ -440,7 +441,7 @@ var containerStatusCommand = &cli.Command{
 	},
 	Action: func(c *cli.Context) error {
 		if c.NArg() == 0 {
-			return fmt.Errorf("ID cannot be empty")
+			return errors.New("ID cannot be empty")
 		}
 		runtimeClient, err := getRuntimeService(c, 0)
 		if err != nil {
@@ -646,10 +647,10 @@ var checkpointContainerCommand = &cli.Command{
 	},
 	Action: func(c *cli.Context) error {
 		if c.NArg() == 0 {
-			return fmt.Errorf("ID cannot be empty")
+			return errors.New("ID cannot be empty")
 		}
 		if c.String("export") == "" {
-			return fmt.Errorf(
+			return errors.New(
 				"Cannot checkpoint a container without specifying the checkpoint destination. " +
 					"Use --export=/path/to/checkpoint.tar",
 			)
@@ -769,7 +770,7 @@ func CreateContainer(
 // the returned StartContainerResponse.
 func StartContainer(client internalapi.RuntimeService, id string) error {
 	if id == "" {
-		return fmt.Errorf("ID cannot be empty")
+		return errors.New("ID cannot be empty")
 	}
 	if err := client.StartContainer(context.TODO(), id); err != nil {
 		return err
@@ -803,7 +804,7 @@ type updateOptions struct {
 // the returned UpdateContainerResourcesResponse.
 func UpdateContainerResources(client internalapi.RuntimeService, id string, opts updateOptions) error {
 	if id == "" {
-		return fmt.Errorf("ID cannot be empty")
+		return errors.New("ID cannot be empty")
 	}
 	request := &pb.UpdateContainerResourcesRequest{
 		ContainerId: id,
@@ -839,7 +840,7 @@ func UpdateContainerResources(client internalapi.RuntimeService, id string, opts
 // the returned StopContainerResponse.
 func StopContainer(client internalapi.RuntimeService, id string, timeout int64) error {
 	if id == "" {
-		return fmt.Errorf("ID cannot be empty")
+		return errors.New("ID cannot be empty")
 	}
 	if err := client.StopContainer(context.TODO(), id, timeout); err != nil {
 		return err
@@ -874,7 +875,7 @@ func CheckpointContainer(
 // the returned RemoveContainerResponse.
 func RemoveContainer(client internalapi.RuntimeService, id string) error {
 	if id == "" {
-		return fmt.Errorf("ID cannot be empty")
+		return errors.New("ID cannot be empty")
 	}
 	if err := client.RemoveContainer(context.TODO(), id); err != nil {
 		return err
@@ -922,7 +923,7 @@ func ContainerStatus(client internalapi.RuntimeService, id, output string, tmplS
 		output = "json"
 	}
 	if id == "" {
-		return fmt.Errorf("ID cannot be empty")
+		return errors.New("ID cannot be empty")
 	}
 	request := &pb.ContainerStatusRequest{
 		ContainerId: id,
@@ -1088,7 +1089,7 @@ func ListContainers(runtimeClient internalapi.RuntimeService, imageClient intern
 			}
 			podName := getPodNameFromLabels(c.Labels)
 			display.AddRow([]string{id, image, ctm, convertContainerState(c.State), c.Metadata.Name,
-				fmt.Sprintf("%d", c.Metadata.Attempt), podID, podName})
+				strconv.FormatUint(uint64(c.Metadata.Attempt), 10), podID, podName})
 			continue
 		}
 

cmd/crictl/container_stats.go

@@ -18,8 +18,10 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sort"
+	"strconv"
 	"time"
 
 	"github.com/docker/go-units"
@@ -207,12 +209,12 @@ func (d containerStatsDisplayer) displayStats(ctx context.Context, client intern
 			// Only generate cpuPerc for running container
 			duration := s.GetCpu().GetTimestamp() - old.GetCpu().GetTimestamp()
 			if duration == 0 {
-				return fmt.Errorf("cpu stat is not updated during sample")
+				return errors.New("cpu stat is not updated during sample")
 			}
 			cpuPerc = float64(cpu-old.GetCpu().GetUsageCoreNanoSeconds().GetValue()) / float64(duration) * 100
 		}
 		d.display.AddRow([]string{id, name, fmt.Sprintf("%.2f", cpuPerc), units.HumanSize(float64(mem)),
-			units.HumanSize(float64(disk)), fmt.Sprintf("%d", inodes)})
+			units.HumanSize(float64(disk)), strconv.FormatUint(inodes, 10)})
 
 	}
 	d.display.ClearScreen()

cmd/crictl/exec.go

@@ -202,15 +202,15 @@ func stream(ctx context.Context, in, tty bool, transport string, url *url.URL) e
 		streamOptions.Stdin = pr
 	}
 	if !in {
-		return fmt.Errorf("tty=true must be specified with interactive=true")
+		return errors.New("tty=true must be specified with interactive=true")
 	}
 	t := term.TTY{
 		In:  stdin,
 		Out: stdout,
 		Raw: true,
 	}
 	if !t.IsTerminalIn() {
-		return fmt.Errorf("input is not a terminal")
+		return errors.New("input is not a terminal")
 	}
 	streamOptions.TerminalSizeQueue = t.MonitorSize(t.GetSize())
 	return t.Safe(func() error { return executor.StreamWithContext(ctx, streamOptions) })

cmd/crictl/image.go

@@ -23,6 +23,7 @@ import (
 	"regexp"
 	"slices"
 	"sort"
+	"strconv"
 	"strings"
 	"syscall"
 
@@ -87,7 +88,7 @@ var pullImageCommand = &cli.Command{
 	Action: func(c *cli.Context) error {
 		imageName := c.Args().First()
 		if imageName == "" {
-			return fmt.Errorf("Image name cannot be empty")
+			return errors.New("Image name cannot be empty")
 		}
 
 		if c.NArg() > 1 {
@@ -237,7 +238,7 @@ var listImageCommand = &cli.Command{
 					}
 					row = append(row, id, size)
 					if showPinned {
-						row = append(row, fmt.Sprintf("%v", image.Pinned))
+						row = append(row, strconv.FormatBool(image.Pinned))
 					}
 					display.AddRow(row)
 				}
@@ -476,7 +477,7 @@ var removeImageCommand = &cli.Command{
 		}
 
 		if errored {
-			return fmt.Errorf("unable to remove the image(s)")
+			return errors.New("unable to remove the image(s)")
 		}
 
 		return nil
@@ -779,7 +780,7 @@ func ImageStatus(client internalapi.ImageManagerService, image string, verbose b
 // the returned RemoveImageResponse.
 func RemoveImage(client internalapi.ImageManagerService, image string) error {
 	if image == "" {
-		return fmt.Errorf("ImageID cannot be empty")
+		return errors.New("ImageID cannot be empty")
 	}
 	request := &pb.RemoveImageRequest{Image: &pb.ImageSpec{Image: image}}
 	logrus.Debugf("RemoveImageRequest: %v", request)

cmd/crictl/logs.go

@@ -18,8 +18,10 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 	"time"
 
@@ -70,7 +72,7 @@ var logsCommand = &cli.Command{
 	Action: func(c *cli.Context) (retErr error) {
 		containerID := c.Args().First()
 		if containerID == "" {
-			return fmt.Errorf("ID cannot be empty")
+			return errors.New("ID cannot be empty")
 		}
 
 		if c.NArg() > 1 {
@@ -103,14 +105,14 @@ var logsCommand = &cli.Command{
 		}
 		logPath := status.GetStatus().GetLogPath()
 		if logPath == "" {
-			return fmt.Errorf("The container has not set log path")
+			return errors.New("The container has not set log path")
 		}
 		if previous {
 			containerAttempt := status.GetStatus().GetMetadata().Attempt
 			if containerAttempt == uint32(0) {
 				return fmt.Errorf("Previous terminated container %s not found", status.GetStatus().GetMetadata().Name)
 			}
-			logPath = fmt.Sprintf("%s%s%s", logPath[:strings.LastIndex(logPath, "/")+1], fmt.Sprint(containerAttempt-1),
+			logPath = fmt.Sprintf("%s%s%s", logPath[:strings.LastIndex(logPath, "/")+1], strconv.FormatUint(uint64(containerAttempt-1), 10),
 				logPath[strings.LastIndex(logPath, "."):])
 		}
 		// build a WithCancel context based on cli.context

cmd/crictl/main.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"runtime"
@@ -64,7 +65,7 @@ var (
 
 func getRuntimeService(_ *cli.Context, timeout time.Duration) (res internalapi.RuntimeService, err error) {
 	if RuntimeEndpointIsSet && RuntimeEndpoint == "" {
-		return nil, fmt.Errorf("--runtime-endpoint is not set")
+		return nil, errors.New("--runtime-endpoint is not set")
 	}
 	logrus.Debug("get runtime connection")
 
@@ -110,7 +111,7 @@ func getRuntimeService(_ *cli.Context, timeout time.Duration) (res internalapi.R
 func getImageService(*cli.Context) (res internalapi.ImageManagerService, err error) {
 	if ImageEndpoint == "" {
 		if RuntimeEndpointIsSet && RuntimeEndpoint == "" {
-			return nil, fmt.Errorf("--image-endpoint is not set")
+			return nil, errors.New("--image-endpoint is not set")
 		}
 		ImageEndpoint = RuntimeEndpoint
 		ImageEndpointIsSet = RuntimeEndpointIsSet

cmd/crictl/portforward.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -70,7 +71,7 @@ var runtimePortForwardCommand = &cli.Command{
 // PortForward sends an PortForwardRequest to server, and parses the returned PortForwardResponse
 func PortForward(client internalapi.RuntimeService, opts portforwardOptions) error {
 	if opts.id == "" {
-		return fmt.Errorf("ID cannot be empty")
+		return errors.New("ID cannot be empty")
 
 	}
 	request := &pb.PortForwardRequest{

cmd/crictl/sandbox.go

@@ -19,9 +19,11 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
@@ -337,7 +339,7 @@ func RunPodSandbox(client internalapi.RuntimeService, config *pb.PodSandboxConfi
 // the returned StopPodSandboxResponse.
 func StopPodSandbox(client internalapi.RuntimeService, id string) error {
 	if id == "" {
-		return fmt.Errorf("ID cannot be empty")
+		return errors.New("ID cannot be empty")
 	}
 	if err := client.StopPodSandbox(context.TODO(), id); err != nil {
 		return err
@@ -351,7 +353,7 @@ func StopPodSandbox(client internalapi.RuntimeService, id string) error {
 // the returned RemovePodSandboxResponse.
 func RemovePodSandbox(client internalapi.RuntimeService, id string) error {
 	if id == "" {
-		return fmt.Errorf("ID cannot be empty")
+		return errors.New("ID cannot be empty")
 	}
 	if err := client.RemovePodSandbox(context.TODO(), id); err != nil {
 		return err
@@ -384,7 +386,7 @@ func PodSandboxStatus(client internalapi.RuntimeService, id, output string, quie
 		output = "json"
 	}
 	if id == "" {
-		return fmt.Errorf("ID cannot be empty")
+		return errors.New("ID cannot be empty")
 	}
 
 	request := &pb.PodSandboxStatusRequest{
@@ -530,7 +532,7 @@ func ListPodSandboxes(client internalapi.RuntimeService, opts listOptions) error
 				convertPodState(pod.State),
 				pod.Metadata.Name,
 				pod.Metadata.Namespace,
-				fmt.Sprintf("%d", pod.Metadata.Attempt),
+				strconv.FormatUint(uint64(pod.Metadata.Attempt), 10),
 				getSandboxesRuntimeHandler(pod),
 			})
 			continue