Skip to content

Commit 3c14c7a

Browse files
committed
feat: new v2 module name
1 parent d3c9b91 commit 3c14c7a

File tree

400 files changed

+949
-950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

400 files changed

+949
-950
lines changed

.golangci.next.reference.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,10 +1699,10 @@ linters:
16991699
# Comma-separated list of print function names to check (in addition to default, see `go tool vet help printf`).
17001700
# Default: []
17011701
funcs:
1702-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
1703-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
1704-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
1705-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
1702+
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Infof
1703+
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Warnf
1704+
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Errorf
1705+
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Fatalf
17061706
shadow:
17071707
# Whether to be strict about shadowing; can be noisy.
17081708
# Default: false

.golangci.reference.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,10 +1929,10 @@ linters-settings:
19291929
# Comma-separated list of print function names to check (in addition to default, see `go tool vet help printf`).
19301930
# Default: []
19311931
funcs:
1932-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
1933-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
1934-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
1935-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
1932+
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Infof
1933+
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Warnf
1934+
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Errorf
1935+
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Fatalf
19361936
shadow:
19371937
# Whether to be strict about shadowing; can be noisy.
19381938
# Default: false

.golangci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ linters:
110110
settings:
111111
printf:
112112
funcs:
113-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
114-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
115-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
116-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
113+
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Infof
114+
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Warnf
115+
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Errorf
116+
- (github.com/golangci/golangci-lint/v2/pkg/logutils.Log).Fatalf
117117
enable:
118118
- nilness
119119
- shadow
@@ -198,7 +198,7 @@ formatters:
198198
replacement: 'any'
199199
goimports:
200200
local-prefixes:
201-
- github.com/golangci/golangci-lint
201+
- github.com/golangci/golangci-lint/v2
202202
exclusions:
203203
paths:
204204
- test/testdata_etc # test files

cmd/golangci-lint/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"os"
77
"runtime/debug"
88

9-
"github.com/golangci/golangci-lint/pkg/commands"
10-
"github.com/golangci/golangci-lint/pkg/exitcodes"
9+
"github.com/golangci/golangci-lint/v2/pkg/commands"
10+
"github.com/golangci/golangci-lint/v2/pkg/exitcodes"
1111
)
1212

1313
var (

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/golangci/golangci-lint
1+
module github.com/golangci/golangci-lint/v2
22

33
go 1.23.0
44

internal/cache/cache.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414

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

17-
"github.com/golangci/golangci-lint/internal/go/cache"
18-
"github.com/golangci/golangci-lint/pkg/logutils"
19-
"github.com/golangci/golangci-lint/pkg/timeutils"
17+
"github.com/golangci/golangci-lint/v2/internal/go/cache"
18+
"github.com/golangci/golangci-lint/v2/pkg/logutils"
19+
"github.com/golangci/golangci-lint/v2/pkg/timeutils"
2020
)
2121

2222
type HashMode int

internal/cache/cache_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/stretchr/testify/require"
99
"golang.org/x/tools/go/packages"
1010

11-
"github.com/golangci/golangci-lint/pkg/logutils"
12-
"github.com/golangci/golangci-lint/pkg/timeutils"
11+
"github.com/golangci/golangci-lint/v2/pkg/logutils"
12+
"github.com/golangci/golangci-lint/v2/pkg/timeutils"
1313
)
1414

1515
func setupCache(t *testing.T) *Cache {

internal/go/cache/cache.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424

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

27-
"github.com/golangci/golangci-lint/internal/go/mmap"
28-
"github.com/golangci/golangci-lint/internal/go/robustio"
27+
"github.com/golangci/golangci-lint/v2/internal/go/mmap"
28+
"github.com/golangci/golangci-lint/v2/internal/go/robustio"
2929
)
3030

3131
// An ActionID is a cache action key, the hash of a complete description of a

internal/go/cache/cache_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"testing"
1414
"time"
1515

16-
"github.com/golangci/golangci-lint/internal/go/testenv"
16+
"github.com/golangci/golangci-lint/v2/internal/go/testenv"
1717
)
1818

1919
func init() {

internal/go/cache/prog.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"sync/atomic"
2222
"time"
2323

24-
"github.com/golangci/golangci-lint/internal/go/quoted"
24+
"github.com/golangci/golangci-lint/v2/internal/go/quoted"
2525
)
2626

2727
// ProgCache implements Cache via JSON messages over stdin/stdout to a child

internal/x/tools/diff/myers/diff.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package myers
88
import (
99
"strings"
1010

11-
"github.com/golangci/golangci-lint/internal/x/tools/diff"
11+
"github.com/golangci/golangci-lint/v2/internal/x/tools/diff"
1212
)
1313

1414
// Sources:

internal/x/tools/diff/ndiff.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"bytes"
99
"unicode/utf8"
1010

11-
"github.com/golangci/golangci-lint/internal/x/tools/diff/lcs"
11+
"github.com/golangci/golangci-lint/v2/internal/x/tools/diff/lcs"
1212
)
1313

1414
// Strings computes the differences between two strings.

pkg/commands/cache.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77

88
"github.com/spf13/cobra"
99

10-
"github.com/golangci/golangci-lint/internal/cache"
11-
"github.com/golangci/golangci-lint/pkg/fsutils"
12-
"github.com/golangci/golangci-lint/pkg/logutils"
10+
"github.com/golangci/golangci-lint/v2/internal/cache"
11+
"github.com/golangci/golangci-lint/v2/pkg/fsutils"
12+
"github.com/golangci/golangci-lint/v2/pkg/logutils"
1313
)
1414

1515
type cacheCommand struct {

pkg/commands/config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"github.com/spf13/cobra"
1111
"github.com/spf13/viper"
1212

13-
"github.com/golangci/golangci-lint/pkg/config"
14-
"github.com/golangci/golangci-lint/pkg/exitcodes"
15-
"github.com/golangci/golangci-lint/pkg/fsutils"
16-
"github.com/golangci/golangci-lint/pkg/logutils"
13+
"github.com/golangci/golangci-lint/v2/pkg/config"
14+
"github.com/golangci/golangci-lint/v2/pkg/exitcodes"
15+
"github.com/golangci/golangci-lint/v2/pkg/fsutils"
16+
"github.com/golangci/golangci-lint/v2/pkg/logutils"
1717
)
1818

1919
type pathOptions struct {

pkg/commands/config_verify.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/spf13/pflag"
2020
"gopkg.in/yaml.v3"
2121

22-
"github.com/golangci/golangci-lint/pkg/exitcodes"
22+
"github.com/golangci/golangci-lint/v2/pkg/exitcodes"
2323
)
2424

2525
type verifyOptions struct {

pkg/commands/custom.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"github.com/spf13/cobra"
99

10-
"github.com/golangci/golangci-lint/pkg/commands/internal"
11-
"github.com/golangci/golangci-lint/pkg/logutils"
10+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal"
11+
"github.com/golangci/golangci-lint/v2/pkg/logutils"
1212
)
1313

1414
const envKeepTempFiles = "CUSTOM_GCL_KEEP_TEMP_FILES"

pkg/commands/flagsets.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"github.com/spf13/pflag"
66
"github.com/spf13/viper"
77

8-
"github.com/golangci/golangci-lint/pkg/commands/internal"
9-
"github.com/golangci/golangci-lint/pkg/config"
10-
"github.com/golangci/golangci-lint/pkg/exitcodes"
8+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal"
9+
"github.com/golangci/golangci-lint/v2/pkg/config"
10+
"github.com/golangci/golangci-lint/v2/pkg/exitcodes"
1111
)
1212

1313
const defaultMaxIssuesPerLinter = 50

pkg/commands/fmt.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
"github.com/spf13/cobra"
1111
"github.com/spf13/viper"
1212

13-
"github.com/golangci/golangci-lint/pkg/config"
14-
"github.com/golangci/golangci-lint/pkg/goformat"
15-
"github.com/golangci/golangci-lint/pkg/goformatters"
16-
"github.com/golangci/golangci-lint/pkg/logutils"
17-
"github.com/golangci/golangci-lint/pkg/result/processors"
13+
"github.com/golangci/golangci-lint/v2/pkg/config"
14+
"github.com/golangci/golangci-lint/v2/pkg/goformat"
15+
"github.com/golangci/golangci-lint/v2/pkg/goformatters"
16+
"github.com/golangci/golangci-lint/v2/pkg/logutils"
17+
"github.com/golangci/golangci-lint/v2/pkg/result/processors"
1818
)
1919

2020
type fmtOptions struct {

pkg/commands/formatters.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"github.com/spf13/cobra"
99
"github.com/spf13/viper"
1010

11-
"github.com/golangci/golangci-lint/pkg/config"
12-
"github.com/golangci/golangci-lint/pkg/goformatters"
13-
"github.com/golangci/golangci-lint/pkg/lint/linter"
14-
"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
15-
"github.com/golangci/golangci-lint/pkg/logutils"
11+
"github.com/golangci/golangci-lint/v2/pkg/config"
12+
"github.com/golangci/golangci-lint/v2/pkg/goformatters"
13+
"github.com/golangci/golangci-lint/v2/pkg/lint/linter"
14+
"github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb"
15+
"github.com/golangci/golangci-lint/v2/pkg/logutils"
1616
)
1717

1818
type formattersHelp struct {

pkg/commands/help.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/fatih/color"
99
"github.com/spf13/cobra"
1010

11-
"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
12-
"github.com/golangci/golangci-lint/pkg/logutils"
11+
"github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb"
12+
"github.com/golangci/golangci-lint/v2/pkg/logutils"
1313
)
1414

1515
type helpOptions struct {

pkg/commands/help_formatters.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"github.com/fatih/color"
1010
"github.com/spf13/cobra"
1111

12-
"github.com/golangci/golangci-lint/pkg/config"
13-
"github.com/golangci/golangci-lint/pkg/goformatters"
14-
"github.com/golangci/golangci-lint/pkg/lint/linter"
15-
"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
16-
"github.com/golangci/golangci-lint/pkg/logutils"
12+
"github.com/golangci/golangci-lint/v2/pkg/config"
13+
"github.com/golangci/golangci-lint/v2/pkg/goformatters"
14+
"github.com/golangci/golangci-lint/v2/pkg/lint/linter"
15+
"github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb"
16+
"github.com/golangci/golangci-lint/v2/pkg/logutils"
1717
)
1818

1919
type formatterHelp struct {

pkg/commands/help_linters.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
"github.com/fatih/color"
1111
"github.com/spf13/cobra"
1212

13-
"github.com/golangci/golangci-lint/pkg/config"
14-
"github.com/golangci/golangci-lint/pkg/goformatters"
15-
"github.com/golangci/golangci-lint/pkg/lint/linter"
16-
"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
17-
"github.com/golangci/golangci-lint/pkg/logutils"
13+
"github.com/golangci/golangci-lint/v2/pkg/config"
14+
"github.com/golangci/golangci-lint/v2/pkg/goformatters"
15+
"github.com/golangci/golangci-lint/v2/pkg/lint/linter"
16+
"github.com/golangci/golangci-lint/v2/pkg/lint/lintersdb"
17+
"github.com/golangci/golangci-lint/v2/pkg/logutils"
1818
)
1919

2020
type linterHelp struct {

pkg/commands/internal/builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"time"
1313
"unicode"
1414

15-
"github.com/golangci/golangci-lint/pkg/logutils"
15+
"github.com/golangci/golangci-lint/v2/pkg/logutils"
1616
)
1717

1818
// Builder runs all the required commands to build a binary.

pkg/commands/internal/migrate/fakeloader/fakeloader.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

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

9-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/parser"
10-
"github.com/golangci/golangci-lint/pkg/config"
9+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/parser"
10+
"github.com/golangci/golangci-lint/v2/pkg/config"
1111
)
1212

1313
// Load is used to keep case of configuration.

pkg/commands/internal/migrate/migrate.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package migrate
22

33
import (
4-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
5-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
6-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
4+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr"
5+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone"
6+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo"
77
)
88

99
func ToConfig(old *versionone.Config) *versiontwo.Config {

pkg/commands/internal/migrate/migrate_formatters.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"slices"
55
"strings"
66

7-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
8-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
9-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
7+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr"
8+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone"
9+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo"
1010
)
1111

1212
func toFormatters(old *versionone.Config) versiontwo.Formatters {

pkg/commands/internal/migrate/migrate_issues.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package migrate
22

33
import (
4-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
5-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versiontwo"
4+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone"
5+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versiontwo"
66
)
77

88
func toIssues(old *versionone.Config) versiontwo.Issues {

pkg/commands/internal/migrate/migrate_linter_names.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"cmp"
55
"slices"
66

7-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
8-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
7+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr"
8+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone"
99
)
1010

1111
type LinterInfo struct {
@@ -69,9 +69,9 @@ func ProcessEffectiveFormatters(old versionone.Linters) []string {
6969
func disableAllFilter(old versionone.Linters) []string {
7070
// Note:
7171
// - disable-all + enable-all
72-
// => impossible (https://github.com/golangci/golangci-lint/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L38)
72+
// => impossible (https://github.com/golangci/golangci-lint/v2/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L38)
7373
// - disable-all + disable
74-
// => impossible (https://github.com/golangci/golangci-lint/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L47)
74+
// => impossible (https://github.com/golangci/golangci-lint/v2/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L47)
7575

7676
// if disable-all -> presets fast enable
7777
// - presets fast enable: (presets - [slow]) + enable => effective enable + none
@@ -98,11 +98,11 @@ func disableAllFilter(old versionone.Linters) []string {
9898
func enableAllFilter(old versionone.Linters) []string {
9999
// Note:
100100
// - enable-all + disable-all
101-
// => impossible (https://github.com/golangci/golangci-lint/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L38)
101+
// => impossible (https://github.com/golangci/golangci-lint/v2/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L38)
102102
// - enable-all + enable + fast=false
103-
// => impossible (https://github.com/golangci/golangci-lint/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L52)
103+
// => impossible (https://github.com/golangci/golangci-lint/v2/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L52)
104104
// - enable-all + enable + fast=true
105-
// => possible (https://github.com/golangci/golangci-lint/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L51)
105+
// => possible (https://github.com/golangci/golangci-lint/v2/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L51)
106106

107107
// if enable-all -> presets fast enable disable
108108
// - presets fast enable disable: all - fast - enable + disable => effective disable + all
@@ -133,7 +133,7 @@ func enableAllFilter(old versionone.Linters) []string {
133133
func defaultLintersFilter(old versionone.Linters) (enable, disable []string) {
134134
// Note:
135135
// - a linter cannot be inside `enable` and `disable` in the same configuration
136-
// => https://github.com/golangci/golangci-lint/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L66
136+
// => https://github.com/golangci/golangci-lint/v2/blob/e1eb4cb2c7fba29b5831b63e454844d83c692874/pkg/config/linters.go#L66
137137

138138
// if default -> presets fast disable
139139
// - presets > fast > disable > enable => effective enable + disable + standard

pkg/commands/internal/migrate/migrate_linter_names_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
"github.com/stretchr/testify/assert"
77

8-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/ptr"
9-
"github.com/golangci/golangci-lint/pkg/commands/internal/migrate/versionone"
8+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr"
9+
"github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/versionone"
1010
)
1111

1212
func Test_disableAllFilter(t *testing.T) {

0 commit comments

Comments
 (0)