Skip to content

Commit d52b519

Browse files
author
Igor Drozdov
committed
Merge branch 'pks-go-module-path-version' into 'main'
go: Bump major version to v14 Closes #593 See merge request gitlab-org/gitlab-shell!666
2 parents 0d7ef23 + 822e49b commit d52b519

File tree

92 files changed

+373
-373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+373
-373
lines changed

‎client/client_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"github.com/golang-jwt/jwt/v4"
1616
"github.com/stretchr/testify/require"
1717

18-
"gitlab.com/gitlab-org/gitlab-shell/client/testserver"
19-
"gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
18+
"gitlab.com/gitlab-org/gitlab-shell/v14/client/testserver"
19+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/testhelper"
2020
)
2121

2222
var (

‎client/httpclient_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"time"
1212

1313
"github.com/stretchr/testify/require"
14-
"gitlab.com/gitlab-org/gitlab-shell/client/testserver"
14+
"gitlab.com/gitlab-org/gitlab-shell/v14/client/testserver"
1515
)
1616

1717
func TestReadTimeout(t *testing.T) {

‎client/httpsclient_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"testing"
1010

1111
"github.com/stretchr/testify/require"
12-
"gitlab.com/gitlab-org/gitlab-shell/client/testserver"
13-
"gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
12+
"gitlab.com/gitlab-org/gitlab-shell/v14/client/testserver"
13+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/testhelper"
1414
)
1515

1616
//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"

‎client/testserver/testserver.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"testing"
1515

1616
"github.com/stretchr/testify/require"
17-
"gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
17+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/testhelper"
1818
)
1919

2020
var (

‎cmd/check/command/command.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package command
22

33
import (
4-
"gitlab.com/gitlab-org/gitlab-shell/internal/command"
5-
"gitlab.com/gitlab-org/gitlab-shell/internal/command/healthcheck"
6-
"gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
7-
"gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand"
8-
"gitlab.com/gitlab-org/gitlab-shell/internal/config"
4+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command"
5+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/healthcheck"
6+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/readwriter"
7+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/shared/disallowedcommand"
8+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
99
)
1010

1111
func New(config *config.Config, readWriter *readwriter.ReadWriter) (command.Command, error) {

‎cmd/check/command/command_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"testing"
55

66
"github.com/stretchr/testify/require"
7-
"gitlab.com/gitlab-org/gitlab-shell/cmd/check/command"
8-
"gitlab.com/gitlab-org/gitlab-shell/internal/command/healthcheck"
9-
"gitlab.com/gitlab-org/gitlab-shell/internal/config"
10-
"gitlab.com/gitlab-org/gitlab-shell/internal/executable"
11-
"gitlab.com/gitlab-org/gitlab-shell/internal/sshenv"
7+
"gitlab.com/gitlab-org/gitlab-shell/v14/cmd/check/command"
8+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/healthcheck"
9+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
10+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/executable"
11+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/sshenv"
1212
)
1313

1414
var (

‎cmd/check/main.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"fmt"
55
"os"
66

7-
checkCmd "gitlab.com/gitlab-org/gitlab-shell/cmd/check/command"
8-
"gitlab.com/gitlab-org/gitlab-shell/internal/command"
9-
"gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
10-
"gitlab.com/gitlab-org/gitlab-shell/internal/config"
11-
"gitlab.com/gitlab-org/gitlab-shell/internal/executable"
12-
"gitlab.com/gitlab-org/gitlab-shell/internal/logger"
7+
checkCmd "gitlab.com/gitlab-org/gitlab-shell/v14/cmd/check/command"
8+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command"
9+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/readwriter"
10+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
11+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/executable"
12+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/logger"
1313
)
1414

1515
func main() {

‎cmd/gitlab-shell-authorized-keys-check/command/command.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package command
22

33
import (
4-
"gitlab.com/gitlab-org/gitlab-shell/internal/command"
5-
"gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedkeys"
6-
"gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
7-
"gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
8-
"gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand"
9-
"gitlab.com/gitlab-org/gitlab-shell/internal/config"
4+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command"
5+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/authorizedkeys"
6+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/commandargs"
7+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/readwriter"
8+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/shared/disallowedcommand"
9+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
1010
)
1111

1212
func New(arguments []string, config *config.Config, readWriter *readwriter.ReadWriter) (command.Command, error) {

‎cmd/gitlab-shell-authorized-keys-check/command/command_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"testing"
55

66
"github.com/stretchr/testify/require"
7-
"gitlab.com/gitlab-org/gitlab-shell/cmd/gitlab-shell-authorized-keys-check/command"
8-
"gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedkeys"
9-
"gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
10-
"gitlab.com/gitlab-org/gitlab-shell/internal/config"
11-
"gitlab.com/gitlab-org/gitlab-shell/internal/executable"
12-
"gitlab.com/gitlab-org/gitlab-shell/internal/sshenv"
7+
"gitlab.com/gitlab-org/gitlab-shell/v14/cmd/gitlab-shell-authorized-keys-check/command"
8+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/authorizedkeys"
9+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/commandargs"
10+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
11+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/executable"
12+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/sshenv"
1313
)
1414

1515
var (

‎cmd/gitlab-shell-authorized-keys-check/main.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"fmt"
55
"os"
66

7-
cmd "gitlab.com/gitlab-org/gitlab-shell/cmd/gitlab-shell-authorized-keys-check/command"
8-
"gitlab.com/gitlab-org/gitlab-shell/internal/command"
9-
"gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
10-
"gitlab.com/gitlab-org/gitlab-shell/internal/config"
11-
"gitlab.com/gitlab-org/gitlab-shell/internal/console"
12-
"gitlab.com/gitlab-org/gitlab-shell/internal/executable"
13-
"gitlab.com/gitlab-org/gitlab-shell/internal/logger"
7+
cmd "gitlab.com/gitlab-org/gitlab-shell/v14/cmd/gitlab-shell-authorized-keys-check/command"
8+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command"
9+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/readwriter"
10+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
11+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/console"
12+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/executable"
13+
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/logger"
1414
)
1515

1616
func main() {

0 commit comments

Comments
 (0)