diff options
author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-07-05 08:43:54 +0200 |
---|---|---|
committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-07-05 08:44:14 +0200 |
commit | 822e49b34afbc2092ae189091d693ae7867a8e5a (patch) | |
tree | 03ee935b241721d4b645f9ad95d11401e81932ab /cmd/gitlab-shell | |
parent | 0d7ef238cb8c05eabaec85e62bec70a40147d1df (diff) | |
download | gitlab-shell-822e49b34afbc2092ae189091d693ae7867a8e5a.tar.gz |
go: Bump major version to v14
While gitlab-shell currently has a major version of v14, the module path
it exposes is not using that major version like it is required by the Go
standard. This makes it impossible for dependents to import gitlab-shell
as a dependency without using a commit as version.
Fix this by changing the module path of gitlab-shell to instead be
`gitlab.com/gitlab-org/gitlab-shell/v14` and adjust all imports
accordingly.
Changelog: fixed
Diffstat (limited to 'cmd/gitlab-shell')
-rw-r--r-- | cmd/gitlab-shell/command/command.go | 28 | ||||
-rw-r--r-- | cmd/gitlab-shell/command/command_test.go | 28 | ||||
-rw-r--r-- | cmd/gitlab-shell/main.go | 16 |
3 files changed, 36 insertions, 36 deletions
diff --git a/cmd/gitlab-shell/command/command.go b/cmd/gitlab-shell/command/command.go index 5f828cd..08b3af6 100644 --- a/cmd/gitlab-shell/command/command.go +++ b/cmd/gitlab-shell/command/command.go @@ -1,20 +1,20 @@ package command import ( - "gitlab.com/gitlab-org/gitlab-shell/internal/command" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/discover" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/lfsauthenticate" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/personalaccesstoken" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/receivepack" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/twofactorrecover" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/twofactorverify" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/uploadarchive" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/uploadpack" - "gitlab.com/gitlab-org/gitlab-shell/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/internal/sshenv" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/commandargs" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/discover" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/lfsauthenticate" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/personalaccesstoken" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/readwriter" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/receivepack" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/shared/disallowedcommand" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/twofactorrecover" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/twofactorverify" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/uploadarchive" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/uploadpack" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/sshenv" ) func New(arguments []string, env sshenv.Env, config *config.Config, readWriter *readwriter.ReadWriter) (command.Command, error) { diff --git a/cmd/gitlab-shell/command/command_test.go b/cmd/gitlab-shell/command/command_test.go index ba0db7d..76c4d26 100644 --- a/cmd/gitlab-shell/command/command_test.go +++ b/cmd/gitlab-shell/command/command_test.go @@ -5,20 +5,20 @@ import ( "testing" "github.com/stretchr/testify/require" - cmd "gitlab.com/gitlab-org/gitlab-shell/cmd/gitlab-shell/command" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/discover" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/lfsauthenticate" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/personalaccesstoken" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/receivepack" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/twofactorrecover" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/twofactorverify" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/uploadarchive" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/uploadpack" - "gitlab.com/gitlab-org/gitlab-shell/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/internal/executable" - "gitlab.com/gitlab-org/gitlab-shell/internal/sshenv" + cmd "gitlab.com/gitlab-org/gitlab-shell/v14/cmd/gitlab-shell/command" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/commandargs" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/discover" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/lfsauthenticate" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/personalaccesstoken" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/receivepack" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/shared/disallowedcommand" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/twofactorrecover" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/twofactorverify" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/uploadarchive" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/uploadpack" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/executable" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/sshenv" ) var ( diff --git a/cmd/gitlab-shell/main.go b/cmd/gitlab-shell/main.go index 82d24bf..b789b77 100644 --- a/cmd/gitlab-shell/main.go +++ b/cmd/gitlab-shell/main.go @@ -11,14 +11,14 @@ import ( "gitlab.com/gitlab-org/labkit/fips" "gitlab.com/gitlab-org/labkit/log" - shellCmd "gitlab.com/gitlab-org/gitlab-shell/cmd/gitlab-shell/command" - "gitlab.com/gitlab-org/gitlab-shell/internal/command" - "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/internal/console" - "gitlab.com/gitlab-org/gitlab-shell/internal/executable" - "gitlab.com/gitlab-org/gitlab-shell/internal/logger" - "gitlab.com/gitlab-org/gitlab-shell/internal/sshenv" + shellCmd "gitlab.com/gitlab-org/gitlab-shell/v14/cmd/gitlab-shell/command" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/readwriter" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/console" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/executable" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/logger" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/sshenv" ) var ( |