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 /client | |
| 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 'client')
| -rw-r--r-- | client/client_test.go | 4 | ||||
| -rw-r--r-- | client/httpclient_test.go | 2 | ||||
| -rw-r--r-- | client/httpsclient_test.go | 4 | ||||
| -rw-r--r-- | client/testserver/testserver.go | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/client/client_test.go b/client/client_test.go index 06036b6..37f7d3c 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -15,8 +15,8 @@ import ( "github.com/golang-jwt/jwt/v4" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/client/testserver" - "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" + "gitlab.com/gitlab-org/gitlab-shell/v14/client/testserver" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/testhelper" ) var ( diff --git a/client/httpclient_test.go b/client/httpclient_test.go index 7804b51..ea05a88 100644 --- a/client/httpclient_test.go +++ b/client/httpclient_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/client/testserver" + "gitlab.com/gitlab-org/gitlab-shell/v14/client/testserver" ) func TestReadTimeout(t *testing.T) { diff --git a/client/httpsclient_test.go b/client/httpsclient_test.go index 2ab0605..d220171 100644 --- a/client/httpsclient_test.go +++ b/client/httpsclient_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/client/testserver" - "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" + "gitlab.com/gitlab-org/gitlab-shell/v14/client/testserver" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/testhelper" ) //go:generate openssl req -newkey rsa:4096 -new -nodes -x509 -days 3650 -out ../internal/testhelper/testdata/testroot/certs/client/server.crt -keyout ../internal/testhelper/testdata/testroot/certs/client/key.pem -subj "/C=US/ST=California/L=San Francisco/O=GitLab/OU=GitLab-Shell/CN=localhost" diff --git a/client/testserver/testserver.go b/client/testserver/testserver.go index 6344415..b09c7ba 100644 --- a/client/testserver/testserver.go +++ b/client/testserver/testserver.go @@ -14,7 +14,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" + "gitlab.com/gitlab-org/gitlab-shell/v14/internal/testhelper" ) var ( |