diff --git a/cmd/reviewdog/doghouse.go b/cmd/reviewdog/doghouse.go index f712b51a56..1d8cca9479 100644 --- a/cmd/reviewdog/doghouse.go +++ b/cmd/reviewdog/doghouse.go @@ -11,13 +11,14 @@ import ( "sort" "strings" + "golang.org/x/oauth2" + "golang.org/x/sync/errgroup" + "github.com/reviewdog/reviewdog" "github.com/reviewdog/reviewdog/cienv" "github.com/reviewdog/reviewdog/doghouse" "github.com/reviewdog/reviewdog/doghouse/client" "github.com/reviewdog/reviewdog/project" - "golang.org/x/oauth2" - "golang.org/x/sync/errgroup" ) func runDoghouse(ctx context.Context, r io.Reader, w io.Writer, opt *option, isProject bool, allowNonPR bool) error { diff --git a/cmd/reviewdog/doghouse_test.go b/cmd/reviewdog/doghouse_test.go index 93a0efea2a..1357162fba 100644 --- a/cmd/reviewdog/doghouse_test.go +++ b/cmd/reviewdog/doghouse_test.go @@ -9,12 +9,13 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "golang.org/x/oauth2" + "github.com/reviewdog/reviewdog" "github.com/reviewdog/reviewdog/cienv" "github.com/reviewdog/reviewdog/doghouse" "github.com/reviewdog/reviewdog/doghouse/client" "github.com/reviewdog/reviewdog/project" - "golang.org/x/oauth2" ) func setupEnvs(testEnvs map[string]string) (cleanup func()) { diff --git a/cmd/reviewdog/main.go b/cmd/reviewdog/main.go index 806cf74be4..1f7768c21a 100644 --- a/cmd/reviewdog/main.go +++ b/cmd/reviewdog/main.go @@ -22,13 +22,14 @@ import ( "github.com/google/go-github/v28/github" shellwords "github.com/mattn/go-shellwords" "github.com/reviewdog/errorformat/fmts" + gitlab "github.com/xanzy/go-gitlab" + "github.com/reviewdog/reviewdog" "github.com/reviewdog/reviewdog/cienv" "github.com/reviewdog/reviewdog/commands" "github.com/reviewdog/reviewdog/project" githubservice "github.com/reviewdog/reviewdog/service/github" gitlabservice "github.com/reviewdog/reviewdog/service/gitlab" - gitlab "github.com/xanzy/go-gitlab" ) const usageMessage = "" + diff --git a/doghouse/appengine/github.go b/doghouse/appengine/github.go index 5bc8c528c6..939eb5809f 100644 --- a/doghouse/appengine/github.go +++ b/doghouse/appengine/github.go @@ -16,10 +16,11 @@ import ( "github.com/google/go-github/v28/github" "github.com/justinas/nosurf" + "golang.org/x/oauth2" + "github.com/reviewdog/reviewdog/doghouse/server" "github.com/reviewdog/reviewdog/doghouse/server/cookieman" "github.com/reviewdog/reviewdog/doghouse/server/storage" - "golang.org/x/oauth2" ) type GitHubHandler struct { diff --git a/doghouse/appengine/github_webhook.go b/doghouse/appengine/github_webhook.go index 880d93c79c..9c5310b22c 100644 --- a/doghouse/appengine/github_webhook.go +++ b/doghouse/appengine/github_webhook.go @@ -7,6 +7,7 @@ import ( "net/http" "github.com/google/go-github/v28/github" + "github.com/reviewdog/reviewdog/doghouse/server/storage" ) diff --git a/doghouse/appengine/main.go b/doghouse/appengine/main.go index a7b9708434..d12666fe9b 100644 --- a/doghouse/appengine/main.go +++ b/doghouse/appengine/main.go @@ -9,6 +9,7 @@ import ( "github.com/haya14busa/secretbox" "github.com/justinas/nosurf" + "github.com/reviewdog/reviewdog/doghouse/server/cookieman" "github.com/reviewdog/reviewdog/doghouse/server/storage" ) diff --git a/doghouse/appengine/template.go b/doghouse/appengine/template.go index 1c13e5fdf0..7f23f48fdd 100644 --- a/doghouse/appengine/template.go +++ b/doghouse/appengine/template.go @@ -7,6 +7,7 @@ import ( "net/http" "github.com/rakyll/statik/fs" + _ "github.com/reviewdog/reviewdog/doghouse/appengine/statik" ) diff --git a/doghouse/client/github_client.go b/doghouse/client/github_client.go index e846145c59..6d85b9fdb8 100644 --- a/doghouse/client/github_client.go +++ b/doghouse/client/github_client.go @@ -4,6 +4,7 @@ import ( "context" "github.com/google/go-github/v28/github" + "github.com/reviewdog/reviewdog/doghouse" "github.com/reviewdog/reviewdog/doghouse/server" ) diff --git a/doghouse/server/doghouse.go b/doghouse/server/doghouse.go index 154c3a3565..934c24e795 100644 --- a/doghouse/server/doghouse.go +++ b/doghouse/server/doghouse.go @@ -9,6 +9,7 @@ import ( "time" "github.com/google/go-github/v28/github" + "github.com/reviewdog/reviewdog" "github.com/reviewdog/reviewdog/diff" "github.com/reviewdog/reviewdog/doghouse" diff --git a/doghouse/server/doghouse_test.go b/doghouse/server/doghouse_test.go index a978485a70..b6689c0f41 100644 --- a/doghouse/server/doghouse_test.go +++ b/doghouse/server/doghouse_test.go @@ -8,6 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-github/v28/github" + "github.com/reviewdog/reviewdog/doghouse" ) diff --git a/filter_test.go b/filter_test.go index af0e8079bc..c4507973ad 100644 --- a/filter_test.go +++ b/filter_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/reviewdog/reviewdog/diff" ) diff --git a/project/run.go b/project/run.go index 8042b8206b..2d892bbf54 100644 --- a/project/run.go +++ b/project/run.go @@ -11,9 +11,10 @@ import ( "runtime" "strings" + "golang.org/x/sync/errgroup" + "github.com/reviewdog/reviewdog" "github.com/reviewdog/reviewdog/diff" - "golang.org/x/sync/errgroup" ) // RunAndParse runs commands and parse results. Returns map of tool name to check results. diff --git a/service/github/github.go b/service/github/github.go index a9440429dc..1782eb642d 100644 --- a/service/github/github.go +++ b/service/github/github.go @@ -8,6 +8,7 @@ import ( "sync" "github.com/google/go-github/v28/github" + "github.com/reviewdog/reviewdog" "github.com/reviewdog/reviewdog/service/github/githubutils" "github.com/reviewdog/reviewdog/service/serviceutil" diff --git a/service/github/github_test.go b/service/github/github_test.go index 2ac685fc85..17cf01f3f3 100644 --- a/service/github/github_test.go +++ b/service/github/github_test.go @@ -12,9 +12,10 @@ import ( "github.com/google/go-github/v28/github" "github.com/kylelemons/godebug/pretty" + "golang.org/x/oauth2" + "github.com/reviewdog/reviewdog" "github.com/reviewdog/reviewdog/service/serviceutil" - "golang.org/x/oauth2" ) const notokenSkipTestMes = "skipping test (requires actual Personal access tokens. export REVIEWDOG_TEST_GITHUB_API_TOKEN=)" diff --git a/service/gitlab/gitlab_mr_commit.go b/service/gitlab/gitlab_mr_commit.go index 3cc83cc1c9..96608ad127 100644 --- a/service/gitlab/gitlab_mr_commit.go +++ b/service/gitlab/gitlab_mr_commit.go @@ -8,10 +8,11 @@ import ( "strings" "sync" - "github.com/reviewdog/reviewdog" - "github.com/reviewdog/reviewdog/service/serviceutil" "github.com/xanzy/go-gitlab" "golang.org/x/sync/errgroup" + + "github.com/reviewdog/reviewdog" + "github.com/reviewdog/reviewdog/service/serviceutil" ) var _ reviewdog.CommentService = &GitLabMergeRequestCommitCommenter{} diff --git a/service/gitlab/gitlab_mr_commit_test.go b/service/gitlab/gitlab_mr_commit_test.go index f4bb4b0492..aacbf5d720 100644 --- a/service/gitlab/gitlab_mr_commit_test.go +++ b/service/gitlab/gitlab_mr_commit_test.go @@ -9,9 +9,10 @@ import ( "testing" "github.com/kylelemons/godebug/pretty" + "github.com/xanzy/go-gitlab" + "github.com/reviewdog/reviewdog" "github.com/reviewdog/reviewdog/service/serviceutil" - "github.com/xanzy/go-gitlab" ) func TestGitLabMergeRequestCommitCommenter_Post_Flush_review_api(t *testing.T) { diff --git a/service/gitlab/gitlab_mr_diff.go b/service/gitlab/gitlab_mr_diff.go index 401cce1b98..d908a42fd7 100644 --- a/service/gitlab/gitlab_mr_diff.go +++ b/service/gitlab/gitlab_mr_diff.go @@ -6,9 +6,10 @@ import ( "os/exec" "strings" + gitlab "github.com/xanzy/go-gitlab" + "github.com/reviewdog/reviewdog" "github.com/reviewdog/reviewdog/service/serviceutil" - gitlab "github.com/xanzy/go-gitlab" ) var _ reviewdog.DiffService = &GitLabMergeRequestDiff{} diff --git a/service/gitlab/gitlab_mr_discussion.go b/service/gitlab/gitlab_mr_discussion.go index 194b5fb232..23d894d9dc 100644 --- a/service/gitlab/gitlab_mr_discussion.go +++ b/service/gitlab/gitlab_mr_discussion.go @@ -8,10 +8,11 @@ import ( "path/filepath" "sync" - "github.com/reviewdog/reviewdog" - "github.com/reviewdog/reviewdog/service/serviceutil" gitlab "github.com/xanzy/go-gitlab" "golang.org/x/sync/errgroup" + + "github.com/reviewdog/reviewdog" + "github.com/reviewdog/reviewdog/service/serviceutil" ) // GitLabMergeRequestDiscussionCommenter is a comment and diff service for GitLab MergeRequest. diff --git a/service/gitlab/gitlab_mr_discussion_test.go b/service/gitlab/gitlab_mr_discussion_test.go index 55fd68b50a..d1a6c69021 100644 --- a/service/gitlab/gitlab_mr_discussion_test.go +++ b/service/gitlab/gitlab_mr_discussion_test.go @@ -9,9 +9,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" + gitlab "github.com/xanzy/go-gitlab" + "github.com/reviewdog/reviewdog" "github.com/reviewdog/reviewdog/service/serviceutil" - gitlab "github.com/xanzy/go-gitlab" ) func TestGitLabMergeRequestDiscussionCommenter_Post_Flush_review_api(t *testing.T) {