Skip to content

Commit 1383df1

Browse files
committed
chore: groups gomodguard files to a package
1 parent 60e54d8 commit 1383df1

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

pkg/golinters/gomodguard.go renamed to pkg/golinters/gomodguard/gomodguard.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package golinters
1+
package gomodguard
22

33
import (
44
"sync"
@@ -14,14 +14,13 @@ import (
1414
)
1515

1616
const (
17-
gomodguardName = "gomodguard"
18-
gomodguardDesc = "Allow and block list linter for direct Go module dependencies. " +
17+
name = "gomodguard"
18+
desc = "Allow and block list linter for direct Go module dependencies. " +
1919
"This is different from depguard where there are different block " +
2020
"types for example version constraints and module recommendations."
2121
)
2222

23-
// NewGomodguard returns a new Gomodguard linter.
24-
func NewGomodguard(settings *config.GoModGuardSettings) *goanalysis.Linter {
23+
func New(settings *config.GoModGuardSettings) *goanalysis.Linter {
2524
var issues []goanalysis.Issue
2625
var mu sync.Mutex
2726

@@ -61,8 +60,8 @@ func NewGomodguard(settings *config.GoModGuardSettings) *goanalysis.Linter {
6160
}
6261

6362
return goanalysis.NewLinter(
64-
gomodguardName,
65-
gomodguardDesc,
63+
name,
64+
desc,
6665
[]*analysis.Analyzer{analyzer},
6766
nil,
6867
).WithContextSetter(func(lintCtx *linter.Context) {
@@ -81,7 +80,7 @@ func NewGomodguard(settings *config.GoModGuardSettings) *goanalysis.Linter {
8180

8281
for _, gomodguardIssue := range gomodguardIssues {
8382
issues = append(issues, goanalysis.NewIssue(&result.Issue{
84-
FromLinter: gomodguardName,
83+
FromLinter: name,
8584
Pos: gomodguardIssue.Position,
8685
Text: gomodguardIssue.Reason,
8786
}, pass))
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package gomodguard
2+
3+
import (
4+
"testing"
5+
6+
"github.com/golangci/golangci-lint/test/testshared/integration"
7+
)
8+
9+
func TestFromTestdata(t *testing.T) {
10+
integration.RunTestdata(t)
11+
}

test/testdata/gomodguard.go renamed to pkg/golinters/gomodguard/testdata/gomodguard.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//golangcitest:args -Egomodguard
2-
//golangcitest:config_path testdata/configs/gomodguard.yml
2+
//golangcitest:config_path testdata/gomodguard.yml
33
package testdata
44

55
import (

pkg/lint/lintersdb/builder_linter.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import (
4747
"github.com/golangci/golangci-lint/pkg/golinters/goheader"
4848
"github.com/golangci/golangci-lint/pkg/golinters/goimports"
4949
"github.com/golangci/golangci-lint/pkg/golinters/gomoddirectives"
50+
"github.com/golangci/golangci-lint/pkg/golinters/gomodguard"
5051
"github.com/golangci/golangci-lint/pkg/golinters/loggercheck"
5152
"github.com/golangci/golangci-lint/pkg/golinters/mirror"
5253
"github.com/golangci/golangci-lint/pkg/golinters/misspell"
@@ -366,7 +367,7 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
366367
WithPresets(linter.PresetStyle, linter.PresetModule).
367368
WithURL("https://github.com/ldez/gomoddirectives"),
368369

369-
linter.NewConfig(golinters.NewGomodguard(&cfg.LintersSettings.Gomodguard)).
370+
linter.NewConfig(gomodguard.New(&cfg.LintersSettings.Gomodguard)).
370371
WithSince("v1.25.0").
371372
WithPresets(linter.PresetStyle, linter.PresetImport, linter.PresetModule).
372373
WithURL("https://github.com/ryancurrah/gomodguard"),

0 commit comments

Comments
 (0)