ci: enable perfsprint linter (#2872)

Enable perfsprint linter for golangci-lint Signed-off-by: Matthieu MOREL <[email protected]> Co-authored-by: Steven Hartland <[email protected]>
testcontainers · Nov 2, 2024 · cc5a516 · cc5a516
1 parent 1819e70
commit cc5a516
Show file tree

Hide file tree

Showing 47 changed files with 116 additions and 96 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -8,6 +8,7 @@ linters:
     - misspell
     - nolintlint
     - nakedret
+    - perfsprint
     - testifylint
     - thelper
     - usestdlibvars

diff --git a/docker.go b/docker.go
@@ -152,7 +152,7 @@ func (c *DockerContainer) PortEndpoint(ctx context.Context, port nat.Port, proto
 
 	protoFull := ""
 	if proto != "" {
-		protoFull = fmt.Sprintf("%s://", proto)
+		protoFull = proto + "://"
 	}
 
 	return fmt.Sprintf("%s%s:%s", protoFull, host, outerPort.Port()), nil

diff --git a/docker_auth_test.go b/docker_auth_test.go
@@ -284,11 +284,11 @@ func prepareLocalRegistryWithAuth(t *testing.T) string {
 		},
 		Files: []ContainerFile{
 			{
-				HostFilePath:      fmt.Sprintf("%s/testdata/auth", wd),
+				HostFilePath:      wd + "/testdata/auth",
 				ContainerFilePath: "/auth",
 			},
 			{
-				HostFilePath:      fmt.Sprintf("%s/testdata/data", wd),
+				HostFilePath:      wd + "/testdata/data",
 				ContainerFilePath: "/data",
 			},
 		},

diff --git a/file_test.go b/file_test.go
@@ -6,6 +6,7 @@ import (
 	"archive/tar"
 	"bytes"
 	"compress/gzip"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -37,7 +38,7 @@ func Test_IsDir(t *testing.T) {
 		{
 			filepath: "foobar.doc",
 			expected: false,
-			err:      fmt.Errorf("does not exist"),
+			err:      errors.New("does not exist"),
 		},
 	}
 

diff --git a/internal/core/bootstrap.go b/internal/core/bootstrap.go
@@ -2,6 +2,7 @@ package core
 
 import (
 	"crypto/sha256"
+	"encoding/hex"
 	"fmt"
 	"os"
 
@@ -89,7 +90,7 @@ func init() {
 		return
 	}
 
-	sessionID = fmt.Sprintf("%x", hasher.Sum(nil))
+	sessionID = hex.EncodeToString(hasher.Sum(nil))
 }
 
 func ProcessID() string {

diff --git a/internal/core/docker_host_test.go b/internal/core/docker_host_test.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"os"
 	"path/filepath"
 	"testing"
@@ -46,7 +46,7 @@ func testCallbackCheckPassing(_ context.Context, _ string) error {
 }
 
 func testCallbackCheckError(_ context.Context, _ string) error {
-	return fmt.Errorf("could not check the Docker host")
+	return errors.New("could not check the Docker host")
 }
 
 func mockCallbackCheck(t *testing.T, fn func(_ context.Context, _ string) error) {

diff --git a/internal/core/docker_rootless.go b/internal/core/docker_rootless.go
@@ -3,11 +3,11 @@ package core
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/url"
 	"os"
 	"path/filepath"
 	"runtime"
+	"strconv"
 )
 
 var (
@@ -144,7 +144,7 @@ func rootlessSocketPathFromHomeDesktopDir() (string, error) {
 // rootlessSocketPathFromRunDir returns the path to the rootless Docker socket from the /run/user/<uid>/docker.sock file.
 func rootlessSocketPathFromRunDir() (string, error) {
 	uid := os.Getuid()
-	f := filepath.Join(baseRunDir, "user", fmt.Sprintf("%d", uid), "docker.sock")
+	f := filepath.Join(baseRunDir, "user", strconv.Itoa(uid), "docker.sock")
 	if fileExists(f) {
 		return f, nil
 	}

diff --git a/internal/core/docker_rootless_test.go b/internal/core/docker_rootless_test.go
@@ -2,9 +2,9 @@ package core
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"path/filepath"
+	"strconv"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -161,7 +161,7 @@ func TestRootlessDockerSocketPath(t *testing.T) {
 		})
 
 		uid := os.Getuid()
-		runDir := filepath.Join(tmpDir, "user", fmt.Sprintf("%d", uid))
+		runDir := filepath.Join(tmpDir, "user", strconv.Itoa(uid))
 		err = createTmpDockerSocket(runDir)
 		require.NoError(t, err)
 
@@ -208,7 +208,7 @@ func setupRootlessNotFound(t *testing.T) {
 
 	baseRunDir = tmpDir
 	uid := os.Getuid()
-	runDir := filepath.Join(tmpDir, "run", "user", fmt.Sprintf("%d", uid))
+	runDir := filepath.Join(tmpDir, "run", "user", strconv.Itoa(uid))
 	err = createTmpDir(runDir)
 	require.NoError(t, err)
 }
diff --git a/modules/chroma/chroma.go b/modules/chroma/chroma.go
@@ -2,6 +2,7 @@ package chroma
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/testcontainers/testcontainers-go"
@@ -66,7 +67,7 @@ func (c *ChromaContainer) RESTEndpoint(ctx context.Context) (string, error) {
 
 	host, err := c.Host(ctx)
 	if err != nil {
-		return "", fmt.Errorf("failed to get container host")
+		return "", errors.New("failed to get container host")
 	}
 
 	return fmt.Sprintf("http://%s:%s", host, containerPort.Port()), nil

diff --git a/modules/cockroachdb/certs.go b/modules/cockroachdb/certs.go
@@ -2,7 +2,7 @@ package cockroachdb
 
 import (
 	"crypto/x509"
-	"fmt"
+	"errors"
 	"net"
 	"time"
 
@@ -28,7 +28,7 @@ func NewTLSConfig() (*TLSConfig, error) {
 		ValidFor:          time.Hour,
 	})
 	if caCert == nil {
-		return nil, fmt.Errorf("failed to generate CA certificate")
+		return nil, errors.New("failed to generate CA certificate")
 	}
 	// }
 
@@ -42,7 +42,7 @@ func NewTLSConfig() (*TLSConfig, error) {
 		Parent:            caCert, // using the CA certificate as parent
 	})
 	if nodeCert == nil {
-		return nil, fmt.Errorf("failed to generate node certificate")
+		return nil, errors.New("failed to generate node certificate")
 	}
 	// }
 
@@ -54,7 +54,7 @@ func NewTLSConfig() (*TLSConfig, error) {
 		Parent:            caCert, // using the CA certificate as parent
 	})
 	if clientCert == nil {
-		return nil, fmt.Errorf("failed to generate client certificate")
+		return nil, errors.New("failed to generate client certificate")
 	}
 
 	return &TLSConfig{

diff --git a/modules/cockroachdb/cockroachdb.go b/modules/cockroachdb/cockroachdb.go
@@ -5,6 +5,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/pem"
+	"errors"
 	"fmt"
 	"net"
 	"net/url"
@@ -18,7 +19,7 @@ import (
 	"github.com/testcontainers/testcontainers-go/wait"
 )
 
-var ErrTLSNotEnabled = fmt.Errorf("tls not enabled")
+var ErrTLSNotEnabled = errors.New("tls not enabled")
 
 const (
 	certsDir = "/tmp"
@@ -144,7 +145,7 @@ func addCmd(req *testcontainers.GenericContainerRequest, opts options) error {
 			return fmt.Errorf("unsupported user %s with TLS, use %s", opts.User, defaultUser)
 		}
 		if opts.Password != "" {
-			return fmt.Errorf("cannot use password authentication with TLS")
+			return errors.New("cannot use password authentication with TLS")
 		}
 	}
 

diff --git a/modules/compose/compose_api_test.go b/modules/compose/compose_api_test.go
@@ -2,7 +2,7 @@ package compose
 
 import (
 	"context"
-	"fmt"
+	"encoding/hex"
 	"hash/fnv"
 	"os"
 	"path/filepath"
@@ -642,7 +642,7 @@ func TestDockerComposeAPIVolumesDeletedOnDown(t *testing.T) {
 
 	volumeListFilters := filters.NewArgs()
 	// the "mydata" identifier comes from the "testdata/docker-compose-volume.yml" file
-	volumeListFilters.Add("name", fmt.Sprintf("%s_mydata", identifier))
+	volumeListFilters.Add("name", identifier+"_mydata")
 	volumeList, err := compose.dockerClient.VolumeList(ctx, volume.ListOptions{Filters: volumeListFilters})
 	require.NoError(t, err, "compose.dockerClient.VolumeList()")
 
@@ -690,7 +690,7 @@ func TestDockerComposeApiWithWaitForShortLifespanService(t *testing.T) {
 }
 
 func testNameHash(name string) StackIdentifier {
-	return StackIdentifier(fmt.Sprintf("%x", fnv.New32a().Sum([]byte(name))))
+	return StackIdentifier(hex.EncodeToString(fnv.New32a().Sum([]byte(name))))
 }
 
 // cleanup is a helper function that schedules the compose stack to be stopped when the test ends.

diff --git a/modules/dolt/dolt.go b/modules/dolt/dolt.go
@@ -3,6 +3,7 @@ package dolt
 import (
 	"context"
 	"database/sql"
+	"errors"
 	"fmt"
 	"path/filepath"
 	"strings"
@@ -84,7 +85,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 	}
 
 	if len(password) == 0 && password == "" && !strings.EqualFold(rootUser, username) {
-		return nil, fmt.Errorf("empty password can be used only with the root user")
+		return nil, errors.New("empty password can be used only with the root user")
 	}
 
 	container, err := testcontainers.GenericContainer(ctx, genericContainerReq)

diff --git a/modules/elasticsearch/elasticsearch.go b/modules/elasticsearch/elasticsearch.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -212,7 +213,7 @@ func configurePassword(settings *Options, req *testcontainers.GenericContainerRe
 
 	if settings.Password != "" {
 		if isOSS(req.Image) {
-			return fmt.Errorf("it's not possible to activate security on Elastic OSS Image. Please switch to the default distribution.")
+			return errors.New("it's not possible to activate security on Elastic OSS Image. Please switch to the default distribution.")
 		}
 
 		if _, ok := req.Env["ELASTIC_PASSWORD"]; !ok {

diff --git a/modules/elasticsearch/version.go b/modules/elasticsearch/version.go
@@ -22,7 +22,7 @@ func isAtLeastVersion(image string, major int) bool {
 	}
 
 	if !strings.HasPrefix(version, "v") {
-		version = fmt.Sprintf("v%s", version)
+		version = "v" + version
 	}
 
 	if semver.IsValid(version) {

diff --git a/modules/gcloud/spanner_test.go b/modules/gcloud/spanner_test.go
@@ -63,7 +63,7 @@ func ExampleRunSpannerContainer() {
 	// }
 
 	instanceOp, err := instanceAdmin.CreateInstance(ctx, &instancepb.CreateInstanceRequest{
-		Parent:     fmt.Sprintf("projects/%s", projectId),
+		Parent:     "projects/" + projectId,
 		InstanceId: instanceId,
 		Instance: &instancepb.Instance{
 			DisplayName: instanceId,

diff --git a/modules/inbucket/inbucket.go b/modules/inbucket/inbucket.go
@@ -44,7 +44,7 @@ func (c *InbucketContainer) WebInterface(ctx context.Context) (string, error) {
 		return "", err
 	}
 
-	return fmt.Sprintf("http://%s", net.JoinHostPort(host, containerPort.Port())), nil
+	return "http://" + net.JoinHostPort(host, containerPort.Port()), nil
 }
 
 // Deprecated: use Run instead

diff --git a/modules/k3s/k3s.go b/modules/k3s/k3s.go
@@ -220,7 +220,7 @@ func (c *K3sContainer) LoadImages(ctx context.Context, images ...string) error {
 		return fmt.Errorf("saving images %w", err)
 	}
 
-	containerPath := fmt.Sprintf("/tmp/%s", filepath.Base(imagesTar.Name()))
+	containerPath := "/tmp/" + filepath.Base(imagesTar.Name())
 	err = c.Container.CopyFileToContainer(ctx, imagesTar.Name(), containerPath, 0x644)
 	if err != nil {
 		return fmt.Errorf("copying image to container %w", err)

diff --git a/modules/k6/k6.go b/modules/k6/k6.go
@@ -143,7 +143,7 @@ func WithCache() testcontainers.CustomizeRequestOption {
 	cacheVol := os.Getenv("TC_K6_BUILD_CACHE")
 	// if no volume is provided, create one and ensure add labels for garbage collection
 	if cacheVol == "" {
-		cacheVol = fmt.Sprintf("k6-cache-%s", testcontainers.SessionID())
+		cacheVol = "k6-cache-" + testcontainers.SessionID()
 		volOptions = &mount.VolumeOptions{
 			Labels: testcontainers.GenericLabels(),
 		}

diff --git a/modules/kafka/kafka.go b/modules/kafka/kafka.go
@@ -2,8 +2,10 @@ package kafka
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"math"
+	"strconv"
 	"strings"
 
 	"github.com/docker/go-connections/nat"
@@ -58,7 +60,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 			"KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS":             "1",
 			"KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR": "1",
 			"KAFKA_TRANSACTION_STATE_LOG_MIN_ISR":            "1",
-			"KAFKA_LOG_FLUSH_INTERVAL_MESSAGES":              fmt.Sprintf("%d", math.MaxInt),
+			"KAFKA_LOG_FLUSH_INTERVAL_MESSAGES":              strconv.Itoa(math.MaxInt),
 			"KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS":         "0",
 			"KAFKA_NODE_ID":                                  "1",
 			"KAFKA_PROCESS_ROLES":                            "broker,controller",
@@ -203,7 +205,7 @@ func configureControllerQuorumVoters(req *testcontainers.GenericContainerRequest
 // which is available since version 7.0.0.
 func validateKRaftVersion(fqName string) error {
 	if fqName == "" {
-		return fmt.Errorf("image cannot be empty")
+		return errors.New("image cannot be empty")
 	}
 
 	image := fqName[:strings.LastIndex(fqName, ":")]
@@ -218,7 +220,7 @@ func validateKRaftVersion(fqName string) error {
 
 	// semver requires the version to start with a "v"
 	if !strings.HasPrefix(version, "v") {
-		version = fmt.Sprintf("v%s", version)
+		version = "v" + version
 	}
 
 	if semver.Compare(version, "v7.4.0") < 0 { // version < v7.4.0

diff --git a/modules/localstack/localstack.go b/modules/localstack/localstack.go
@@ -29,7 +29,7 @@ func isLegacyMode(image string) bool {
 	}
 
 	if !strings.HasPrefix(version, "v") {
-		version = fmt.Sprintf("v%s", version)
+		version = "v" + version
 	}
 
 	if semver.IsValid(version) {
@@ -48,7 +48,7 @@ func isVersion2(image string) bool {
 	}
 
 	if !strings.HasPrefix(version, "v") {
-		version = fmt.Sprintf("v%s", version)
+		version = "v" + version
 	}
 
 	if semver.IsValid(version) {
@@ -82,7 +82,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 		ExposedPorts: []string{fmt.Sprintf("%d/tcp", defaultPort)},
 		Env:          map[string]string{},
 		HostConfigModifier: func(hostConfig *container.HostConfig) {
-			hostConfig.Binds = []string{fmt.Sprintf("%s:/var/run/docker.sock", dockerHost)}
+			hostConfig.Binds = []string{dockerHost + ":/var/run/docker.sock"}
 		},
 	}