summaryrefslogtreecommitdiff
path: root/go/internal
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-12-06 12:31:31 +0100
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-12-06 12:31:31 +0100
commita7c243bb6d36684329fa8e9b96a95f2c22ba81e5 (patch)
treea760fef0c9c99afd9752dbbc902308df67a0a011 /go/internal
parent46f0594457d805ae43b509c38cc5bb95ef76f4c9 (diff)
downloadgitlab-shell-a7c243bb6d36684329fa8e9b96a95f2c22ba81e5.tar.gz
Upgrade gitaly Client dependency
The client now has TLS support. So this gets pulled into this component. To make it work, we have to upgrade the proto too.
Diffstat (limited to 'go/internal')
-rw-r--r--go/internal/handler/receive_pack.go4
-rw-r--r--go/internal/handler/upload_archive.go4
-rw-r--r--go/internal/handler/upload_pack.go4
3 files changed, 6 insertions, 6 deletions
diff --git a/go/internal/handler/receive_pack.go b/go/internal/handler/receive_pack.go
index e69486f..096204f 100644
--- a/go/internal/handler/receive_pack.go
+++ b/go/internal/handler/receive_pack.go
@@ -5,11 +5,11 @@ import (
"fmt"
"os"
- pb "gitlab.com/gitlab-org/gitaly-proto/go"
+ "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
"gitlab.com/gitlab-org/gitaly/client"
)
-func ReceivePack(gitalyAddress string, request *pb.SSHReceivePackRequest) (int32, error) {
+func ReceivePack(gitalyAddress string, request *gitalypb.SSHReceivePackRequest) (int32, error) {
if gitalyAddress == "" {
return 0, fmt.Errorf("no gitaly_address given")
}
diff --git a/go/internal/handler/upload_archive.go b/go/internal/handler/upload_archive.go
index 4ab1e71..8028c5b 100644
--- a/go/internal/handler/upload_archive.go
+++ b/go/internal/handler/upload_archive.go
@@ -5,11 +5,11 @@ import (
"fmt"
"os"
- pb "gitlab.com/gitlab-org/gitaly-proto/go"
+ "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
"gitlab.com/gitlab-org/gitaly/client"
)
-func UploadArchive(gitalyAddress string, request *pb.SSHUploadArchiveRequest) (int32, error) {
+func UploadArchive(gitalyAddress string, request *gitalypb.SSHUploadArchiveRequest) (int32, error) {
if gitalyAddress == "" {
return 0, fmt.Errorf("no gitaly_address given")
}
diff --git a/go/internal/handler/upload_pack.go b/go/internal/handler/upload_pack.go
index 51a2f3b..2aec2eb 100644
--- a/go/internal/handler/upload_pack.go
+++ b/go/internal/handler/upload_pack.go
@@ -5,11 +5,11 @@ import (
"fmt"
"os"
- pb "gitlab.com/gitlab-org/gitaly-proto/go"
+ "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
"gitlab.com/gitlab-org/gitaly/client"
)
-func UploadPack(gitalyAddress string, request *pb.SSHUploadPackRequest) (int32, error) {
+func UploadPack(gitalyAddress string, request *gitalypb.SSHUploadPackRequest) (int32, error) {
if gitalyAddress == "" {
return 0, fmt.Errorf("no gitaly_address given")
}