feat: add ForceDisableUnsupportedLinters option

Author: ldez

test/run_test.go

@@ -2,11 +2,8 @@ package test
 
 import (
 	"path/filepath"
-	"runtime"
-	"strings"
 	"testing"
 
-	hcversion "github.com/hashicorp/go-version"
 	"github.com/stretchr/testify/require"
 	_ "github.com/valyala/quicktemplate"
 
@@ -134,21 +131,15 @@ func TestTestsAreLintedByDefault(t *testing.T) {
 }
 
 func TestCgoOk(t *testing.T) {
-	args := []string{"--timeout=3m",
-		"--enable-all",
-		"-D",
-		"nosnakecase", // try to analyze the generated Go.
-	}
-
-	// TODO(ldez) remove when we will run go1.23 on the CI.
-	if isGoVersion("1.21") {
-		args = append(args, "-D", "intrange,copyloopvar")
-	}
-
 	testshared.NewRunnerBuilder(t).
 		WithNoConfig().
-		WithArgs(args...).
+		WithArgs("--timeout=3m",
+			"--enable-all",
+			"-D",
+			"nosnakecase",
+		).
 		WithTargetPath(testdataDir, "cgo").
+		ForceDisableUnsupportedLinters().
 		Runner().
 		Install().
 		Run().
@@ -362,17 +353,11 @@ func TestLineDirectiveProcessedFiles(t *testing.T) {
 }
 
 func TestUnsafeOk(t *testing.T) {
-	args := []string{"--enable-all"}
-
-	// TODO(ldez) remove when we will run go1.23 on the CI.
-	if isGoVersion("1.21") {
-		args = append(args, "-D", "intrange,copyloopvar")
-	}
-
 	testshared.NewRunnerBuilder(t).
 		WithNoConfig().
-		WithArgs(args...).
+		WithArgs("--enable-all").
 		WithTargetPath(testdataDir, "unsafe").
+		ForceDisableUnsupportedLinters().
 		Runner().
 		Install().
 		Run().
@@ -527,15 +512,11 @@ func TestEnableAllFastAndEnableCanCoexist(t *testing.T) {
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 
-			// TODO(ldez) remove when we will run go1.23 on the CI.
-			if isGoVersion("1.21") {
-				test.args = append(test.args, "-D", "intrange,copyloopvar")
-			}
-
 			testshared.NewRunnerBuilder(t).
 				WithNoConfig().
 				WithArgs(test.args...).
 				WithTargetPath(testdataDir, minimalPkg).
+				ForceDisableUnsupportedLinters().
 				Runner().
 				Run().
 				ExpectExitCode(test.expected...)
@@ -702,17 +683,3 @@ func TestPathPrefix(t *testing.T) {
 		})
 	}
 }
-
-func isGoVersion(tag string) bool {
-	vRuntime, err := hcversion.NewVersion(strings.TrimPrefix(runtime.Version(), "go"))
-	if err != nil {
-		return false
-	}
-
-	vTag, err := hcversion.NewVersion(strings.TrimPrefix(tag, "go"))
-	if err != nil {
-		return false
-	}
-
-	return vRuntime.GreaterThanOrEqual(vTag)
-}

test/testshared/runner.go

@@ -4,12 +4,15 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
+	"slices"
 	"strings"
 	"sync"
 	"syscall"
 	"testing"
 	"time"
 
+	hcversion "github.com/hashicorp/go-version"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -150,6 +153,14 @@ func (b *RunnerBuilder) WithArgs(args ...string) *RunnerBuilder {
 	return b
 }
 
+// ForceDisableUnsupportedLinters temporary method to disable some linters.
+// TODO(ldez) remove when we will run go1.23 on the CI.
+func (b *RunnerBuilder) ForceDisableUnsupportedLinters() *RunnerBuilder {
+	b.args = forceDisableUnsupportedLinters(b.args)
+
+	return b
+}
+
 func (b *RunnerBuilder) WithTargetPath(targets ...string) *RunnerBuilder {
 	b.target = filepath.Join(targets...)
 
@@ -358,3 +369,61 @@ func InstallGolangciLint(tb testing.TB) string {
 
 	return abs
 }
+
+// TODO(ldez) remove when we will run go1.23 on the CI.
+func forceDisableUnsupportedLinters(args []string) []string {
+	if !isGoVersion("1.21") {
+		return args
+	}
+
+	result := slices.Clone(args)
+
+	if len(result) == 0 {
+		return append(result, "-D", "intrange,copyloopvar")
+	}
+
+	if slices.ContainsFunc(args, func(arg string) bool { return strings.HasSuffix(arg, "-disable-all") }) {
+		return args
+	}
+
+	var appended bool
+
+	for i, arg := range args {
+		if !strings.HasSuffix(arg, "-D") && !strings.HasSuffix(arg, "-disable") {
+			continue
+		}
+
+		if len(args) <= i+1 || strings.HasPrefix(args[i+1], "-") {
+			continue
+		}
+
+		d := strings.Split(args[i+1], ",")
+		d = append(d, "intrange", "copyloopvar")
+
+		result[i+1] = strings.Join(slices.Compact(d), ",")
+
+		appended = true
+		break
+	}
+
+	if !appended {
+		result = append(result, "-D", "intrange,copyloopvar")
+	}
+
+	return result
+}
+
+// TODO(ldez) remove when we will run go1.23 on the CI.
+func isGoVersion(tag string) bool {
+	vRuntime, err := hcversion.NewVersion(strings.TrimPrefix(runtime.Version(), "go"))
+	if err != nil {
+		return false
+	}
+
+	vTag, err := hcversion.NewVersion(strings.TrimPrefix(tag, "go"))
+	if err != nil {
+		return false
+	}
+
+	return vRuntime.GreaterThanOrEqual(vTag)
+}

test/testshared/runner_test.go

@@ -217,3 +217,50 @@ func TestRunnerResult_ExpectOutputRegexp(t *testing.T) {
 	r.ExpectOutputRegexp(`an.+`)
 	r.ExpectOutputRegexp("an")
 }
+
+// TODO(ldez) remove when we will run go1.23 on the CI.
+func Test_forceDisableUnsupportedLinters(t *testing.T) {
+	t.Skip("only for illustration purpose because works only with go1.21")
+
+	testCases := []struct {
+		desc     string
+		args     []string
+		expected []string
+	}{
+		{
+			desc:     "no args",
+			expected: []string{"-D", "intrange,copyloopvar"},
+		},
+		{
+			desc:     "simple",
+			args:     []string{"-A", "B", "-E"},
+			expected: []string{"-A", "B", "-E", "-D", "intrange,copyloopvar"},
+		},
+		{
+			desc:     "with existing disable linters",
+			args:     []string{"-D", "a,b"},
+			expected: []string{"-D", "a,b,intrange,copyloopvar"},
+		},
+		{
+			desc:     "complex",
+			args:     []string{"-A", "B", "-D", "a,b", "C", "-E", "F"},
+			expected: []string{"-A", "B", "-D", "a,b,intrange,copyloopvar", "C", "-E", "F"},
+		},
+		{
+			desc:     "disable-all",
+			args:     []string{"-disable-all", "-D", "a,b"},
+			expected: []string{"-disable-all", "-D", "a,b"},
+		},
+	}
+
+	for _, test := range testCases {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+
+			result := forceDisableUnsupportedLinters(test.args)
+
+			assert.Equal(t, test.expected, result)
+		})
+	}
+}