dev: drop golangcitest:config directive

Author: ldez

test/fix_test.go

@@ -6,11 +6,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
-
 	"github.com/golangci/golangci-lint/pkg/exitcodes"
 	"github.com/golangci/golangci-lint/test/testshared"
+	"github.com/stretchr/testify/require"
 )
 
 func TestFix(t *testing.T) {
@@ -56,15 +54,12 @@ func TestFix(t *testing.T) {
 
 			args = append(args, rc.args...)
 
-			cfg, err := yaml.Marshal(rc.config)
-			require.NoError(t, err)
-
 			var runResult *testshared.RunResult
 			if rc.configPath != "" {
 				args = append(args, "-c", rc.configPath)
 				runResult = testshared.NewLintRunner(t).RunCommand("run", args...)
 			} else {
-				runResult = testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...)
+				runResult = testshared.NewLintRunner(t).RunWithYamlConfig("", args...)
 			}
 
 			// nolintlint test uses non existing linters (bob, alice)

test/linters_test.go

@@ -14,7 +14,6 @@ import (
 
 	hcversion "github.com/hashicorp/go-version"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
 
 	"github.com/golangci/golangci-lint/pkg/exitcodes"
 	"github.com/golangci/golangci-lint/test/testshared"
@@ -175,25 +174,6 @@ func TestFileOutput(t *testing.T) {
 	require.Contains(t, string(b), `"Issues":[`)
 }
 
-func saveConfig(t *testing.T, cfg map[string]interface{}) (cfgPath string, finishFunc func()) {
-	f, err := os.CreateTemp("", "golangci_lint_test")
-	require.NoError(t, err)
-
-	cfgPath = f.Name() + ".yml"
-	err = os.Rename(f.Name(), cfgPath)
-	require.NoError(t, err)
-
-	err = yaml.NewEncoder(f).Encode(cfg)
-	require.NoError(t, err)
-
-	return cfgPath, func() {
-		require.NoError(t, f.Close())
-		if os.Getenv("GL_KEEP_TEMP_FILES") != "1" {
-			require.NoError(t, os.Remove(cfgPath))
-		}
-	}
-}
-
 func testOneSource(t *testing.T, sourcePath string) {
 	args := []string{
 		"run",
@@ -210,25 +190,16 @@ func testOneSource(t *testing.T, sourcePath string) {
 		t.Skipf("Skipped: %s", sourcePath)
 	}
 
-	var cfgPath string
-	if rc.config != nil {
-		p, finish := saveConfig(t, rc.config)
-		defer finish()
-		cfgPath = p
-	} else if rc.configPath != "" {
-		cfgPath = rc.configPath
-	}
-
 	for _, addArg := range []string{"", "-Etypecheck"} {
 		caseArgs := append([]string{}, args...)
 		caseArgs = append(caseArgs, rc.args...)
 		if addArg != "" {
 			caseArgs = append(caseArgs, addArg)
 		}
-		if cfgPath == "" {
+		if rc.configPath == "" {
 			caseArgs = append(caseArgs, "--no-config")
 		} else {
-			caseArgs = append(caseArgs, "-c", cfgPath)
+			caseArgs = append(caseArgs, "-c", rc.configPath)
 		}
 
 		caseArgs = append(caseArgs, sourcePath)
@@ -241,34 +212,10 @@ func testOneSource(t *testing.T, sourcePath string) {
 
 type runContext struct {
 	args           []string
-	config         map[string]interface{}
 	configPath     string
 	expectedLinter string
 }
 
-func buildConfigFromShortRepr(t *testing.T, repr string, config map[string]interface{}) {
-	kv := strings.Split(repr, "=")
-	require.Len(t, kv, 2, "repr: %s", repr)
-
-	keyParts := strings.Split(kv[0], ".")
-	require.True(t, len(keyParts) >= 2, len(keyParts))
-
-	lastObj := config
-	for _, k := range keyParts[:len(keyParts)-1] {
-		var v map[string]interface{}
-		if lastObj[k] == nil {
-			v = map[string]interface{}{}
-		} else {
-			v = lastObj[k].(map[string]interface{})
-		}
-
-		lastObj[k] = v
-		lastObj = v
-	}
-
-	lastObj[keyParts[len(keyParts)-1]] = kv[1]
-}
-
 func skipMultilineComment(scanner *bufio.Scanner) {
 	for line := scanner.Text(); !strings.Contains(line, "*/") && scanner.Scan(); {
 		line = scanner.Text()
@@ -324,14 +271,6 @@ func extractRunContextFromComments(t *testing.T, sourcePath string) *runContext
 			rc.args = strings.Split(after, " ")
 			continue
 
-		case "//golangcitest:config":
-			require.NotEmpty(t, after)
-			if rc.config == nil {
-				rc.config = map[string]interface{}{}
-			}
-			buildConfigFromShortRepr(t, after, rc.config)
-			continue
-
 		case "//golangcitest:config_path":
 			require.NotEmpty(t, after)
 			rc.configPath = after
@@ -394,10 +333,7 @@ func TestTparallel(t *testing.T) {
 
 		args = append(args, rc.args...)
 
-		cfg, err := yaml.Marshal(rc.config)
-		require.NoError(t, err)
-
-		testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...).
+		testshared.NewLintRunner(t).RunWithYamlConfig("", args...).
 			ExpectHasIssue(
 				"testdata/tparallel/missing_toplevel_test.go:7:6: TestTopLevel should call t.Parallel on the top level as well as its subtests\n",
 			)
@@ -416,10 +352,7 @@ func TestTparallel(t *testing.T) {
 
 		args = append(args, rc.args...)
 
-		cfg, err := yaml.Marshal(rc.config)
-		require.NoError(t, err)
-
-		testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...).
+		testshared.NewLintRunner(t).RunWithYamlConfig("", args...).
 			ExpectHasIssue(
 				"testdata/tparallel/missing_subtest_test.go:7:6: TestSubtests's subtests should call t.Parallel\n",
 			)
@@ -438,9 +371,6 @@ func TestTparallel(t *testing.T) {
 
 		args = append(args, rc.args...)
 
-		cfg, err := yaml.Marshal(rc.config)
-		require.NoError(t, err)
-
-		testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...).ExpectNoIssues()
+		testshared.NewLintRunner(t).RunWithYamlConfig("", args...).ExpectNoIssues()
 	})
 }

test/testshared/testshared.go

@@ -153,8 +153,7 @@ func (r *LintRunner) RunCommandWithYamlConfig(cfg, command string, args ...strin
 		defer os.Remove(cfgPath)
 	}
 
-	cfg = strings.TrimSpace(cfg)
-	cfg = strings.ReplaceAll(cfg, "\t", " ")
+	cfg = strings.ReplaceAll(strings.TrimSpace(cfg), "\t", " ")
 
 	err = os.WriteFile(cfgPath, []byte(cfg), os.ModePerm)
 	assert.NoError(r.t, err)