Merge branch 'jc-upgrade-gitaly' into 'master'

Upgrade Gitaly to 1.68.0

See merge request gitlab-org/gitlab-shell!347

go/cmd/gitaly-receive-pack/main.go

@@ -8,7 +8,7 @@ import (
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/logger"
 	"google.golang.org/grpc"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 )
 
 func init() {

go/cmd/gitaly-receive-pack/main_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 )
 
 func Test_deserialize(t *testing.T) {

go/cmd/gitaly-upload-archive/main.go

@@ -8,7 +8,7 @@ import (
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/logger"
 	"google.golang.org/grpc"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 )
 
 func init() {

go/cmd/gitaly-upload-archive/main_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 )
 
 func Test_deserialize(t *testing.T) {

go/cmd/gitaly-upload-pack/main.go

@@ -8,7 +8,7 @@ import (
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/logger"
 	"google.golang.org/grpc"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 )
 
 func init() {

go/cmd/gitaly-upload-pack/main_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 )
 
 func Test_deserialize(t *testing.T) {

go/go.mod

@@ -6,17 +6,11 @@ require (
 	github.com/mattn/go-shellwords v0.0.0-20190425161501-2444a32a19f4
 	github.com/otiai10/copy v1.0.1
 	github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 // indirect
-	github.com/sirupsen/logrus v1.0.5
-	github.com/stretchr/testify v1.2.2
-	gitlab.com/gitlab-org/gitaly v1.7.0
-	gitlab.com/gitlab-org/gitaly-proto v1.12.0
+	github.com/sirupsen/logrus v1.2.0
+	github.com/stretchr/testify v1.3.0
+	gitlab.com/gitlab-org/gitaly v1.68.0
 	gitlab.com/gitlab-org/labkit v0.0.0-20190221122536-0c3fc7cdd57c
-	golang.org/x/crypto v0.0.0-20180312195533-182114d58262 // indirect
-	golang.org/x/sys v0.0.0-20181206074257-70b957f3b65e // indirect
-	google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898 // indirect
-	google.golang.org/grpc v1.16.0
+	google.golang.org/grpc v1.24.0
 	gopkg.in/DataDog/dd-trace-go.v1 v1.9.0 // indirect
-	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
-	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
-	gopkg.in/yaml.v2 v2.2.1
+	gopkg.in/yaml.v2 v2.2.2
 )

go/internal/command/receivepack/gitalycall.go

@@ -5,8 +5,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/client"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/accessverifier"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/handler"

go/internal/command/uploadarchive/gitalycall.go

@@ -5,8 +5,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/client"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/handler"

go/internal/command/uploadpack/gitalycall.go

@@ -5,8 +5,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/client"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/handler"

go/internal/gitlabnet/accessverifier/client.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/config"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet"

go/internal/gitlabnet/accessverifier/client_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/config"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet"

go/internal/gitlabnet/testserver/gitalyserver.go

@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 )
 
 type testGitalyServer struct{}

go/internal/handler/receive_pack.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"os"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/client"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc"
 )
 

go/internal/handler/upload_archive.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"os"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/client"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc"
 )
 

go/internal/handler/upload_pack.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"os"
 
-	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/client"
+	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc"
 )