Skip to content

Commit 952e58f

Browse files
committed
chore: groups promlinter files to a package
1 parent 5025dcc commit 952e58f

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

pkg/golinters/promlinter.go renamed to pkg/golinters/promlinter/promlinter.go

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

33
import (
44
"fmt"
@@ -13,9 +13,9 @@ import (
1313
"github.com/golangci/golangci-lint/pkg/result"
1414
)
1515

16-
const promlinterName = "promlinter"
16+
const name = "promlinter"
1717

18-
func NewPromlinter(settings *config.PromlinterSettings) *goanalysis.Linter {
18+
func New(settings *config.PromlinterSettings) *goanalysis.Linter {
1919
var mu sync.Mutex
2020
var resIssues []goanalysis.Issue
2121

@@ -28,7 +28,7 @@ func NewPromlinter(settings *config.PromlinterSettings) *goanalysis.Linter {
2828
}
2929

3030
analyzer := &analysis.Analyzer{
31-
Name: promlinterName,
31+
Name: name,
3232
Doc: goanalysis.TheOnlyanalyzerDoc,
3333
Run: func(pass *analysis.Pass) (any, error) {
3434
issues := runPromLinter(pass, promSettings)
@@ -46,7 +46,7 @@ func NewPromlinter(settings *config.PromlinterSettings) *goanalysis.Linter {
4646
}
4747

4848
return goanalysis.NewLinter(
49-
promlinterName,
49+
name,
5050
"Check Prometheus metrics naming via promlint",
5151
[]*analysis.Analyzer{analyzer},
5252
nil,
@@ -67,7 +67,7 @@ func runPromLinter(pass *analysis.Pass, promSettings promlinter.Setting) []goana
6767
issue := result.Issue{
6868
Pos: i.Pos,
6969
Text: fmt.Sprintf("Metric: %s Error: %s", i.Metric, i.Text),
70-
FromLinter: promlinterName,
70+
FromLinter: name,
7171
}
7272

7373
issues[k] = goanalysis.NewIssue(&issue, pass)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package promlinter
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+
}

pkg/lint/lintersdb/builder_linter.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ import (
8181
"github.com/golangci/golangci-lint/pkg/golinters/perfsprint"
8282
"github.com/golangci/golangci-lint/pkg/golinters/prealloc"
8383
"github.com/golangci/golangci-lint/pkg/golinters/predeclared"
84+
"github.com/golangci/golangci-lint/pkg/golinters/promlinter"
8485
"github.com/golangci/golangci-lint/pkg/golinters/protogetter"
8586
"github.com/golangci/golangci-lint/pkg/golinters/spancheck"
8687
"github.com/golangci/golangci-lint/pkg/golinters/tagalign"
@@ -605,7 +606,7 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
605606
WithPresets(linter.PresetStyle).
606607
WithURL("https://github.com/nishanths/predeclared"),
607608

608-
linter.NewConfig(golinters.NewPromlinter(&cfg.LintersSettings.Promlinter)).
609+
linter.NewConfig(promlinter.New(&cfg.LintersSettings.Promlinter)).
609610
WithSince("v1.40.0").
610611
WithPresets(linter.PresetStyle).
611612
WithURL("https://github.com/yeya24/promlinter"),

0 commit comments

Comments
 (0)