summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/check/command/command.go10
-rw-r--r--cmd/check/command/command_test.go10
-rw-r--r--cmd/check/main.go12
-rw-r--r--cmd/gitlab-shell-authorized-keys-check/command/command.go12
-rw-r--r--cmd/gitlab-shell-authorized-keys-check/command/command_test.go12
-rw-r--r--cmd/gitlab-shell-authorized-keys-check/main.go14
-rw-r--r--cmd/gitlab-shell-authorized-principals-check/command/command.go12
-rw-r--r--cmd/gitlab-shell-authorized-principals-check/command/command_test.go12
-rw-r--r--cmd/gitlab-shell-authorized-principals-check/main.go14
-rw-r--r--cmd/gitlab-shell/command/command.go28
-rw-r--r--cmd/gitlab-shell/command/command_test.go28
-rw-r--r--cmd/gitlab-shell/main.go16
-rw-r--r--cmd/gitlab-sshd/acceptance_test.go2
-rw-r--r--cmd/gitlab-sshd/main.go8
14 files changed, 95 insertions, 95 deletions
diff --git a/cmd/check/command/command.go b/cmd/check/command/command.go
index f260681..49e17c6 100644
--- a/cmd/check/command/command.go
+++ b/cmd/check/command/command.go
@@ -1,11 +1,11 @@
package command
import (
- "gitlab.com/gitlab-org/gitlab-shell/internal/command"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/healthcheck"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand"
- "gitlab.com/gitlab-org/gitlab-shell/internal/config"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/healthcheck"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/readwriter"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/shared/disallowedcommand"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
)
func New(config *config.Config, readWriter *readwriter.ReadWriter) (command.Command, error) {
diff --git a/cmd/check/command/command_test.go b/cmd/check/command/command_test.go
index cd06456..ce3cef9 100644
--- a/cmd/check/command/command_test.go
+++ b/cmd/check/command/command_test.go
@@ -4,11 +4,11 @@ import (
"testing"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitlab-shell/cmd/check/command"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/healthcheck"
- "gitlab.com/gitlab-org/gitlab-shell/internal/config"
- "gitlab.com/gitlab-org/gitlab-shell/internal/executable"
- "gitlab.com/gitlab-org/gitlab-shell/internal/sshenv"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/cmd/check/command"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/healthcheck"
+ "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/check/main.go b/cmd/check/main.go
index e4bcdf2..578dfdf 100644
--- a/cmd/check/main.go
+++ b/cmd/check/main.go
@@ -4,12 +4,12 @@ import (
"fmt"
"os"
- checkCmd "gitlab.com/gitlab-org/gitlab-shell/cmd/check/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/executable"
- "gitlab.com/gitlab-org/gitlab-shell/internal/logger"
+ checkCmd "gitlab.com/gitlab-org/gitlab-shell/v14/cmd/check/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/executable"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/logger"
)
func main() {
diff --git a/cmd/gitlab-shell-authorized-keys-check/command/command.go b/cmd/gitlab-shell-authorized-keys-check/command/command.go
index 8cf309b..f5b26c0 100644
--- a/cmd/gitlab-shell-authorized-keys-check/command/command.go
+++ b/cmd/gitlab-shell-authorized-keys-check/command/command.go
@@ -1,12 +1,12 @@
package command
import (
- "gitlab.com/gitlab-org/gitlab-shell/internal/command"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedkeys"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand"
- "gitlab.com/gitlab-org/gitlab-shell/internal/config"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/authorizedkeys"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/commandargs"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/readwriter"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/shared/disallowedcommand"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
)
func New(arguments []string, config *config.Config, readWriter *readwriter.ReadWriter) (command.Command, error) {
diff --git a/cmd/gitlab-shell-authorized-keys-check/command/command_test.go b/cmd/gitlab-shell-authorized-keys-check/command/command_test.go
index 3343e1c..5a2c681 100644
--- a/cmd/gitlab-shell-authorized-keys-check/command/command_test.go
+++ b/cmd/gitlab-shell-authorized-keys-check/command/command_test.go
@@ -4,12 +4,12 @@ import (
"testing"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitlab-shell/cmd/gitlab-shell-authorized-keys-check/command"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedkeys"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
- "gitlab.com/gitlab-org/gitlab-shell/internal/config"
- "gitlab.com/gitlab-org/gitlab-shell/internal/executable"
- "gitlab.com/gitlab-org/gitlab-shell/internal/sshenv"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/cmd/gitlab-shell-authorized-keys-check/command"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/authorizedkeys"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/commandargs"
+ "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-authorized-keys-check/main.go b/cmd/gitlab-shell-authorized-keys-check/main.go
index ebe6da9..e272e68 100644
--- a/cmd/gitlab-shell-authorized-keys-check/main.go
+++ b/cmd/gitlab-shell-authorized-keys-check/main.go
@@ -4,13 +4,13 @@ import (
"fmt"
"os"
- cmd "gitlab.com/gitlab-org/gitlab-shell/cmd/gitlab-shell-authorized-keys-check/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"
+ cmd "gitlab.com/gitlab-org/gitlab-shell/v14/cmd/gitlab-shell-authorized-keys-check/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"
)
func main() {
diff --git a/cmd/gitlab-shell-authorized-principals-check/command/command.go b/cmd/gitlab-shell-authorized-principals-check/command/command.go
index 9418dad..a46f06d 100644
--- a/cmd/gitlab-shell-authorized-principals-check/command/command.go
+++ b/cmd/gitlab-shell-authorized-principals-check/command/command.go
@@ -1,12 +1,12 @@
package command
import (
- "gitlab.com/gitlab-org/gitlab-shell/internal/command"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedprincipals"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand"
- "gitlab.com/gitlab-org/gitlab-shell/internal/config"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/authorizedprincipals"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/commandargs"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/readwriter"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/shared/disallowedcommand"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
)
func New(arguments []string, config *config.Config, readWriter *readwriter.ReadWriter) (command.Command, error) {
diff --git a/cmd/gitlab-shell-authorized-principals-check/command/command_test.go b/cmd/gitlab-shell-authorized-principals-check/command/command_test.go
index 2ca2125..87360ef 100644
--- a/cmd/gitlab-shell-authorized-principals-check/command/command_test.go
+++ b/cmd/gitlab-shell-authorized-principals-check/command/command_test.go
@@ -4,12 +4,12 @@ import (
"testing"
"github.com/stretchr/testify/require"
- cmd "gitlab.com/gitlab-org/gitlab-shell/cmd/gitlab-shell-authorized-principals-check/command"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedprincipals"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
- "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-authorized-principals-check/command"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/authorizedprincipals"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/commandargs"
+ "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-authorized-principals-check/main.go b/cmd/gitlab-shell-authorized-principals-check/main.go
index 3e18b9d..10d3daa 100644
--- a/cmd/gitlab-shell-authorized-principals-check/main.go
+++ b/cmd/gitlab-shell-authorized-principals-check/main.go
@@ -4,13 +4,13 @@ import (
"fmt"
"os"
- cmd "gitlab.com/gitlab-org/gitlab-shell/cmd/gitlab-shell-authorized-principals-check/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"
+ cmd "gitlab.com/gitlab-org/gitlab-shell/v14/cmd/gitlab-shell-authorized-principals-check/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"
)
func main() {
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 (
diff --git a/cmd/gitlab-sshd/acceptance_test.go b/cmd/gitlab-sshd/acceptance_test.go
index aa0f196..9dcb84c 100644
--- a/cmd/gitlab-sshd/acceptance_test.go
+++ b/cmd/gitlab-sshd/acceptance_test.go
@@ -24,7 +24,7 @@ import (
"github.com/stretchr/testify/require"
gitalyClient "gitlab.com/gitlab-org/gitaly/v14/client"
pb "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
- "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/testhelper"
"golang.org/x/crypto/ssh"
)
diff --git a/cmd/gitlab-sshd/main.go b/cmd/gitlab-sshd/main.go
index 16fbca0..330c25f 100644
--- a/cmd/gitlab-sshd/main.go
+++ b/cmd/gitlab-sshd/main.go
@@ -8,10 +8,10 @@ import (
"syscall"
"time"
- "gitlab.com/gitlab-org/gitlab-shell/internal/command"
- "gitlab.com/gitlab-org/gitlab-shell/internal/config"
- "gitlab.com/gitlab-org/gitlab-shell/internal/logger"
- "gitlab.com/gitlab-org/gitlab-shell/internal/sshd"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/command"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/logger"
+ "gitlab.com/gitlab-org/gitlab-shell/v14/internal/sshd"
"gitlab.com/gitlab-org/labkit/log"
"gitlab.com/gitlab-org/labkit/monitoring"
View Lorry Controller Status