summaryrefslogtreecommitdiff
path: root/internal/command
diff options
context:
space:
mode:
authorPavlo Strokov <pstrokov@gitlab.com>2021-06-02 11:54:10 +0300
committerPavlo Strokov <pstrokov@gitlab.com>2021-06-02 11:56:45 +0300
commit9f5a802258338483075aa440225d67e95616740f (patch)
tree10f79f776fd30501c7a8db8fa2eb06a3636756c8 /internal/command
parent40ff6687b3b0fbe5285cdeccf9afb84e42823a4b (diff)
downloadgitlab-shell-9f5a802258338483075aa440225d67e95616740f.tar.gz
fix: upgrade of the gitaly dependency
Gitaly project now properly respects module release flow and includes a module suffix in the package name. It requires to re-write all non-suffixed imports with suffixed of a specific version of tha module. With proper module versioning we don't need to use a 'replace' directive to point to specific commit and can use semantic versioning for the gitaly dependency. Part of: https://gitlab.com/gitlab-org/gitaly/-/issues/3177
Diffstat (limited to 'internal/command')
-rw-r--r--internal/command/receivepack/gitalycall.go4
-rw-r--r--internal/command/uploadarchive/gitalycall.go4
-rw-r--r--internal/command/uploadpack/gitalycall.go4
3 files changed, 6 insertions, 6 deletions
diff --git a/internal/command/receivepack/gitalycall.go b/internal/command/receivepack/gitalycall.go
index 06e7b2c..072656a 100644
--- a/internal/command/receivepack/gitalycall.go
+++ b/internal/command/receivepack/gitalycall.go
@@ -5,8 +5,8 @@ import (
"google.golang.org/grpc"
- "gitlab.com/gitlab-org/gitaly/client"
- pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
+ "gitlab.com/gitlab-org/gitaly/v14/client"
+ pb "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
"gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/internal/handler"
diff --git a/internal/command/uploadarchive/gitalycall.go b/internal/command/uploadarchive/gitalycall.go
index 5b66bbb..5a7d2e6 100644
--- a/internal/command/uploadarchive/gitalycall.go
+++ b/internal/command/uploadarchive/gitalycall.go
@@ -5,8 +5,8 @@ import (
"google.golang.org/grpc"
- "gitlab.com/gitlab-org/gitaly/client"
- pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
+ "gitlab.com/gitlab-org/gitaly/v14/client"
+ pb "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
"gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/internal/handler"
diff --git a/internal/command/uploadpack/gitalycall.go b/internal/command/uploadpack/gitalycall.go
index a263fc4..0e6a6d0 100644
--- a/internal/command/uploadpack/gitalycall.go
+++ b/internal/command/uploadpack/gitalycall.go
@@ -5,8 +5,8 @@ import (
"google.golang.org/grpc"
- "gitlab.com/gitlab-org/gitaly/client"
- pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
+ "gitlab.com/gitlab-org/gitaly/v14/client"
+ pb "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
"gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/internal/handler"