diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2021-06-02 11:54:10 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2021-06-02 11:56:45 +0300 |
| commit | 9f5a802258338483075aa440225d67e95616740f (patch) | |
| tree | 10f79f776fd30501c7a8db8fa2eb06a3636756c8 /internal/handler | |
| parent | 40ff6687b3b0fbe5285cdeccf9afb84e42823a4b (diff) | |
| download | gitlab-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/handler')
| -rw-r--r-- | internal/handler/exec.go | 6 | ||||
| -rw-r--r-- | internal/handler/exec_test.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/internal/handler/exec.go b/internal/handler/exec.go index 1a7716e..fd0ea89 100644 --- a/internal/handler/exec.go +++ b/internal/handler/exec.go @@ -12,9 +12,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v14/auth" + "gitlab.com/gitlab-org/gitaly/v14/client" + pb "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb" "gitlab.com/gitlab-org/gitlab-shell/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/sshenv" diff --git a/internal/handler/exec_test.go b/internal/handler/exec_test.go index 9b8fee8..5ad0675 100644 --- a/internal/handler/exec_test.go +++ b/internal/handler/exec_test.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + pb "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb" "gitlab.com/gitlab-org/gitlab-shell/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/sshenv" |