diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2018-12-04 14:20:14 +0300 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-12-04 14:20:14 +0300 |
commit | 6a66f64e79ca5198ae43bd838f57a4c02f0c8f30 (patch) | |
tree | f35da40ef19e77b8d932ec5747397a040a630394 | |
parent | 485af0a046e7678d177c7f6af4278cb079fea5c6 (diff) |
Update to latest goimports formatting
36 files changed, 47 insertions, 42 deletions
diff --git a/auth/token.go b/auth/token.go index e1c196615..a5b5747c4 100644 --- a/auth/token.go +++ b/auth/token.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/auth" + grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth" "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/changelogs/unreleased/update-goimports.yml b/changelogs/unreleased/update-goimports.yml new file mode 100644 index 000000000..16ec03b76 --- /dev/null +++ b/changelogs/unreleased/update-goimports.yml @@ -0,0 +1,5 @@ +--- +title: Update to latest goimports formatting +merge_request: 993 +author: +type: other diff --git a/cmd/gitaly-ssh/main.go b/cmd/gitaly-ssh/main.go index d22d6d5fd..9f4fdbc12 100644 --- a/cmd/gitaly-ssh/main.go +++ b/cmd/gitaly-ssh/main.go @@ -5,7 +5,7 @@ import ( "log" "os" - "gitlab.com/gitlab-org/gitaly/auth" + gitalyauth "gitlab.com/gitlab-org/gitaly/auth" "gitlab.com/gitlab-org/gitaly/client" "google.golang.org/grpc" ) diff --git a/internal/command/command.go b/internal/command/command.go index bcd634ffe..7fa488279 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/internal/config" ) diff --git a/internal/command/spawntoken.go b/internal/command/spawntoken.go index a3c11180c..1428beee6 100644 --- a/internal/command/spawntoken.go +++ b/internal/command/spawntoken.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/kelseyhightower/envconfig" "github.com/prometheus/client_golang/prometheus" ) diff --git a/internal/config/prometheus.go b/internal/config/prometheus.go index 2d8936f9a..da6e2d203 100644 --- a/internal/config/prometheus.go +++ b/internal/config/prometheus.go @@ -1,7 +1,7 @@ package config import ( - "github.com/grpc-ecosystem/go-grpc-prometheus" + grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler" diff --git a/internal/config/sentry.go b/internal/config/sentry.go index f67169b83..77a6a8029 100644 --- a/internal/config/sentry.go +++ b/internal/config/sentry.go @@ -3,7 +3,7 @@ package config import ( "fmt" - "github.com/getsentry/raven-go" + raven "github.com/getsentry/raven-go" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/internal/middleware/panichandler" ) diff --git a/internal/git/log/last_commit.go b/internal/git/log/last_commit.go index 872b5b2bd..4f08e0acb 100644 --- a/internal/git/log/last_commit.go +++ b/internal/git/log/last_commit.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "strings" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/command" diff --git a/internal/git/protocol.go b/internal/git/protocol.go index 950d4bcd5..88262ec56 100644 --- a/internal/git/protocol.go +++ b/internal/git/protocol.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/grpc-ecosystem/go-grpc-middleware/tags" + grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/prometheus/client_golang/prometheus" ) diff --git a/internal/helper/housekeeping/housekeeping.go b/internal/helper/housekeeping/housekeeping.go index e4e3b841f..3b30c8484 100644 --- a/internal/helper/housekeeping/housekeeping.go +++ b/internal/helper/housekeeping/housekeeping.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "golang.org/x/net/context" ) diff --git a/internal/middleware/limithandler/metrics.go b/internal/middleware/limithandler/metrics.go index 7cc57e0d9..3e0accd7a 100644 --- a/internal/middleware/limithandler/metrics.go +++ b/internal/middleware/limithandler/metrics.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/prometheus/client_golang/prometheus" "golang.org/x/net/context" ) diff --git a/internal/middleware/metadatahandler/metadatahandler.go b/internal/middleware/metadatahandler/metadatahandler.go index 9cabc2840..06b67b945 100644 --- a/internal/middleware/metadatahandler/metadatahandler.go +++ b/internal/middleware/metadatahandler/metadatahandler.go @@ -1,9 +1,9 @@ package metadatahandler import ( - "github.com/grpc-ecosystem/go-grpc-middleware/tags" + grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/auth" + gitalyauth "gitlab.com/gitlab-org/gitaly/auth" "gitlab.com/gitlab-org/gitaly/internal/helper" "golang.org/x/net/context" "google.golang.org/grpc" diff --git a/internal/middleware/sentryhandler/sentryhandler.go b/internal/middleware/sentryhandler/sentryhandler.go index 5deff9e0d..44d398a12 100644 --- a/internal/middleware/sentryhandler/sentryhandler.go +++ b/internal/middleware/sentryhandler/sentryhandler.go @@ -6,7 +6,7 @@ import ( "time" raven "github.com/getsentry/raven-go" - "github.com/grpc-ecosystem/go-grpc-middleware/tags" + grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "gitlab.com/gitlab-org/gitaly/internal/helper" "golang.org/x/net/context" "google.golang.org/grpc" diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go index b163dc7bc..eb6a40a0b 100644 --- a/internal/rubyserver/rubyserver.go +++ b/internal/rubyserver/rubyserver.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "github.com/grpc-ecosystem/go-grpc-middleware" - "github.com/grpc-ecosystem/go-grpc-prometheus" + grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" + grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/command" diff --git a/internal/server/auth/auth.go b/internal/server/auth/auth.go index 33fb6eb92..b97bca8fc 100644 --- a/internal/server/auth/auth.go +++ b/internal/server/auth/auth.go @@ -3,9 +3,9 @@ package auth import ( "time" - "github.com/grpc-ecosystem/go-grpc-middleware/auth" + grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/auth" + gitalyauth "gitlab.com/gitlab-org/gitaly/auth" "gitlab.com/gitlab-org/gitaly/internal/config" "golang.org/x/net/context" "google.golang.org/grpc" diff --git a/internal/server/auth_test.go b/internal/server/auth_test.go index be711ac3b..483d3be34 100644 --- a/internal/server/auth_test.go +++ b/internal/server/auth_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/auth" + gitalyauth "gitlab.com/gitlab-org/gitaly/auth" "gitlab.com/gitlab-org/gitaly/internal/config" "gitlab.com/gitlab-org/gitaly/internal/testhelper" netctx "golang.org/x/net/context" diff --git a/internal/server/server.go b/internal/server/server.go index f9fe6ccc7..3d480963a 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -1,10 +1,10 @@ package server import ( - "github.com/grpc-ecosystem/go-grpc-middleware" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" - "github.com/grpc-ecosystem/go-grpc-middleware/tags" - "github.com/grpc-ecosystem/go-grpc-prometheus" + grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" + grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/internal/helper/fieldextractors" gitalylog "gitlab.com/gitlab-org/gitaly/internal/log" diff --git a/internal/service/commit/commits_helper.go b/internal/service/commit/commits_helper.go index 83b079070..d1480991c 100644 --- a/internal/service/commit/commits_helper.go +++ b/internal/service/commit/commits_helper.go @@ -3,7 +3,7 @@ package commit import ( "context" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/git/log" ) diff --git a/internal/service/commit/count_commits.go b/internal/service/commit/count_commits.go index 1b4a96b32..1167c23c0 100644 --- a/internal/service/commit/count_commits.go +++ b/internal/service/commit/count_commits.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/git" "golang.org/x/net/context" diff --git a/internal/service/commit/isancestor.go b/internal/service/commit/isancestor.go index 88be2ec0f..4c54427fa 100644 --- a/internal/service/commit/isancestor.go +++ b/internal/service/commit/isancestor.go @@ -1,7 +1,7 @@ package commit import ( - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/git" diff --git a/internal/service/commit/list_files.go b/internal/service/commit/list_files.go index 96d108a65..54db537ce 100644 --- a/internal/service/commit/list_files.go +++ b/internal/service/commit/list_files.go @@ -3,7 +3,7 @@ package commit import ( "bytes" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/git" diff --git a/internal/service/commit/raw_blame.go b/internal/service/commit/raw_blame.go index 7b00475e5..0e7c40483 100644 --- a/internal/service/commit/raw_blame.go +++ b/internal/service/commit/raw_blame.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/git" "gitlab.com/gitlab-org/gitaly/streamio" diff --git a/internal/service/commit/tree_entries.go b/internal/service/commit/tree_entries.go index 37b755e9b..1d3b09129 100644 --- a/internal/service/commit/tree_entries.go +++ b/internal/service/commit/tree_entries.go @@ -3,7 +3,7 @@ package commit import ( "fmt" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/git/catfile" diff --git a/internal/service/diff/commit.go b/internal/service/diff/commit.go index 5037d47db..be42f6c5b 100644 --- a/internal/service/diff/commit.go +++ b/internal/service/diff/commit.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/diff" diff --git a/internal/service/ref/refexists.go b/internal/service/ref/refexists.go index 819ff656a..e20248a62 100644 --- a/internal/service/ref/refexists.go +++ b/internal/service/ref/refexists.go @@ -3,7 +3,7 @@ package ref import ( "strings" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/command" diff --git a/internal/service/ref/refname.go b/internal/service/ref/refname.go index accf22f7e..518d5466c 100644 --- a/internal/service/ref/refname.go +++ b/internal/service/ref/refname.go @@ -4,7 +4,7 @@ import ( "bufio" "strings" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/git" diff --git a/internal/service/ref/refs.go b/internal/service/ref/refs.go index 904723183..e986e0ede 100644 --- a/internal/service/ref/refs.go +++ b/internal/service/ref/refs.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/git" diff --git a/internal/service/repository/fetch_remote.go b/internal/service/repository/fetch_remote.go index e6dfd9de1..6f3c35f3d 100644 --- a/internal/service/repository/fetch_remote.go +++ b/internal/service/repository/fetch_remote.go @@ -1,7 +1,7 @@ package repository import ( - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/rubyserver" diff --git a/internal/service/repository/gc.go b/internal/service/repository/gc.go index b6ac14e17..d1da2bc48 100644 --- a/internal/service/repository/gc.go +++ b/internal/service/repository/gc.go @@ -1,7 +1,7 @@ package repository import ( - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/git" diff --git a/internal/service/repository/repack.go b/internal/service/repository/repack.go index 265ecadcd..075577fc6 100644 --- a/internal/service/repository/repack.go +++ b/internal/service/repository/repack.go @@ -1,7 +1,7 @@ package repository import ( - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/git" diff --git a/internal/service/repository/size.go b/internal/service/repository/size.go index e8c55c0b8..7cf3a3e18 100644 --- a/internal/service/repository/size.go +++ b/internal/service/repository/size.go @@ -7,7 +7,7 @@ import ( "os/exec" "strconv" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/command" "gitlab.com/gitlab-org/gitaly/internal/helper" diff --git a/internal/service/smarthttp/inforefs.go b/internal/service/smarthttp/inforefs.go index 1992ac040..3947c1cd9 100644 --- a/internal/service/smarthttp/inforefs.go +++ b/internal/service/smarthttp/inforefs.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/git" diff --git a/internal/service/smarthttp/receive_pack.go b/internal/service/smarthttp/receive_pack.go index a98988e09..5c11fa144 100644 --- a/internal/service/smarthttp/receive_pack.go +++ b/internal/service/smarthttp/receive_pack.go @@ -3,7 +3,7 @@ package smarthttp import ( "fmt" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/command" diff --git a/internal/service/ssh/receive_pack.go b/internal/service/ssh/receive_pack.go index c74e66ad2..f2a69a289 100644 --- a/internal/service/ssh/receive_pack.go +++ b/internal/service/ssh/receive_pack.go @@ -3,7 +3,7 @@ package ssh import ( "fmt" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/command" diff --git a/internal/service/storage/deleteall.go b/internal/service/storage/deleteall.go index 25c53c73d..1a54ce1b1 100644 --- a/internal/service/storage/deleteall.go +++ b/internal/service/storage/deleteall.go @@ -5,7 +5,7 @@ import ( "os" "path" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/helper" diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index a612dd3a2..718b9682d 100644 --- a/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/grpc-ecosystem/go-grpc-middleware" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" |