golangci-lint: enable thelper linter (#2834)

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

Author: mmorel-35

.golangci.yml

@@ -1,14 +1,15 @@
 linters:
  enable:
+ - errcheck
  - errorlint
  - gci
  - gocritic
  - gofumpt
  - misspell
+ - nolintlint
  - nonamedreturns
  - testifylint
- - errcheck
- - nolintlint
+ - thelper
 
 linters-settings:
  errorlint:
@@ -30,16 +31,6 @@ linters-settings:
  disable:
  - float-compare
  - go-require
- enable:
- - bool-compare
- - compares
- - empty
- - error-is-as
- - error-nil
- - expected-actual
- - len
- - require-error
- - suite-dont-use-pkg
- - suite-extra-assert-call
+ enable-all: true
 run:
  timeout: 5m

docker_auth_test.go

@@ -170,6 +170,7 @@ func TestBuildContainerFromDockerfile(t *testing.T) {
 
 // removeImageFromLocalCache removes the image from the local cache
 func removeImageFromLocalCache(t *testing.T, img string) {
+t.Helper()
 ctx := context.Background()
 
 testcontainersClient, err := NewDockerClientWithOpts(ctx, client.WithVersion(daemonMaxVersion))
@@ -263,6 +264,7 @@ func TestCreateContainerFromPrivateRegistry(t *testing.T) {
 }
 
 func prepareLocalRegistryWithAuth(t *testing.T) string {
+t.Helper()
 ctx := context.Background()
 wd, err := os.Getwd()
 require.NoError(t, err)
@@ -359,6 +361,7 @@ func setAuthConfig(t *testing.T, host, username, password string) string {
 // which can be used to connect to the local registry.
 // This avoids the issues with localhost on WSL.
 func localAddress(t *testing.T) string {
+t.Helper()
 if os.Getenv("WSL_DISTRO_NAME") == "" {
 return "localhost"
 }

docker_test.go

@@ -1345,6 +1345,7 @@ func TestContainerInspect_RawInspectIsCleanedOnStop(t *testing.T) {
 }
 
 func readHostname(tb testing.TB, containerId string) string {
+tb.Helper()
 containerClient, err := NewDockerClientWithOpts(context.Background())
 if err != nil {
 tb.Fatalf("Failed to create Docker client: %v", err)
@@ -1917,6 +1918,7 @@ func TestNetworkModeWithContainerReference(t *testing.T) {
 
 // creates a temporary dir in which the files will be extracted. Then it will compare the bytes of each file in the source with the bytes from the copied-from-container file
 func assertExtractedFiles(t *testing.T, ctx context.Context, container Container, hostFilePath string, containerFilePath string) {
+t.Helper()
 // create all copied files into a temporary dir
 tmpDir := t.TempDir()
 

generic_test.go

@@ -164,6 +164,7 @@ func TestGenericReusableContainerInSubprocess(t *testing.T) {
 }
 
 func createReuseContainerInSubprocess(t *testing.T) string {
+t.Helper()
 // force verbosity in subprocesses, so that the output is printed
 cmd := exec.Command(os.Args[0], "-test.run=TestHelperContainerStarterProcess", "-test.v=true")
 cmd.Env = append(os.Environ(), "GO_WANT_HELPER_PROCESS=1")

internal/config/config_test.go

@@ -19,6 +19,7 @@ const (
 // unset environment variables to avoid side effects
 // execute this function before each test
 func resetTestEnv(t *testing.T) {
+t.Helper()
 t.Setenv("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "")
 t.Setenv("TESTCONTAINERS_RYUK_DISABLED", "")
 t.Setenv("TESTCONTAINERS_RYUK_CONTAINER_PRIVILEGED", "")

internal/core/docker_host_test.go

@@ -50,6 +50,7 @@ func testCallbackCheckError(_ context.Context, _ string) error {
 }
 
 func mockCallbackCheck(t *testing.T, fn func(_ context.Context, _ string) error) {
+t.Helper()
 oldCheck := dockerHostCheck
 dockerHostCheck = fn
 t.Cleanup(func() {
@@ -515,10 +516,12 @@ func createTmpDockerSocket(parent string) error {
 // setupDockerHostNotFound sets up the environment for the test case where the DOCKER_HOST environment variable is
 // already set (e.g. rootless docker) therefore we need to unset it before the test
 func setupDockerHostNotFound(t *testing.T) {
+t.Helper()
 t.Setenv("DOCKER_HOST", "")
 }
 
 func setupDockerSocket(t *testing.T) string {
+t.Helper()
 t.Cleanup(func() {
 DockerSocketPath = originalDockerSocketPath
 DockerSocketPathWithSchema = originalDockerSocketPathWithSchema
@@ -536,6 +539,7 @@ func setupDockerSocket(t *testing.T) string {
 }
 
 func setupDockerSocketNotFound(t *testing.T) {
+t.Helper()
 t.Cleanup(func() {
 DockerSocketPath = originalDockerSocketPath
 DockerSocketPathWithSchema = originalDockerSocketPathWithSchema
@@ -548,6 +552,7 @@ func setupDockerSocketNotFound(t *testing.T) {
 }
 
 func setupTestcontainersProperties(t *testing.T, content string) {
+t.Helper()
 t.Cleanup(func() {
 // reset the properties file after the test
 config.Reset()

internal/core/docker_rootless_test.go

@@ -184,6 +184,7 @@ func TestRootlessDockerSocketPath(t *testing.T) {
 }
 
 func setupRootlessNotFound(t *testing.T) {
+t.Helper()
 t.Cleanup(func() {
 baseRunDir = originalBaseRunDir
 os.Setenv("XDG_RUNTIME_DIR", originalXDGRuntimeDir)

modulegen/context_test.go

@@ -11,6 +11,7 @@ import (
 )
 
 func getTestRootContext(t *testing.T) context.Context {
+t.Helper()
 current, err := os.Getwd()
 require.NoError(t, err)
 return context.New(filepath.Dir(current))

modulegen/main_test.go

@@ -357,6 +357,7 @@ func TestGenerateModule(t *testing.T) {
 
 // assert content module file in the docs
 func assertModuleDocContent(t *testing.T, module context.TestcontainersModule, moduleDocFile string) {
+t.Helper()
 content, err := os.ReadFile(moduleDocFile)
 require.NoError(t, err)
 
@@ -383,6 +384,7 @@ func assertModuleDocContent(t *testing.T, module context.TestcontainersModule, m
 
 // assert content module test
 func assertExamplesTestContent(t *testing.T, module context.TestcontainersModule, examplesTestFile string) {
+t.Helper()
 content, err := os.ReadFile(examplesTestFile)
 require.NoError(t, err)
 
@@ -402,6 +404,7 @@ func assertExamplesTestContent(t *testing.T, module context.TestcontainersModule
 
 // assert content module test
 func assertModuleTestContent(t *testing.T, module context.TestcontainersModule, exampleTestFile string) {
+t.Helper()
 content, err := os.ReadFile(exampleTestFile)
 require.NoError(t, err)
 
@@ -413,6 +416,7 @@ func assertModuleTestContent(t *testing.T, module context.TestcontainersModule,
 
 // assert content module
 func assertModuleContent(t *testing.T, module context.TestcontainersModule, exampleFile string) {
+t.Helper()
 content, err := os.ReadFile(exampleFile)
 require.NoError(t, err)
 
@@ -437,6 +441,7 @@ func assertModuleContent(t *testing.T, module context.TestcontainersModule, exam
 
 // assert content GitHub workflow for the module
 func assertModuleGithubWorkflowContent(t *testing.T, moduleWorkflowFile string) {
+t.Helper()
 content, err := os.ReadFile(moduleWorkflowFile)
 require.NoError(t, err)
 
@@ -454,6 +459,7 @@ func assertModuleGithubWorkflowContent(t *testing.T, moduleWorkflowFile string)
 
 // assert content go.mod
 func assertGoModContent(t *testing.T, module context.TestcontainersModule, tcVersion string, goModFile string) {
+t.Helper()
 content, err := os.ReadFile(goModFile)
 require.NoError(t, err)
 
@@ -465,6 +471,7 @@ func assertGoModContent(t *testing.T, module context.TestcontainersModule, tcVer
 
 // assert content Makefile
 func assertMakefileContent(t *testing.T, module context.TestcontainersModule, makefile string) {
+t.Helper()
 content, err := os.ReadFile(makefile)
 require.NoError(t, err)
 
@@ -474,6 +481,7 @@ func assertMakefileContent(t *testing.T, module context.TestcontainersModule, ma
 
 // assert content in the nav items from mkdocs.yml
 func assertMkdocsNavItems(t *testing.T, module context.TestcontainersModule, originalConfig *mkdocs.Config, tmpCtx context.Context) {
+t.Helper()
 config, err := mkdocs.ReadConfig(tmpCtx.MkdocsConfigFile())
 require.NoError(t, err)
 

modulegen/mkdocs_test.go

@@ -82,6 +82,7 @@ func TestNavItems(t *testing.T) {
 }
 
 func copyInitialMkdocsConfig(t *testing.T, tmpCtx context.Context) error {
+t.Helper()
 ctx := getTestRootContext(t)
 return mkdocs.CopyConfig(ctx.MkdocsConfigFile(), tmpCtx.MkdocsConfigFile())
 }