Skip to content

dev: new v2 module name #5526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 11, 2025
Merged

dev: new v2 module name #5526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c14c7a
feat: new v2 module name
ldez Mar 11, 2025
37a1090
docs: new module
ldez Mar 11, 2025
3b30f2a
chore: revert unwanted changes
ldez Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .golangci.next.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,10 +1699,10 @@ linters:
# Comma-separated list of print function names to check (in addition to default, see `go tool vet help printf`).
# Default: []
funcs:
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Infof
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Warnf
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Errorf
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Fatalf
shadow:
# Whether to be strict about shadowing; can be noisy.
# Default: false
Expand Down
8 changes: 4 additions & 4 deletions .golangci.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1929,10 +1929,10 @@ linters-settings:
# Comma-separated list of print function names to check (in addition to default, see `go tool vet help printf`).
# Default: []
funcs:
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Infof
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Warnf
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Errorf
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Fatalf
shadow:
# Whether to be strict about shadowing; can be noisy.
# Default: false
Expand Down
10 changes: 5 additions & 5 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ linters:
settings:
printf:
funcs:
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Infof
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Warnf
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Errorf
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Fatalf
enable:
- nilness
- shadow
Expand Down Expand Up @@ -198,7 +198,7 @@ formatters:
replacement: 'any'
goimports:
local-prefixes:
- github.com/golangci/golangci-lint
- github.com/golangci/golangci-lint/v2
exclusions:
paths:
- test/testdata_etc # test files
Expand Down
4 changes: 2 additions & 2 deletions cmd/golangci-lint/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"runtime/debug"

"github.com/golangci/golangci-lint/pkg/commands"
"github.com/golangci/golangci-lint/pkg/exitcodes"
"github.com/golangci/golangci-lint/v2/pkg/commands"
"github.com/golangci/golangci-lint/v2/pkg/exitcodes"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion docs/src/docs/welcome/install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ These installations aren't recommended because of the following points:
7. It's slower than binary installation.

```bash
go install github.com/golangci/golangci-lint/cmd/golangci-lint@{.LatestVersion}
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@{.LatestVersion}
```

## Next
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/golangci/golangci-lint
module github.com/golangci/golangci-lint/v2

go 1.23.0

Expand Down
6 changes: 3 additions & 3 deletions internal/cache/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (

"golang.org/x/tools/go/packages"

"github.com/golangci/golangci-lint/internal/go/cache"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/timeutils"
"github.com/golangci/golangci-lint/v2/internal/go/cache"
"github.com/golangci/golangci-lint/v2/pkg/logutils"
"github.com/golangci/golangci-lint/v2/pkg/timeutils"
)

type HashMode int
Expand Down
4 changes: 2 additions & 2 deletions internal/cache/cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/tools/go/packages"

"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/timeutils"
"github.com/golangci/golangci-lint/v2/pkg/logutils"
"github.com/golangci/golangci-lint/v2/pkg/timeutils"
)

func setupCache(t *testing.T) *Cache {
Expand Down
4 changes: 2 additions & 2 deletions internal/go/cache/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (

"github.com/rogpeppe/go-internal/lockedfile"

"github.com/golangci/golangci-lint/internal/go/mmap"
"github.com/golangci/golangci-lint/internal/go/robustio"
"github.com/golangci/golangci-lint/v2/internal/go/mmap"
"github.com/golangci/golangci-lint/v2/internal/go/robustio"
)

// An ActionID is a cache action key, the hash of a complete description of a
Expand Down
2 changes: 1 addition & 1 deletion internal/go/cache/cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"testing"
"time"

"github.com/golangci/golangci-lint/internal/go/testenv"
"github.com/golangci/golangci-lint/v2/internal/go/testenv"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion internal/go/cache/prog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"sync/atomic"
"time"

"github.com/golangci/golangci-lint/internal/go/quoted"
"github.com/golangci/golangci-lint/v2/internal/go/quoted"
)

// ProgCache implements Cache via JSON messages over stdin/stdout to a child
Expand Down
2 changes: 1 addition & 1 deletion internal/x/tools/diff/myers/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package myers
import (
"strings"

"github.com/golangci/golangci-lint/internal/x/tools/diff"
"github.com/golangci/golangci-lint/v2/internal/x/tools/diff"
)

// Sources:
Expand Down
2 changes: 1 addition & 1 deletion internal/x/tools/diff/ndiff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"bytes"
"unicode/utf8"

"github.com/golangci/golangci-lint/internal/x/tools/diff/lcs"
"github.com/golangci/golangci-lint/v2/internal/x/tools/diff/lcs"
)

// Strings computes the differences between two strings.
Expand Down
6 changes: 3 additions & 3 deletions pkg/commands/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/spf13/cobra"

"github.com/golangci/golangci-lint/internal/cache"
"github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/v2/internal/cache"
"github.com/golangci/golangci-lint/v2/pkg/fsutils"
"github.com/golangci/golangci-lint/v2/pkg/logutils"
)

type cacheCommand struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/commands/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/exitcodes"
"github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/v2/pkg/config"
"github.com/golangci/golangci-lint/v2/pkg/exitcodes"
"github.com/golangci/golangci-lint/v2/pkg/fsutils"
"github.com/golangci/golangci-lint/v2/pkg/logutils"
)

type pathOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/commands/config_verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/spf13/pflag"
"gopkg.in/yaml.v3"

"github.com/golangci/golangci-lint/pkg/exitcodes"
"github.com/golangci/golangci-lint/v2/pkg/exitcodes"
)

type verifyOptions struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/commands/custom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/spf13/cobra"

"github.com/golangci/golangci-lint/pkg/commands/internal"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal"
"github.com/golangci/golangci-lint/v2/pkg/logutils"
)

const envKeepTempFiles = "CUSTOM_GCL_KEEP_TEMP_FILES"
Expand Down
6 changes: 3 additions & 3 deletions pkg/commands/flagsets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"github.com/spf13/pflag"
"github.com/spf13/viper"

"github.com/golangci/golangci-lint/pkg/commands/internal"
"github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/exitcodes"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal"
"github.com/golangci/golangci-lint/v2/pkg/config"
"github.com/golangci/golangci-lint/v2/pkg/exitcodes"
)

const defaultMaxIssuesPerLinter = 50
Expand Down
10 changes: 5 additions & 5 deletions pkg/commands/fmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/goformat"
"github.com/golangci/golangci-lint/pkg/goformatters"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/result/processors"
"github.com/golangci/golangci-lint/v2/pkg/config"
"github.com/golangci/golangci-lint/v2/pkg/goformat"
"github.com/golangci/golangci-lint/v2/pkg/goformatters"
"github.com/golangci/golangci-lint/v2/pkg/logutils"
"github.com/golangci/golangci-lint/v2/pkg/result/processors"
)

type fmtOptions struct {
Expand Down
10 changes: 5 additions & 5 deletions pkg/commands/formatters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/goformatters"
"github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/v2/pkg/config"
"github.com/golangci/golangci-lint/v2/pkg/goformatters"
"github.com/golangci/golangci-lint/v2/pkg/lint/linter"
"github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/v2/pkg/logutils"
)

type formattersHelp struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/commands/help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/fatih/color"
"github.com/spf13/cobra"

"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/v2/pkg/logutils"
)

type helpOptions struct {
Expand Down
10 changes: 5 additions & 5 deletions pkg/commands/help_formatters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"github.com/fatih/color"
"github.com/spf13/cobra"

"github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/goformatters"
"github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/v2/pkg/config"
"github.com/golangci/golangci-lint/v2/pkg/goformatters"
"github.com/golangci/golangci-lint/v2/pkg/lint/linter"
"github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/v2/pkg/logutils"
)

type formatterHelp struct {
Expand Down
10 changes: 5 additions & 5 deletions pkg/commands/help_linters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"github.com/fatih/color"
"github.com/spf13/cobra"

"github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/goformatters"
"github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/v2/pkg/config"
"github.com/golangci/golangci-lint/v2/pkg/goformatters"
"github.com/golangci/golangci-lint/v2/pkg/lint/linter"
"github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/v2/pkg/logutils"
)

type linterHelp struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/commands/internal/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"time"
"unicode"

"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/v2/pkg/logutils"
)

// Builder runs all the required commands to build a binary.
Expand Down
4 changes: 2 additions & 2 deletions pkg/commands/internal/migrate/fakeloader/fakeloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/go-viper/mapstructure/v2"

"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/parser"
"github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/parser"
"github.com/golangci/golangci-lint/v2/pkg/config"
)

// Load is used to keep case of configuration.
Expand Down
6 changes: 3 additions & 3 deletions pkg/commands/internal/migrate/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package migrate

import (
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo"
)

func ToConfig(old *versionone.Config) *versiontwo.Config {
Expand Down
6 changes: 3 additions & 3 deletions pkg/commands/internal/migrate/migrate_formatters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"slices"
"strings"

"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo"
)

func toFormatters(old *versionone.Config) versiontwo.Formatters {
Expand Down
4 changes: 2 additions & 2 deletions pkg/commands/internal/migrate/migrate_issues.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package migrate

import (
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo"
)

func toIssues(old *versionone.Config) versiontwo.Issues {
Expand Down
4 changes: 2 additions & 2 deletions pkg/commands/internal/migrate/migrate_linter_names.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"cmp"
"slices"

"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone"
)

type LinterInfo struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/commands/internal/migrate/migrate_linter_names_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/stretchr/testify/assert"

"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone"
)

func Test_disableAllFilter(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/commands/internal/migrate/migrate_linters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package migrate

import (
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo"
)

func toLinters(old *versionone.Config) versiontwo.Linters {
Expand Down
10 changes: 5 additions & 5 deletions pkg/commands/internal/migrate/migrate_linters_exclusions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package migrate
import (
"slices"

"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
"github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/result/processors"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone"
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo"
"github.com/golangci/golangci-lint/v2/pkg/config"
"github.com/golangci/golangci-lint/v2/pkg/result/processors"
)

func toExclusions(old *versionone.Config) versiontwo.LinterExclusions {
Expand Down
Loading
Loading