dev: replace golangcitest:config by golangcitest:config_path

ldez · ldez · commit c2ced0fe21fd · 2022-08-15T06:34:13.000+02:00
diff --git a/test/linters_test.go b/test/linters_test.go
@@ -82,7 +82,7 @@ func TestGoimportsLocal(t *testing.T) {
 
 	args = append(args, rc.args...)
 
-	cfg, err := yaml.Marshal(rc.config)
+	cfg, err := os.ReadFile(rc.configPath)
 	require.NoError(t, err)
 
 	testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...).
diff --git a/test/testdata/configs/cyclop.yml b/test/testdata/configs/cyclop.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  cyclop:
+    max-complexity: 15
diff --git a/test/testdata/configs/dupl.yml b/test/testdata/configs/dupl.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  dupl:
+    threshold: 20
diff --git a/test/testdata/configs/errcheck_exclude.yml b/test/testdata/configs/errcheck_exclude.yml
@@ -0,0 +1,4 @@
+linters-settings:
+  errcheck:
+    check-blank: true
+    exclude: testdata/errcheck/exclude.txt
diff --git a/test/testdata/configs/errcheck_ignore_default.yml b/test/testdata/configs/errcheck_ignore_default.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  errcheck:
+    check-blank: true
diff --git a/test/testdata/configs/errcheck_type_assertions.yml b/test/testdata/configs/errcheck_type_assertions.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  errcheck:
+    check-type-assertions: true
diff --git a/test/testdata/configs/forbidigo_include_godoc_examples.yml b/test/testdata/configs/forbidigo_include_godoc_examples.yml
@@ -0,0 +1,4 @@
+linters-settings:
+  forbidigo:
+   exclude-godoc-examples: false
+
diff --git a/test/testdata/configs/funlen.yml b/test/testdata/configs/funlen.yml
@@ -0,0 +1,4 @@
+linters-settings:
+  funlen:
+    lines: 20
+    statements: 10
diff --git a/test/testdata/configs/gocognit.yml b/test/testdata/configs/gocognit.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  gocognit:
+    min-complexity: 2
diff --git a/test/testdata/configs/goconst_calls_enabled.yml b/test/testdata/configs/goconst_calls_enabled.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  goconst:
+    ignore-calls: false
diff --git a/test/testdata/configs/goconst_dont_ignore.yml b/test/testdata/configs/goconst_dont_ignore.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  goconst:
+    ignore-tests: false
diff --git a/test/testdata/configs/goconst_ignore.yml b/test/testdata/configs/goconst_ignore.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  goconst:
+    ignore-tests: true
diff --git a/test/testdata/configs/gocyclo.yml b/test/testdata/configs/gocyclo.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  gocyclo:
+    min-complexity: 20
diff --git a/test/testdata/configs/godox.yml b/test/testdata/configs/godox.yml
@@ -0,0 +1,5 @@
+linters-settings:
+  godox:
+    keywords:
+      - FIXME
+      - TODO
diff --git a/test/testdata/configs/gofmt_no_simplify.yml b/test/testdata/configs/gofmt_no_simplify.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  gofmt:
+    simplify: false
diff --git a/test/testdata/configs/gofumpt-fix.yml b/test/testdata/configs/gofumpt-fix.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  gofumpt:
+    extra-rules: true
diff --git a/test/testdata/configs/gofumpt_with_extra.yml b/test/testdata/configs/gofumpt_with_extra.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  gofumpt:
+    extra-rules: true
diff --git a/test/testdata/configs/goimports.yml b/test/testdata/configs/goimports.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  goimports:
+    local-prefixes: github.com/golangci/golangci-lint
diff --git a/test/testdata/configs/govet.yml b/test/testdata/configs/govet.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  govet:
+    check-shadowing: true
diff --git a/test/testdata/configs/govet_fieldalignment.yml b/test/testdata/configs/govet_fieldalignment.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  govet:
+    enable: fieldalignment
diff --git a/test/testdata/configs/govet_ifaceassert.yml b/test/testdata/configs/govet_ifaceassert.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  govet:
+    enable: ifaceassert
diff --git a/test/testdata/configs/lll.yml b/test/testdata/configs/lll.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  lll:
+    tab-width: 4
diff --git a/test/testdata/configs/makezero_always.yml b/test/testdata/configs/makezero_always.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  makezero:
+    always: true
diff --git a/test/testdata/configs/nestif.yml b/test/testdata/configs/nestif.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  nestif:
+    min-complexity: 1
diff --git a/test/testdata/configs/nolintlint.yml b/test/testdata/configs/nolintlint.yml
@@ -0,0 +1,4 @@
+linters-settings:
+  nolintlint:
+    require-explanation: true
+    require-specific: true
diff --git a/test/testdata/configs/nolintlint_unused.yml b/test/testdata/configs/nolintlint_unused.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  nolintlint:
+    allow-unused: false
diff --git a/test/testdata/configs/whitespace-fix.yml b/test/testdata/configs/whitespace-fix.yml
@@ -0,0 +1,4 @@
+linters-settings:
+  whitespace:
+    multi-if: true
+    multi-func: true
diff --git a/test/testdata/configs/wsl.yml b/test/testdata/configs/wsl.yml
@@ -0,0 +1,3 @@
+linters-settings:
+  wsl:
+    tests: 1
diff --git a/test/testdata/cyclop.go b/test/testdata/cyclop.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Ecyclop
-//golangcitest:config linters-settings.cyclop.max-complexity=15
+//golangcitest:config_path testdata/configs/cyclop.yml
 package testdata
 
 func cyclopComplexFunc(s string) { // ERROR "calculated cyclomatic complexity for function cyclopComplexFunc is 22, max is 15"
diff --git a/test/testdata/dupl.go b/test/testdata/dupl.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Edupl
-//golangcitest:config linters-settings.dupl.threshold=20
+//golangcitest:config_path testdata/configs/dupl.yml
 package testdata
 
 type DuplLogger struct{}
diff --git a/test/testdata/errcheck_exclude.go b/test/testdata/errcheck_exclude.go
@@ -1,6 +1,5 @@
 //golangcitest:args -Eerrcheck
-//golangcitest:config linters-settings.errcheck.check-blank=true
-//golangcitest:config linters-settings.errcheck.exclude=testdata/errcheck/exclude.txt
+//golangcitest:config_path testdata/configs/errcheck_exclude.yml
 package testdata
 
 import (
diff --git a/test/testdata/errcheck_ignore_default.go b/test/testdata/errcheck_ignore_default.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Eerrcheck
-//golangcitest:config linters-settings.errcheck.check-blank=true
+//golangcitest:config_path testdata/configs/errcheck_ignore_default.yml
 package testdata
 
 import (
diff --git a/test/testdata/errcheck_type_assertions.go b/test/testdata/errcheck_type_assertions.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Eerrcheck
-//golangcitest:config linters-settings.errcheck.check-type-assertions=true
+//golangcitest:config_path testdata/configs/errcheck_type_assertions.yml
 package testdata
 
 func ErrorTypeAssertion(filter map[string]interface{}) bool {
diff --git a/test/testdata/fix/in/gofumpt.go b/test/testdata/fix/in/gofumpt.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egofumpt
-//golangcitest:config linters-settings.gofumpt.extra-rules=true
+//golangcitest:config_path testdata/configs/gofumpt-fix.yml
 package p
 
 import "fmt"
diff --git a/test/testdata/fix/in/whitespace.go b/test/testdata/fix/in/whitespace.go
@@ -1,6 +1,5 @@
 //golangcitest:args -Ewhitespace
-//golangcitest:config linters-settings.whitespace.multi-if=true
-//golangcitest:config linters-settings.whitespace.multi-func=true
+//golangcitest:config_path testdata/configs/whitespace-fix.yml
 package p
 
 import "fmt"
diff --git a/test/testdata/fix/out/gofumpt.go b/test/testdata/fix/out/gofumpt.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egofumpt
-//golangcitest:config linters-settings.gofumpt.extra-rules=true
+//golangcitest:config_path testdata/configs/gofumpt-fix.yml
 package p
 
 import "fmt"
diff --git a/test/testdata/fix/out/whitespace.go b/test/testdata/fix/out/whitespace.go
@@ -1,6 +1,5 @@
 //golangcitest:args -Ewhitespace
-//golangcitest:config linters-settings.whitespace.multi-if=true
-//golangcitest:config linters-settings.whitespace.multi-func=true
+//golangcitest:config_path testdata/configs/whitespace-fix.yml
 package p
 
 import "fmt"
diff --git a/test/testdata/forbidigo_include_godoc_examples_test.go b/test/testdata/forbidigo_include_godoc_examples_test.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Eforbidigo
-//golangcitest:config linters-settings.forbidigo.exclude-godoc-examples=false
+//golangcitest:config_path testdata/configs/forbidigo_include_godoc_examples.yml
 package testdata
 
 import "fmt"
diff --git a/test/testdata/funlen.go b/test/testdata/funlen.go
@@ -1,6 +1,5 @@
 //golangcitest:args -Efunlen
-//golangcitest:config linters-settings.funlen.lines=20
-//golangcitest:config linters-settings.funlen.statements=10
+//golangcitest:config_path testdata/configs/funlen.yml
 package testdata
 
 func TooManyLines() { // ERROR `Function 'TooManyLines' is too long \(22 > 20\)`
diff --git a/test/testdata/gocognit.go b/test/testdata/gocognit.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egocognit
-//golangcitest:config linters-settings.gocognit.min-complexity=2
+//golangcitest:config_path testdata/configs/gocognit.yml
 package testdata
 
 func GoCognit_CC4_GetWords(number int) string { // ERROR "cognitive complexity 4 of func .* is high .*"
diff --git a/test/testdata/goconst_calls_enabled.go b/test/testdata/goconst_calls_enabled.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egoconst
-//golangcitest:config linters-settings.goconst.ignore-calls=false
+//golangcitest:config_path testdata/configs/goconst_calls_enabled.yml
 package testdata
 
 import "fmt"
diff --git a/test/testdata/goconst_dont_ignore_test.go b/test/testdata/goconst_dont_ignore_test.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egoconst
-//golangcitest:config linters-settings.goconst.ignore-tests=false
+//golangcitest:config_path testdata/configs/goconst_dont_ignore.yml
 package testdata
 
 import (
diff --git a/test/testdata/goconst_ignore_test.go b/test/testdata/goconst_ignore_test.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egoconst
-//golangcitest:config linters-settings.goconst.ignore-tests=true
+//golangcitest:config_path testdata/configs/goconst_ignore.yml
 package testdata
 
 import (
diff --git a/test/testdata/gocyclo.go b/test/testdata/gocyclo.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egocyclo
-//golangcitest:config linters-settings.gocyclo.min-complexity=20
+//golangcitest:config_path testdata/configs/gocyclo.yml
 package testdata
 
 import "net/http"
diff --git a/test/testdata/godox.go b/test/testdata/godox.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egodox
-//golangcitest:config linters-settings.godox.keywords=FIXME,TODO
+//golangcitest:config_path testdata/configs/godox.yml
 package testdata
 
 func todoLeftInCode() {
diff --git a/test/testdata/gofmt_no_simplify.go b/test/testdata/gofmt_no_simplify.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egofmt
-//golangcitest:config linters-settings.gofmt.simplify=false
+//golangcitest:config_path testdata/configs/gofmt_no_simplify.yml
 package testdata
 
 import "fmt"
diff --git a/test/testdata/gofumpt_with_extra.go b/test/testdata/gofumpt_with_extra.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egofumpt
-//golangcitest:config linters-settings.gofumpt.extra-rules=true
+//golangcitest:config_path testdata/configs/gofumpt_with_extra.yml
 package testdata
 
 import "fmt"
diff --git a/test/testdata/goimports/goimports.go b/test/testdata/goimports/goimports.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egoimports
-//golangcitest:config linters-settings.goimports.local-prefixes=github.com/golangci/golangci-lint
+//golangcitest:config_path testdata/configs/goimports.yml
 package goimports
 
 import (
diff --git a/test/testdata/govet.go b/test/testdata/govet.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egovet
-//golangcitest:config linters-settings.govet.check-shadowing=true
+//golangcitest:config_path testdata/configs/govet.yml
 package testdata
 
 import (
diff --git a/test/testdata/govet_fieldalignment.go b/test/testdata/govet_fieldalignment.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egovet
-//golangcitest:config linters-settings.govet.enable=fieldalignment
+//golangcitest:config_path testdata/configs/govet_fieldalignment.yml
 package testdata
 
 type gvfaGood struct {
diff --git a/test/testdata/govet_ifaceassert.go b/test/testdata/govet_ifaceassert.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Egovet
-//golangcitest:config linters-settings.govet.enable=ifaceassert
+//golangcitest:config_path testdata/configs/govet_ifaceassert.yml
 package testdata
 
 import (
diff --git a/test/testdata/lll.go b/test/testdata/lll.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Elll
-//golangcitest:config linters-settings.lll.tab-width=4
+//golangcitest:config_path testdata/configs/lll.yml
 package testdata
 
 func Lll() {
diff --git a/test/testdata/makezero_always.go b/test/testdata/makezero_always.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Emakezero
-//golangcitest:config linters-settings.makezero.always=true
+//golangcitest:config_path testdata/configs/makezero_always.yml
 package testdata
 
 import "math"
diff --git a/test/testdata/nestif.go b/test/testdata/nestif.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Enestif
-//golangcitest:config linters-settings.nestif.min-complexity=1
+//golangcitest:config_path testdata/configs/nestif.yml
 package testdata
 
 func _() {
diff --git a/test/testdata/nolintlint.go b/test/testdata/nolintlint.go
@@ -1,7 +1,6 @@
 //golangcitest:args -Enolintlint -Emisspell
 //golangcitest:expected_linter nolintlint
-//golangcitest:config linters-settings.nolintlint.require-explanation=true
-//golangcitest:config linters-settings.nolintlint.require-specific=true
+//golangcitest:config_path testdata/configs/nolintlint.yml
 package testdata
 
 import "fmt"
diff --git a/test/testdata/nolintlint_unused.go b/test/testdata/nolintlint_unused.go
@@ -1,6 +1,6 @@
 //golangcitest:args -Enolintlint -Evarcheck
-//golangcitest:config linters-settings.nolintlint.allow-unused=false
 //golangcitest:expected_linter nolintlint
+//golangcitest:config_path testdata/configs/nolintlint_unused.yml
 package testdata
 
 import "fmt"
diff --git a/test/testdata/wsl.go b/test/testdata/wsl.go
@@ -1,5 +1,5 @@
 //golangcitest:args -Ewsl
-//golangcitest:config linters-settings.wsl.tests=1
+//golangcitest:config_path testdata/configs/wsl.yml
 package testdata
 
 import (

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+linters-settings:`
	`2`	`+ cyclop:`
	`3`	`+ max-complexity: 15`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+linters-settings:`
	`2`	`+ dupl:`
	`3`	`+ threshold: 20`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+linters-settings:`
	`2`	`+ errcheck:`
	`3`	`+ check-blank: true`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+linters-settings:`
	`2`	`+ gocognit:`
	`3`	`+ min-complexity: 2`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+linters-settings:`
	`2`	`+ goconst:`
	`3`	`+ ignore-calls: false`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+linters-settings:`
	`2`	`+ gocyclo:`
	`3`	`+ min-complexity: 20`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +linters-settings:
 +  godox:
 +    keywords:
 +      - FIXME
 +      - TODO
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+linters-settings:`
	`2`	`+ gofmt:`
	`3`	`+ simplify: false`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+linters-settings:`
	`2`	`+ gofumpt:`
	`3`	`+ extra-rules: true`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+linters-settings:`
	`2`	`+ goimports:`
	`3`	`+ local-prefixes: github.com/golangci/golangci-lint`