Merge "cmd/checker: use query by scheme"
diff --git a/cmd/checker/checker.go b/cmd/checker/checker.go
index f57ebc7..4f014c6 100644
--- a/cmd/checker/checker.go
+++ b/cmd/checker/checker.go
@@ -26,8 +26,8 @@
"strings"
"time"
- "github.com/google/gerritfmt"
- "github.com/google/gerritfmt/gerrit"
+ linter "github.com/google/gerrit-linter"
+ "github.com/google/gerrit-linter/gerrit"
)
// gerritChecker run formatting checks against a gerrit server.
@@ -77,7 +77,7 @@
Repository: repo,
Description: "check source code formatting.",
Status: "ENABLED",
- Query: gerritfmt.Formatters[language].Query,
+ Query: linter.Formatters[language].Query,
}
body, err := json.Marshal(&in)
@@ -128,9 +128,9 @@
if err != nil {
return nil, err
}
- req := gerritfmt.FormatRequest{}
+ req := linter.FormatRequest{}
for n, f := range ch.Files {
- cfg := gerritfmt.Formatters[language]
+ cfg := linter.Formatters[language]
if cfg == nil {
return nil, fmt.Errorf("language %q not configured", language)
}
@@ -139,7 +139,7 @@
}
req.Files = append(req.Files,
- gerritfmt.File{
+ linter.File{
Language: language,
Name: n,
Content: f.Content,
@@ -149,8 +149,8 @@
return nil, errIrrelevant
}
- rep := gerritfmt.FormatReply{}
- if err := gerritfmt.Format(&req, &rep); err != nil {
+ rep := linter.FormatReply{}
+ if err := linter.Format(&req, &rep); err != nil {
_, ok := err.(rpc.ServerError)
if ok {
return nil, fmt.Errorf("server returned: %s", err)
diff --git a/cmd/checker/main.go b/cmd/checker/main.go
index 1243562..999212a 100644
--- a/cmd/checker/main.go
+++ b/cmd/checker/main.go
@@ -28,8 +28,8 @@
"sync"
"time"
- "github.com/google/gerritfmt"
- "github.com/google/gerritfmt/gerrit"
+ linter "github.com/google/gerrit-linter"
+ "github.com/google/gerrit-linter/gerrit"
"github.com/google/slothfs/cookie"
)
@@ -167,8 +167,8 @@
log.Fatalf("must set --language.")
}
- if !gerritfmt.IsSupported(*language) {
- log.Fatalf("language is not supported. Choices are %s", gerritfmt.SupportedLanguages())
+ if !linter.IsSupported(*language) {
+ log.Fatalf("language is not supported. Choices are %s", linter.SupportedLanguages())
}
ch, err := gc.PostChecker(*repo, *language, *update)
diff --git a/go.mod b/go.mod
index a654f9a..57bf6a9 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/google/gerritfmt
+module github.com/google/gerrit-linter
require (
github.com/bazelbuild/buildtools v0.0.0-20190405103555-895625218c56 // indirect
