diff options
22 files changed, 14 insertions, 14 deletions
diff --git a/.golangci.yml b/.golangci.yml index 6d1e9c0f2..88ac72af8 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -56,7 +56,7 @@ linters-settings: - (*database/sql.DB).Close - (*database/sql.Rows).Close - (*gitlab.com/gitlab-org/gitaly/v16/client.Pool).Close - - (*gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel.ServerConn).Close + - (*gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel.ServerConn).Close - (*gitlab.com/gitlab-org/gitaly/v16/internal/streamcache.pipe).Close - (*gitlab.com/gitlab-org/gitaly/v16/internal/streamcache.pipeReader).Close - (*google.golang.org/grpc.ClientConn).Close diff --git a/client/dial.go b/client/dial.go index 434b2c727..af5bf03dc 100644 --- a/client/dial.go +++ b/client/dial.go @@ -9,7 +9,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" "gitlab.com/gitlab-org/gitaly/v16/internal/dnsresolver" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "google.golang.org/grpc" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/client/sidechannel.go b/client/sidechannel.go index 1a84be5dc..7610661dd 100644 --- a/client/sidechannel.go +++ b/client/sidechannel.go @@ -6,8 +6,8 @@ import ( "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/internal/cli/praefect/serve.go b/internal/cli/praefect/serve.go index 3a2f72f41..328459ef6 100644 --- a/internal/cli/praefect/serve.go +++ b/internal/cli/praefect/serve.go @@ -20,6 +20,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/helper" "gitlab.com/gitlab-org/gitaly/v16/internal/log" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" @@ -35,7 +36,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/version" "gitlab.com/gitlab-org/labkit/monitoring" "gitlab.com/gitlab-org/labkit/tracing" diff --git a/internal/gitaly/service/smarthttp/upload_pack.go b/internal/gitaly/service/smarthttp/upload_pack.go index 7ff667e40..b28f35591 100644 --- a/internal/gitaly/service/smarthttp/upload_pack.go +++ b/internal/gitaly/service/smarthttp/upload_pack.go @@ -11,7 +11,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/git" "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" ) diff --git a/internal/gitaly/service/smarthttp/upload_pack_test.go b/internal/gitaly/service/smarthttp/upload_pack_test.go index 6ec595b23..c75df1496 100644 --- a/internal/gitaly/service/smarthttp/upload_pack_test.go +++ b/internal/gitaly/service/smarthttp/upload_pack_test.go @@ -18,7 +18,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/git" "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" diff --git a/internal/gitaly/service/ssh/upload_pack.go b/internal/gitaly/service/ssh/upload_pack.go index b65f3899e..5392f092f 100644 --- a/internal/gitaly/service/ssh/upload_pack.go +++ b/internal/gitaly/service/ssh/upload_pack.go @@ -15,8 +15,8 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/stream" "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" diff --git a/internal/gitaly/service/ssh/upload_pack_test.go b/internal/gitaly/service/ssh/upload_pack_test.go index d56c8ab0d..c788fb243 100644 --- a/internal/gitaly/service/ssh/upload_pack_test.go +++ b/internal/gitaly/service/ssh/upload_pack_test.go @@ -19,11 +19,11 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/git" "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/helper" "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" "gitlab.com/gitlab-org/gitaly/v16/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" diff --git a/internal/sidechannel/conn.go b/internal/grpc/sidechannel/conn.go index f77bbcbe3..f77bbcbe3 100644 --- a/internal/sidechannel/conn.go +++ b/internal/grpc/sidechannel/conn.go diff --git a/internal/sidechannel/conn_test.go b/internal/grpc/sidechannel/conn_test.go index 257fd4273..257fd4273 100644 --- a/internal/sidechannel/conn_test.go +++ b/internal/grpc/sidechannel/conn_test.go diff --git a/internal/sidechannel/proxy.go b/internal/grpc/sidechannel/proxy.go index 30bebbae1..30bebbae1 100644 --- a/internal/sidechannel/proxy.go +++ b/internal/grpc/sidechannel/proxy.go diff --git a/internal/sidechannel/proxy_test.go b/internal/grpc/sidechannel/proxy_test.go index 7f49e732c..7f49e732c 100644 --- a/internal/sidechannel/proxy_test.go +++ b/internal/grpc/sidechannel/proxy_test.go diff --git a/internal/sidechannel/registry.go b/internal/grpc/sidechannel/registry.go index 3148cb05d..3148cb05d 100644 --- a/internal/sidechannel/registry.go +++ b/internal/grpc/sidechannel/registry.go diff --git a/internal/sidechannel/registry_test.go b/internal/grpc/sidechannel/registry_test.go index a0b55c2ac..a0b55c2ac 100644 --- a/internal/sidechannel/registry_test.go +++ b/internal/grpc/sidechannel/registry_test.go diff --git a/internal/sidechannel/sidechannel.go b/internal/grpc/sidechannel/sidechannel.go index 3b1efbd29..3b1efbd29 100644 --- a/internal/sidechannel/sidechannel.go +++ b/internal/grpc/sidechannel/sidechannel.go diff --git a/internal/sidechannel/sidechannel_test.go b/internal/grpc/sidechannel/sidechannel_test.go index f26389b90..f26389b90 100644 --- a/internal/sidechannel/sidechannel_test.go +++ b/internal/grpc/sidechannel/sidechannel_test.go diff --git a/internal/praefect/info_service_test.go b/internal/praefect/info_service_test.go index 4f809314b..e1f989149 100644 --- a/internal/praefect/info_service_test.go +++ b/internal/praefect/info_service_test.go @@ -12,13 +12,13 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/protoregistry" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" diff --git a/internal/praefect/node.go b/internal/praefect/node.go index a4b9ec688..0f5785918 100644 --- a/internal/praefect/node.go +++ b/internal/praefect/node.go @@ -5,11 +5,11 @@ import ( "fmt" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/client" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/manager.go b/internal/praefect/nodes/manager.go index 876d5bb5a..26cbcd95d 100644 --- a/internal/praefect/nodes/manager.go +++ b/internal/praefect/nodes/manager.go @@ -14,6 +14,7 @@ import ( gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/client" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/commonerr" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" @@ -23,7 +24,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/protoregistry" prommetrics "gitlab.com/gitlab-org/gitaly/v16/internal/prometheus/metrics" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" "google.golang.org/grpc" "google.golang.org/grpc/backoff" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/praefect/server.go b/internal/praefect/server.go index e5123ac8b..2fa522407 100644 --- a/internal/praefect/server.go +++ b/internal/praefect/server.go @@ -13,6 +13,7 @@ import ( "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth" "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/helper/fieldextractors" "gitlab.com/gitlab-org/gitaly/v16/internal/listenmux" "gitlab.com/gitlab-org/gitaly/v16/internal/log" @@ -30,7 +31,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/server" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" diff --git a/internal/praefect/server_factory_test.go b/internal/praefect/server_factory_test.go index 2e675a4d6..933976445 100644 --- a/internal/praefect/server_factory_test.go +++ b/internal/praefect/server_factory_test.go @@ -21,6 +21,7 @@ import ( gconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" "gitlab.com/gitlab-org/gitaly/v16/internal/listenmux" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" @@ -29,7 +30,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/protoregistry" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" diff --git a/internal/praefect/verifier_test.go b/internal/praefect/verifier_test.go index 9a2c1c895..f7938c34a 100644 --- a/internal/praefect/verifier_test.go +++ b/internal/praefect/verifier_test.go @@ -19,6 +19,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/helper" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" @@ -27,7 +28,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/protoregistry" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/sidechannel" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" |