review: rename configuration packages

Author: ldez

pkg/commands/internal/migrate/migrate.go

@@ -1,13 +1,13 @@
 package migrate
 
 import (
-	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/one"
 	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
-	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/two"
+	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
+	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
 )
 
-func ToConfig(old *one.Config) *two.Config {
-	return &two.Config{
+func ToConfig(old *versionone.Config) *versiontwo.Config {
+	return &versiontwo.Config{
 		Version:    ptr.Pointer("2"),
 		Linters:    toLinters(old),
 		Formatters: toFormatters(old),

pkg/commands/internal/migrate/migrate_formatters.go

@@ -4,12 +4,12 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/one"
 	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
-	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/two"
+	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
+	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
 )
 
-func toFormatters(old *one.Config) two.Formatters {
+func toFormatters(old *versionone.Config) versiontwo.Formatters {
 	enable, _ := ProcessEffectiveLinters(old.Linters)
 
 	formatterNames := onlyFormatterNames(enable)
@@ -19,23 +19,23 @@ func toFormatters(old *one.Config) two.Formatters {
 		paths = slices.Concat(old.Issues.ExcludeFiles, old.Issues.ExcludeDirs)
 	}
 
-	return two.Formatters{
+	return versiontwo.Formatters{
 		Enable: formatterNames,
-		Settings: two.FormatterSettings{
+		Settings: versiontwo.FormatterSettings{
 			Gci:       toGciSettings(old.LintersSettings.Gci),
 			GoFmt:     toGoFmtSettings(old.LintersSettings.GoFmt),
 			GoFumpt:   toGoFumptSettings(old.LintersSettings.GoFumpt),
 			GoImports: toGoImportsSettings(old.LintersSettings.GoImports),
 		},
-		Exclusions: two.FormatterExclusions{
+		Exclusions: versiontwo.FormatterExclusions{
 			Generated: toExclusionGenerated(old.Issues.ExcludeGenerated),
 			Paths:     paths,
 		},
 	}
 }
 
-func toGciSettings(old one.GciSettings) two.GciSettings {
-	return two.GciSettings{
+func toGciSettings(old versionone.GciSettings) versiontwo.GciSettings {
+	return versiontwo.GciSettings{
 		Sections:         old.Sections,
 		NoInlineComments: old.NoInlineComments,
 		NoPrefixComments: old.NoPrefixComments,
@@ -44,13 +44,13 @@ func toGciSettings(old one.GciSettings) two.GciSettings {
 	}
 }
 
-func toGoFmtSettings(old one.GoFmtSettings) two.GoFmtSettings {
-	settings := two.GoFmtSettings{
+func toGoFmtSettings(old versionone.GoFmtSettings) versiontwo.GoFmtSettings {
+	settings := versiontwo.GoFmtSettings{
 		Simplify: old.Simplify,
 	}
 
 	for _, rule := range old.RewriteRules {
-		settings.RewriteRules = append(settings.RewriteRules, two.GoFmtRewriteRule{
+		settings.RewriteRules = append(settings.RewriteRules, versiontwo.GoFmtRewriteRule{
 			Pattern:     rule.Pattern,
 			Replacement: rule.Replacement,
 		})
@@ -59,21 +59,21 @@ func toGoFmtSettings(old one.GoFmtSettings) two.GoFmtSettings {
 	return settings
 }
 
-func toGoFumptSettings(old one.GoFumptSettings) two.GoFumptSettings {
-	return two.GoFumptSettings{
+func toGoFumptSettings(old versionone.GoFumptSettings) versiontwo.GoFumptSettings {
+	return versiontwo.GoFumptSettings{
 		ModulePath: old.ModulePath,
 		ExtraRules: old.ExtraRules,
 	}
 }
 
-func toGoImportsSettings(old one.GoImportsSettings) two.GoImportsSettings {
+func toGoImportsSettings(old versionone.GoImportsSettings) versiontwo.GoImportsSettings {
 	var localPrefixes []string
 
 	if ptr.Deref(old.LocalPrefixes) != "" {
 		localPrefixes = strings.Split(ptr.Deref(old.LocalPrefixes), ",")
 	}
 
-	return two.GoImportsSettings{
+	return versiontwo.GoImportsSettings{
 		LocalPrefixes: localPrefixes,
 	}
 }

pkg/commands/internal/migrate/migrate_issues.go

@@ -1,12 +1,12 @@
 package migrate
 
 import (
-	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/one"
-	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/two"
+	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
+	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
 )
 
-func toIssues(old *one.Config) two.Issues {
-	return two.Issues{
+func toIssues(old *versionone.Config) versiontwo.Issues {
+	return versiontwo.Issues{
 		MaxIssuesPerLinter: old.Issues.MaxIssuesPerLinter,
 		MaxSameIssues:      old.Issues.MaxSameIssues,
 		UniqByLine:         old.Issues.UniqByLine,

pkg/commands/internal/migrate/migrate_linter_names.go

@@ -3,8 +3,8 @@ package migrate
 import (
 	"slices"
 
-	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/one"
 	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
+	"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
 )
 
 type LinterInfo struct {
@@ -33,7 +33,7 @@ func (l *LinterInfo) hasPresets(names []string) bool {
 	return false
 }
 
-func ProcessEffectiveLinters(old one.Linters) (enable, disable []string) {
+func ProcessEffectiveLinters(old versionone.Linters) (enable, disable []string) {
 	switch {
 	case ptr.Deref(old.DisableAll):
 		return disableAllFilter(old), nil
@@ -45,7 +45,7 @@ func ProcessEffectiveLinters(old one.Linters) (enable, disable []string) {
 }
 
 // disableAllFilter generates the value of `enable` when `disable-all` is `true`.
-func disableAllFilter(old one.Linters) []string {
+func disableAllFilter(old versionone.Linters) []string {
 	// Note:
 	// - disable-all + enable-all
 	// 		=> impossible (https://github.com/golangci/golangci-lint/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L38)
@@ -74,7 +74,7 @@ func disableAllFilter(old one.Linters) []string {
 }
 
 // enableAllFilter generates the value of `disable` when `enable-all` is `true`.
-func enableAllFilter(old one.Linters) []string {
+func enableAllFilter(old versionone.Linters) []string {
 	// Note:
 	// - enable-all + disable-all
 	// 		=> impossible (https://github.com/golangci/golangci-lint/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L38)
@@ -109,7 +109,7 @@ func enableAllFilter(old one.Linters) []string {
 }
 
 // defaultLintersFilter generates the values of `enable` and `disable` when using default linters.
-func defaultLintersFilter(old one.Linters) (enable, disable []string) {
+func defaultLintersFilter(old versionone.Linters) (enable, disable []string) {
 	// Note:
 	// - a linter cannot be inside `enable` and `disable` in the same configuration
 	// 		=> https://github.com/golangci/golangci-lint/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L66
@@ -161,7 +161,7 @@ func defaultLintersFilter(old one.Linters) (enable, disable []string) {
 }
 
 // defaultLintersEnableFilter generates the value of `enable` when using default linters.
-func defaultLintersEnableFilter(old one.Linters, effectiveDisabled []LinterInfo) []LinterInfo {
+func defaultLintersEnableFilter(old versionone.Linters, effectiveDisabled []LinterInfo) []LinterInfo {
 	// presets - slow + enable - default - [effective disable] => effective enable
 	return removeLinters(
 		filter(
@@ -178,7 +178,7 @@ func defaultLintersEnableFilter(old one.Linters, effectiveDisabled []LinterInfo)
 }
 
 // defaultLintersDisableFilter generates the value of `disable` when using default linters.
-func defaultLintersDisableFilter(old one.Linters) []LinterInfo {
+func defaultLintersDisableFilter(old versionone.Linters) []LinterInfo {
 	// (default - fast) - enable + disable => effective disable
 	return slices.Concat(
 		removeLinters(
@@ -731,7 +731,7 @@ func removeLinters(linters, toRemove []LinterInfo) []LinterInfo {
 	})
 }
 
-func allEnabled(old one.Linters, linters []LinterInfo) []LinterInfo {
+func allEnabled(old versionone.Linters, linters []LinterInfo) []LinterInfo {
 	var results []LinterInfo
 
 	for _, linter := range linters {
@@ -746,7 +746,7 @@ func allEnabled(old one.Linters, linters []LinterInfo) []LinterInfo {
 	return results
 }
 
-func allDisabled(old one.Linters, linters []LinterInfo) []LinterInfo {
+func allDisabled(old versionone.Linters, linters []LinterInfo) []LinterInfo {
 	var results []LinterInfo
 
 	for _, linter := range linters {
@@ -785,7 +785,7 @@ func mergeFilters(linter LinterInfo, fns []fnFilter) bool {
 
 type fnFilter func(linter LinterInfo) bool
 
-func onlyPresets(old one.Linters) fnFilter {
+func onlyPresets(old versionone.Linters) fnFilter {
 	return func(linter LinterInfo) bool {
 		return linter.hasPresets(old.Presets)
 	}
@@ -799,7 +799,7 @@ func notDefault(linter LinterInfo) bool {
 	return !linter.Default
 }
 
-func keepFast(old one.Linters) fnFilter {
+func keepFast(old versionone.Linters) fnFilter {
 	return func(linter LinterInfo) bool {
 		if !ptr.Deref(old.Fast) {
 			return true
@@ -809,7 +809,7 @@ func keepFast(old one.Linters) fnFilter {
 	}
 }
 
-func keepSlow(old one.Linters) fnFilter {
+func keepSlow(old versionone.Linters) fnFilter {
 	return func(linter LinterInfo) bool {
 		if !ptr.Deref(old.Fast) {
 			return false