review

ldez · ldez · commit 5ec43d0f09ed · 2025-03-07T14:06:02.000+01:00
diff --git a/pkg/commands/internal/migrate/cloner/cloner.go b/pkg/commands/internal/migrate/cloner/cloner.go
@@ -16,11 +16,11 @@ import (
 	"golang.org/x/tools/imports"
 )
 
-const newPkgName = "two"
+const newPkgName = "versiontwo"
 
 const (
 	srcDir = "./pkg/config"
-	dstDir = "./pkg/commands/internal/migrate/two"
+	dstDir = "./pkg/commands/internal/migrate/versiontwo"
 )
 
 func main() {
diff --git a/pkg/commands/internal/migrate/migrate_linter_names.go b/pkg/commands/internal/migrate/migrate_linter_names.go
@@ -623,11 +623,6 @@ func allLinters() []LinterInfo {
 			Presets: []string{"style"},
 			Slow:    true,
 		},
-		{
-			Name:    "tenv",
-			Presets: []string{"test"},
-			Slow:    true,
-		},
 		{
 			Name:    "testableexamples",
 			Presets: []string{"test"},
diff --git a/pkg/commands/internal/migrate/migrate_linter_names_test.go b/pkg/commands/internal/migrate/migrate_linter_names_test.go
@@ -148,7 +148,7 @@ func Test_enableAllFilter(t *testing.T) {
 				Fast:      ptr.Pointer(true),
 				Presets:   nil,
 			},
-			expected: []string{"asasalint", "bodyclose", "canonicalheader", "containedctx", "contextcheck", "durationcheck", "err113", "errcheck", "errchkjson", "errname", "errorlint", "exhaustive", "exhaustruct", "exptostd", "fatcontext", "forbidigo", "forcetypeassert", "ginkgolinter", "gochecknoglobals", "gochecksumtype", "gocritic", "gosec", "gosimple", "gosmopolitan", "govet", "iface", "importas", "intrange", "ireturn", "loggercheck", "makezero", "mirror", "musttag", "nilerr", "nilnesserr", "nilnil", "noctx", "nonamedreturns", "paralleltest", "perfsprint", "protogetter", "reassign", "recvcheck", "revive", "rowserrcheck", "sloglint", "spancheck", "sqlclosecheck", "staticcheck", "stylecheck", "tagliatelle", "tenv", "testifylint", "thelper", "tparallel", "unconvert", "unparam", "unused", "usetesting", "varnamelen", "wastedassign", "wrapcheck", "zerologlint"},
+			expected: []string{"asasalint", "bodyclose", "canonicalheader", "containedctx", "contextcheck", "durationcheck", "err113", "errcheck", "errchkjson", "errname", "errorlint", "exhaustive", "exhaustruct", "exptostd", "fatcontext", "forbidigo", "forcetypeassert", "ginkgolinter", "gochecknoglobals", "gochecksumtype", "gocritic", "gosec", "gosimple", "gosmopolitan", "govet", "iface", "importas", "intrange", "ireturn", "loggercheck", "makezero", "mirror", "musttag", "nilerr", "nilnesserr", "nilnil", "noctx", "nonamedreturns", "paralleltest", "perfsprint", "protogetter", "reassign", "recvcheck", "revive", "rowserrcheck", "sloglint", "spancheck", "sqlclosecheck", "staticcheck", "stylecheck", "tagliatelle", "testifylint", "thelper", "tparallel", "unconvert", "unparam", "unused", "usetesting", "varnamelen", "wastedassign", "wrapcheck", "zerologlint"},
 		},
 		{
 			desc: "disable",
@@ -168,7 +168,7 @@ func Test_enableAllFilter(t *testing.T) {
 				Fast:      ptr.Pointer(true),
 				Presets:   nil,
 			},
-			expected: []string{"asasalint", "bodyclose", "canonicalheader", "containedctx", "contextcheck", "durationcheck", "err113", "errcheck", "errchkjson", "errname", "errorlint", "exhaustive", "exhaustruct", "exptostd", "fatcontext", "forbidigo", "forcetypeassert", "ginkgolinter", "gochecknoglobals", "gochecksumtype", "gocritic", "gosec", "gosimple", "gosmopolitan", "govet", "iface", "importas", "intrange", "ireturn", "lll", "loggercheck", "makezero", "mirror", "misspell", "musttag", "nilerr", "nilnesserr", "nilnil", "noctx", "nonamedreturns", "paralleltest", "perfsprint", "protogetter", "reassign", "recvcheck", "revive", "rowserrcheck", "sloglint", "spancheck", "sqlclosecheck", "staticcheck", "stylecheck", "tagliatelle", "tenv", "testifylint", "thelper", "tparallel", "unconvert", "unparam", "unused", "usetesting", "varnamelen", "wastedassign", "wrapcheck", "zerologlint"},
+			expected: []string{"asasalint", "bodyclose", "canonicalheader", "containedctx", "contextcheck", "durationcheck", "err113", "errcheck", "errchkjson", "errname", "errorlint", "exhaustive", "exhaustruct", "exptostd", "fatcontext", "forbidigo", "forcetypeassert", "ginkgolinter", "gochecknoglobals", "gochecksumtype", "gocritic", "gosec", "gosimple", "gosmopolitan", "govet", "iface", "importas", "intrange", "ireturn", "lll", "loggercheck", "makezero", "mirror", "misspell", "musttag", "nilerr", "nilnesserr", "nilnil", "noctx", "nonamedreturns", "paralleltest", "perfsprint", "protogetter", "reassign", "recvcheck", "revive", "rowserrcheck", "sloglint", "spancheck", "sqlclosecheck", "staticcheck", "stylecheck", "tagliatelle", "testifylint", "thelper", "tparallel", "unconvert", "unparam", "unused", "usetesting", "varnamelen", "wastedassign", "wrapcheck", "zerologlint"},
 		},
 		{
 			desc: "disable, enable, fast",
@@ -179,7 +179,7 @@ func Test_enableAllFilter(t *testing.T) {
 				Fast:      ptr.Pointer(true),
 				Presets:   nil,
 			},
-			expected: []string{"asasalint", "bodyclose", "containedctx", "contextcheck", "durationcheck", "err113", "errcheck", "errchkjson", "errorlint", "exhaustive", "exhaustruct", "exptostd", "fatcontext", "forbidigo", "forcetypeassert", "ginkgolinter", "gochecknoglobals", "gochecksumtype", "gocritic", "gosec", "gosimple", "gosmopolitan", "govet", "iface", "importas", "intrange", "ireturn", "lll", "loggercheck", "makezero", "mirror", "misspell", "musttag", "nilerr", "nilnesserr", "nilnil", "noctx", "nonamedreturns", "paralleltest", "perfsprint", "protogetter", "reassign", "recvcheck", "revive", "rowserrcheck", "sloglint", "spancheck", "sqlclosecheck", "staticcheck", "stylecheck", "tagliatelle", "tenv", "testifylint", "thelper", "tparallel", "unconvert", "unparam", "unused", "usetesting", "varnamelen", "wastedassign", "wrapcheck", "zerologlint"},
+			expected: []string{"asasalint", "bodyclose", "containedctx", "contextcheck", "durationcheck", "err113", "errcheck", "errchkjson", "errorlint", "exhaustive", "exhaustruct", "exptostd", "fatcontext", "forbidigo", "forcetypeassert", "ginkgolinter", "gochecknoglobals", "gochecksumtype", "gocritic", "gosec", "gosimple", "gosmopolitan", "govet", "iface", "importas", "intrange", "ireturn", "lll", "loggercheck", "makezero", "mirror", "misspell", "musttag", "nilerr", "nilnesserr", "nilnil", "noctx", "nonamedreturns", "paralleltest", "perfsprint", "protogetter", "reassign", "recvcheck", "revive", "rowserrcheck", "sloglint", "spancheck", "sqlclosecheck", "staticcheck", "stylecheck", "tagliatelle", "testifylint", "thelper", "tparallel", "unconvert", "unparam", "unused", "usetesting", "varnamelen", "wastedassign", "wrapcheck", "zerologlint"},
 		},
 	}
 
diff --git a/pkg/commands/internal/migrate/migrate_linters_settings.go b/pkg/commands/internal/migrate/migrate_linters_settings.go
@@ -76,7 +76,6 @@ func toLinterSettings(old versionone.LintersSettings) versiontwo.LintersSettings
 		Staticcheck:     toStaticCheckSettings(old),
 		TagAlign:        toTagAlignSettings(old.TagAlign),
 		Tagliatelle:     toTagliatelleSettings(old.Tagliatelle),
-		Tenv:            toTenvSettings(old.Tenv),
 		Testifylint:     toTestifylintSettings(old.Testifylint),
 		Testpackage:     toTestpackageSettings(old.Testpackage),
 		Thelper:         toThelperSettings(old.Thelper),
@@ -816,12 +815,6 @@ func toTagliatelleSettings(old versionone.TagliatelleSettings) versiontwo.Taglia
 	return versiontwo.TagliatelleSettings{Case: tcase}
 }
 
-func toTenvSettings(old versionone.TenvSettings) versiontwo.TenvSettings {
-	return versiontwo.TenvSettings{
-		All: old.All,
-	}
-}
-
 func toTestifylintSettings(old versionone.TestifylintSettings) versiontwo.TestifylintSettings {
 	return versiontwo.TestifylintSettings{
 		EnableAll:        old.EnableAll,
diff --git a/pkg/commands/internal/migrate/testdata/linters-settings_tenv.golden.yml b/pkg/commands/internal/migrate/testdata/linters-settings_tenv.golden.yml
diff --git a/pkg/commands/internal/migrate/testdata/linters-settings_tenv.yml b/pkg/commands/internal/migrate/testdata/linters-settings_tenv.yml
diff --git a/pkg/commands/internal/migrate/testdata/linters_02.golden.yml b/pkg/commands/internal/migrate/testdata/linters_02.golden.yml
@@ -91,7 +91,6 @@ linters:
     - staticcheck
     - tagalign
     - tagliatelle
-    - tenv
     - testableexamples
     - testifylint
     - testpackage
diff --git a/pkg/commands/internal/migrate/testdata/linters_03.golden.yml b/pkg/commands/internal/migrate/testdata/linters_03.golden.yml
@@ -41,7 +41,6 @@ linters:
     - mnd
     - mycustomlinter3
     - mycustomlinter4
-    - tenv
 formatters:
   enable:
     - gofmt
diff --git a/pkg/commands/internal/migrate/testdata/linters_06.golden.yml b/pkg/commands/internal/migrate/testdata/linters_06.golden.yml
@@ -43,7 +43,6 @@ linters:
     - mnd
     - mycustomlinter3
     - mycustomlinter4
-    - tenv
 formatters:
   enable:
     - gci
diff --git a/pkg/commands/internal/migrate/testdata/linters_08.golden.yml b/pkg/commands/internal/migrate/testdata/linters_08.golden.yml
@@ -64,7 +64,6 @@ linters:
     - sqlclosecheck
     - staticcheck
     - tagliatelle
-    - tenv
     - testifylint
     - thelper
     - tparallel
diff --git a/pkg/commands/internal/migrate/testdata/linters_09.golden.yml b/pkg/commands/internal/migrate/testdata/linters_09.golden.yml
@@ -44,7 +44,6 @@ linters:
     - mycustomlinter3
     - mycustomlinter4
     - staticcheck
-    - tenv
 formatters:
   enable:
     - gofmt
diff --git a/pkg/commands/internal/migrate/versiontwo/linters_settings.go b/pkg/commands/internal/migrate/versiontwo/linters_settings.go
diff --git a/pkg/commands/migrate.go b/pkg/commands/migrate.go
@@ -98,12 +98,14 @@ func (c *migrateCommand) execute(_ *cobra.Command, _ []string) error {
 		return err
 	}
 
+	c.log.Warnf("The configuration comments are not migrated.")
+
 	c.log.Infof("Migrating v1 configuration file: %s", srcPath)
 
 	ext := filepath.Ext(srcPath)
 
 	if c.opts.format != "" {
-		ext = "." + strings.TrimPrefix(c.opts.format, ".")
+		ext = "." + c.opts.format
 	}
 
 	if !strings.EqualFold(filepath.Ext(srcPath), ext) {
diff --git a/pkg/config/base_loader.go b/pkg/config/base_loader.go
@@ -16,7 +16,7 @@ import (
 	"github.com/golangci/golangci-lint/pkg/logutils"
 )
 
-type CFG interface {
+type BaseConfig interface {
 	IsInternalTest() bool
 	SetConfigDir(dir string)
 }
@@ -28,11 +28,11 @@ type BaseLoader struct {
 
 	log logutils.Log
 
-	cfg  CFG
+	cfg  BaseConfig
 	args []string
 }
 
-func NewBaseLoader(log logutils.Log, v *viper.Viper, opts LoaderOptions, cfg CFG, args []string) *BaseLoader {
+func NewBaseLoader(log logutils.Log, v *viper.Viper, opts LoaderOptions, cfg BaseConfig, args []string) *BaseLoader {
 	return &BaseLoader{
 		opts:  opts,
 		viper: v,
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -262,7 +262,6 @@ type LintersSettings struct {
 	Staticcheck     StaticCheckSettings     `mapstructure:"staticcheck"`
 	TagAlign        TagAlignSettings        `mapstructure:"tagalign"`
 	Tagliatelle     TagliatelleSettings     `mapstructure:"tagliatelle"`
-	Tenv            TenvSettings            `mapstructure:"tenv"`
 	Testifylint     TestifylintSettings     `mapstructure:"testifylint"`
 	Testpackage     TestpackageSettings     `mapstructure:"testpackage"`
 	Thelper         ThelperSettings         `mapstructure:"thelper"`
@@ -895,10 +894,6 @@ type ThelperOptions struct {
 	Begin *bool `mapstructure:"begin"`
 }
 
-type TenvSettings struct {
-	All bool `mapstructure:"all"`
-}
-
 type UseStdlibVarsSettings struct {
 	HTTPMethod         bool `mapstructure:"http-method"`
 	HTTPStatusCode     bool `mapstructure:"http-status-code"`

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ import (`
`16`	`16`	`"golang.org/x/tools/imports"`
`17`	`17`	`)`
`18`	`18`
`19`		`-const newPkgName = "two"`
	`19`	`+const newPkgName = "versiontwo"`
`20`	`20`
`21`	`21`	`const (`
`22`	`22`	`srcDir = "./pkg/config"`
`23`		`- dstDir = "./pkg/commands/internal/migrate/two"`
	`23`	`+ dstDir = "./pkg/commands/internal/migrate/versiontwo"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`func main() {`