diff options
| author | Igor <idrozdov@gitlab.com> | 2019-10-21 16:25:53 +0000 |
|---|---|---|
| committer | Igor <idrozdov@gitlab.com> | 2019-10-21 16:25:53 +0000 |
| commit | 629e3bf9c31687f7b824cf29ba07ad2ce402e280 (patch) | |
| tree | 0f80f7394231d39970f23a08ba9ba2ce7051e22c | |
| parent | 7d5229db263a62661653431881bef8b46984d0de (diff) | |
| parent | ede41ee451dd0aa6d0ecd958c7fadbdb3b63f3e4 (diff) | |
| download | gitlab-shell-629e3bf9c31687f7b824cf29ba07ad2ce402e280.tar.gz | |
Merge branch '173-move-go-code-up-one-level' into 'master'
Move Go code up one level
See merge request gitlab-org/gitlab-shell!350
| -rw-r--r-- | Makefile | 10 | ||||
| -rwxr-xr-x | bin/compile | 20 | ||||
| -rwxr-xr-x | bin/install | 1 | ||||
| -rw-r--r-- | cmd/check/main.go (renamed from go/cmd/check/main.go) | 8 | ||||
| -rw-r--r-- | cmd/gitlab-shell-authorized-keys-check/main.go (renamed from go/cmd/gitlab-shell-authorized-keys-check/main.go) | 8 | ||||
| -rw-r--r-- | cmd/gitlab-shell-authorized-principals-check/main.go (renamed from go/cmd/gitlab-shell-authorized-principals-check/main.go) | 8 | ||||
| -rw-r--r-- | cmd/gitlab-shell/main.go (renamed from go/cmd/gitlab-shell/main.go) | 8 | ||||
| -rw-r--r-- | go.mod (renamed from go/go.mod) | 4 | ||||
| -rw-r--r-- | go.sum (renamed from go/go.sum) | 0 | ||||
| -rw-r--r-- | go/README.md | 18 | ||||
| -rw-r--r-- | internal/command/authorizedkeys/authorized_keys.go (renamed from go/internal/command/authorizedkeys/authorized_keys.go) | 10 | ||||
| -rw-r--r-- | internal/command/authorizedkeys/authorized_keys_test.go (renamed from go/internal/command/authorizedkeys/authorized_keys_test.go) | 8 | ||||
| -rw-r--r-- | internal/command/authorizedprincipals/authorized_principals.go (renamed from go/internal/command/authorizedprincipals/authorized_principals.go) | 8 | ||||
| -rw-r--r-- | internal/command/authorizedprincipals/authorized_principals_test.go (renamed from go/internal/command/authorizedprincipals/authorized_principals_test.go) | 6 | ||||
| -rw-r--r-- | internal/command/command.go (renamed from go/internal/command/command.go) | 28 | ||||
| -rw-r--r-- | internal/command/command_test.go (renamed from go/internal/command/command_test.go) | 26 | ||||
| -rw-r--r-- | internal/command/commandargs/authorized_keys.go (renamed from go/internal/command/commandargs/authorized_keys.go) | 0 | ||||
| -rw-r--r-- | internal/command/commandargs/authorized_principals.go (renamed from go/internal/command/commandargs/authorized_principals.go) | 0 | ||||
| -rw-r--r-- | internal/command/commandargs/command_args.go (renamed from go/internal/command/commandargs/command_args.go) | 2 | ||||
| -rw-r--r-- | internal/command/commandargs/command_args_test.go (renamed from go/internal/command/commandargs/command_args_test.go) | 4 | ||||
| -rw-r--r-- | internal/command/commandargs/generic_args.go (renamed from go/internal/command/commandargs/generic_args.go) | 0 | ||||
| -rw-r--r-- | internal/command/commandargs/shell.go (renamed from go/internal/command/commandargs/shell.go) | 0 | ||||
| -rw-r--r-- | internal/command/discover/discover.go (renamed from go/internal/command/discover/discover.go) | 8 | ||||
| -rw-r--r-- | internal/command/discover/discover_test.go (renamed from go/internal/command/discover/discover_test.go) | 8 | ||||
| -rw-r--r-- | internal/command/healthcheck/healthcheck.go (renamed from go/internal/command/healthcheck/healthcheck.go) | 6 | ||||
| -rw-r--r-- | internal/command/healthcheck/healthcheck_test.go (renamed from go/internal/command/healthcheck/healthcheck_test.go) | 8 | ||||
| -rw-r--r-- | internal/command/lfsauthenticate/lfsauthenticate.go (renamed from go/internal/command/lfsauthenticate/lfsauthenticate.go) | 12 | ||||
| -rw-r--r-- | internal/command/lfsauthenticate/lfsauthenticate_test.go (renamed from go/internal/command/lfsauthenticate/lfsauthenticate_test.go) | 14 | ||||
| -rw-r--r-- | internal/command/readwriter/readwriter.go (renamed from go/internal/command/readwriter/readwriter.go) | 0 | ||||
| -rw-r--r-- | internal/command/receivepack/customaction.go (renamed from go/internal/command/receivepack/customaction.go) | 4 | ||||
| -rw-r--r-- | internal/command/receivepack/customaction_test.go (renamed from go/internal/command/receivepack/customaction_test.go) | 10 | ||||
| -rw-r--r-- | internal/command/receivepack/gitalycall.go (renamed from go/internal/command/receivepack/gitalycall.go) | 6 | ||||
| -rw-r--r-- | internal/command/receivepack/gitalycall_test.go (renamed from go/internal/command/receivepack/gitalycall_test.go) | 10 | ||||
| -rw-r--r-- | internal/command/receivepack/receivepack.go (renamed from go/internal/command/receivepack/receivepack.go) | 10 | ||||
| -rw-r--r-- | internal/command/receivepack/receivepack_test.go (renamed from go/internal/command/receivepack/receivepack_test.go) | 10 | ||||
| -rw-r--r-- | internal/command/shared/accessverifier/accessverifier.go (renamed from go/internal/command/shared/accessverifier/accessverifier.go) | 8 | ||||
| -rw-r--r-- | internal/command/shared/accessverifier/accessverifier_test.go (renamed from go/internal/command/shared/accessverifier/accessverifier_test.go) | 10 | ||||
| -rw-r--r-- | internal/command/shared/disallowedcommand/disallowedcommand.go (renamed from go/internal/command/shared/disallowedcommand/disallowedcommand.go) | 0 | ||||
| -rw-r--r-- | internal/command/twofactorrecover/twofactorrecover.go (renamed from go/internal/command/twofactorrecover/twofactorrecover.go) | 8 | ||||
| -rw-r--r-- | internal/command/twofactorrecover/twofactorrecover_test.go (renamed from go/internal/command/twofactorrecover/twofactorrecover_test.go) | 10 | ||||
| -rw-r--r-- | internal/command/uploadarchive/gitalycall.go (renamed from go/internal/command/uploadarchive/gitalycall.go) | 6 | ||||
| -rw-r--r-- | internal/command/uploadarchive/gitalycall_test.go (renamed from go/internal/command/uploadarchive/gitalycall_test.go) | 10 | ||||
| -rw-r--r-- | internal/command/uploadarchive/uploadarchive.go (renamed from go/internal/command/uploadarchive/uploadarchive.go) | 10 | ||||
| -rw-r--r-- | internal/command/uploadarchive/uploadarchive_test.go (renamed from go/internal/command/uploadarchive/uploadarchive_test.go) | 10 | ||||
| -rw-r--r-- | internal/command/uploadpack/gitalycall.go (renamed from go/internal/command/uploadpack/gitalycall.go) | 6 | ||||
| -rw-r--r-- | internal/command/uploadpack/gitalycall_test.go (renamed from go/internal/command/uploadpack/gitalycall_test.go) | 10 | ||||
| -rw-r--r-- | internal/command/uploadpack/uploadpack.go (renamed from go/internal/command/uploadpack/uploadpack.go) | 10 | ||||
| -rw-r--r-- | internal/command/uploadpack/uploadpack_test.go (renamed from go/internal/command/uploadpack/uploadpack_test.go) | 10 | ||||
| -rw-r--r-- | internal/config/config.go (renamed from go/internal/config/config.go) | 0 | ||||
| -rw-r--r-- | internal/config/config_test.go (renamed from go/internal/config/config_test.go) | 2 | ||||
| -rw-r--r-- | internal/config/httpclient.go (renamed from go/internal/config/httpclient.go) | 0 | ||||
| -rw-r--r-- | internal/config/httpclient_test.go (renamed from go/internal/config/httpclient_test.go) | 0 | ||||
| -rw-r--r-- | internal/executable/executable.go (renamed from go/internal/executable/executable.go) | 0 | ||||
| -rw-r--r-- | internal/executable/executable_test.go (renamed from go/internal/executable/executable_test.go) | 2 | ||||
| -rw-r--r-- | internal/gitlabnet/accessverifier/client.go (renamed from go/internal/gitlabnet/accessverifier/client.go) | 8 | ||||
| -rw-r--r-- | internal/gitlabnet/accessverifier/client_test.go (renamed from go/internal/gitlabnet/accessverifier/client_test.go) | 10 | ||||
| -rw-r--r-- | internal/gitlabnet/authorizedkeys/client.go (renamed from go/internal/gitlabnet/authorizedkeys/client.go) | 4 | ||||
| -rw-r--r-- | internal/gitlabnet/authorizedkeys/client_test.go (renamed from go/internal/gitlabnet/authorizedkeys/client_test.go) | 6 | ||||
| -rw-r--r-- | internal/gitlabnet/client.go (renamed from go/internal/gitlabnet/client.go) | 2 | ||||
| -rw-r--r-- | internal/gitlabnet/client_test.go (renamed from go/internal/gitlabnet/client_test.go) | 6 | ||||
| -rw-r--r-- | internal/gitlabnet/discover/client.go (renamed from go/internal/gitlabnet/discover/client.go) | 6 | ||||
| -rw-r--r-- | internal/gitlabnet/discover/client_test.go (renamed from go/internal/gitlabnet/discover/client_test.go) | 6 | ||||
| -rw-r--r-- | internal/gitlabnet/healthcheck/client.go (renamed from go/internal/gitlabnet/healthcheck/client.go) | 4 | ||||
| -rw-r--r-- | internal/gitlabnet/healthcheck/client_test.go (renamed from go/internal/gitlabnet/healthcheck/client_test.go) | 4 | ||||
| -rw-r--r-- | internal/gitlabnet/httpclient_test.go (renamed from go/internal/gitlabnet/httpclient_test.go) | 4 | ||||
| -rw-r--r-- | internal/gitlabnet/httpsclient_test.go (renamed from go/internal/gitlabnet/httpsclient_test.go) | 6 | ||||
| -rw-r--r-- | internal/gitlabnet/lfsauthenticate/client.go (renamed from go/internal/gitlabnet/lfsauthenticate/client.go) | 6 | ||||
| -rw-r--r-- | internal/gitlabnet/lfsauthenticate/client_test.go (renamed from go/internal/gitlabnet/lfsauthenticate/client_test.go) | 6 | ||||
| -rw-r--r-- | internal/gitlabnet/testserver/gitalyserver.go (renamed from go/internal/gitlabnet/testserver/gitalyserver.go) | 0 | ||||
| -rw-r--r-- | internal/gitlabnet/testserver/testserver.go (renamed from go/internal/gitlabnet/testserver/testserver.go) | 2 | ||||
| -rw-r--r-- | internal/gitlabnet/twofactorrecover/client.go (renamed from go/internal/gitlabnet/twofactorrecover/client.go) | 8 | ||||
| -rw-r--r-- | internal/gitlabnet/twofactorrecover/client_test.go (renamed from go/internal/gitlabnet/twofactorrecover/client_test.go) | 10 | ||||
| -rw-r--r-- | internal/handler/exec.go (renamed from go/internal/handler/exec.go) | 2 | ||||
| -rw-r--r-- | internal/handler/exec_test.go (renamed from go/internal/handler/exec_test.go) | 2 | ||||
| -rw-r--r-- | internal/keyline/key_line.go (renamed from go/internal/keyline/key_line.go) | 2 | ||||
| -rw-r--r-- | internal/keyline/key_line_test.go (renamed from go/internal/keyline/key_line_test.go) | 0 | ||||
| -rw-r--r-- | internal/logger/logger.go (renamed from go/internal/logger/logger.go) | 2 | ||||
| -rw-r--r-- | internal/sshenv/sshenv.go (renamed from go/internal/sshenv/sshenv.go) | 0 | ||||
| -rw-r--r-- | internal/sshenv/sshenv_test.go (renamed from go/internal/sshenv/sshenv_test.go) | 2 | ||||
| -rw-r--r-- | internal/testhelper/requesthandlers/requesthandlers.go (renamed from go/internal/testhelper/requesthandlers/requesthandlers.go) | 2 | ||||
| -rw-r--r-- | internal/testhelper/testdata/testroot/.gitlab_shell_secret (renamed from go/internal/testhelper/testdata/testroot/.gitlab_shell_secret) | 0 | ||||
| -rw-r--r-- | internal/testhelper/testdata/testroot/certs/invalid/server.crt (renamed from go/internal/testhelper/testdata/testroot/certs/invalid/server.crt) | 0 | ||||
| -rw-r--r-- | internal/testhelper/testdata/testroot/certs/valid/dir/.gitkeep (renamed from go/internal/testhelper/testdata/testroot/certs/valid/dir/.gitkeep) | 0 | ||||
| -rw-r--r-- | internal/testhelper/testdata/testroot/certs/valid/server.crt (renamed from go/internal/testhelper/testdata/testroot/certs/valid/server.crt) | 0 | ||||
| -rw-r--r-- | internal/testhelper/testdata/testroot/certs/valid/server.key (renamed from go/internal/testhelper/testdata/testroot/certs/valid/server.key) | 0 | ||||
| -rw-r--r-- | internal/testhelper/testdata/testroot/config.yml (renamed from go/internal/testhelper/testdata/testroot/config.yml) | 0 | ||||
| -rw-r--r-- | internal/testhelper/testdata/testroot/custom/my-contents-is-secret (renamed from go/internal/testhelper/testdata/testroot/custom/my-contents-is-secret) | 0 | ||||
| -rw-r--r-- | internal/testhelper/testdata/testroot/gitlab-shell.log (renamed from go/internal/testhelper/testdata/testroot/gitlab-shell.log) | 0 | ||||
| -rw-r--r-- | internal/testhelper/testdata/testroot/responses/allowed.json (renamed from go/internal/testhelper/testdata/testroot/responses/allowed.json) | 0 | ||||
| -rw-r--r-- | internal/testhelper/testdata/testroot/responses/allowed_with_payload.json (renamed from go/internal/testhelper/testdata/testroot/responses/allowed_with_payload.json) | 0 | ||||
| -rw-r--r-- | internal/testhelper/testhelper.go (renamed from go/internal/testhelper/testhelper.go) | 0 | ||||
| -rw-r--r-- | support/gitlab_config.rb | 3 | ||||
| -rwxr-xr-x | support/go-format | 16 | ||||
| -rwxr-xr-x | support/go-test | 12 | ||||
| -rw-r--r-- | support/go_build.rb | 37 |
95 files changed, 235 insertions, 338 deletions
@@ -1,6 +1,6 @@ .PHONY: validate verify verify_ruby verify_golang test test_ruby test_golang setup _install build compile check clean -GO_SOURCES := $(shell find go -name '*.go') +GO_SOURCES := $(shell find . -name '*.go') validate: verify test @@ -10,7 +10,7 @@ verify_ruby: bundle exec rubocop verify_golang: - support/go-format check + gofmt -s -l $(GO_SOURCES) test: test_ruby test_golang @@ -19,7 +19,7 @@ test_ruby: bundle exec rspec --color --format d spec test_golang: - support/go-test + go test ./... setup: _install bin/gitlab-shell @@ -29,10 +29,10 @@ _install: build: bin/gitlab-shell compile: bin/gitlab-shell bin/gitlab-shell: $(GO_SOURCES) - bin/compile + GOBIN="$(CURDIR)/bin" go install ./cmd/... check: bin/check clean: - rm -f bin/gitlab-shell bin/gitlab-shell-authorized-keys-check bin/gitlab-shell-authorized-principals-check + rm -f bin/check bin/gitlab-shell bin/gitlab-shell-authorized-keys-check bin/gitlab-shell-authorized-principals-check diff --git a/bin/compile b/bin/compile deleted file mode 100755 index e6eacca..0000000 --- a/bin/compile +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env ruby - -require 'fileutils' - -require_relative '../support/go_build' -include GoBuild - -BUILD_BIN_GLOB = File.join(BUILD_DIR, 'bin', '*') -ROOT_BIN = File.join(ROOT_PATH, 'bin') - -def main - ensure_build_dir_exists - - run!(GO_ENV, %W[go install ./cmd/...], chdir: GO_DIR) - executables = Dir[BUILD_BIN_GLOB] - FileUtils.chmod(0755, executables) - FileUtils.cp(executables, ROOT_BIN) -end - -main diff --git a/bin/install b/bin/install index d6e5357..323e758 100755 --- a/bin/install +++ b/bin/install @@ -1,7 +1,6 @@ #!/usr/bin/env ruby # Load ROOT_PATH and access the minimum necessary config file -require_relative '../support/go_build' require_relative '../support/gitlab_config' config = GitlabConfig.new diff --git a/go/cmd/check/main.go b/cmd/check/main.go index 1d32f77..a72d38c 100644 --- a/go/cmd/check/main.go +++ b/cmd/check/main.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" + "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" ) func main() { diff --git a/go/cmd/gitlab-shell-authorized-keys-check/main.go b/cmd/gitlab-shell-authorized-keys-check/main.go index d8bb524..6b52181 100644 --- a/go/cmd/gitlab-shell-authorized-keys-check/main.go +++ b/cmd/gitlab-shell-authorized-keys-check/main.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" + "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" ) func main() { diff --git a/go/cmd/gitlab-shell-authorized-principals-check/main.go b/cmd/gitlab-shell-authorized-principals-check/main.go index 5c9caf8..645ccf0 100644 --- a/go/cmd/gitlab-shell-authorized-principals-check/main.go +++ b/cmd/gitlab-shell-authorized-principals-check/main.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" + "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" ) func main() { diff --git a/go/cmd/gitlab-shell/main.go b/cmd/gitlab-shell/main.go index adb5198..148c652 100644 --- a/go/cmd/gitlab-shell/main.go +++ b/cmd/gitlab-shell/main.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" + "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" ) func main() { @@ -1,16 +1,14 @@ -module gitlab.com/gitlab-org/gitlab-shell/go +module gitlab.com/gitlab-org/gitlab-shell go 1.12 require ( github.com/mattn/go-shellwords v0.0.0-20190425161501-2444a32a19f4 github.com/otiai10/copy v1.0.1 - github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 // indirect github.com/sirupsen/logrus v1.2.0 github.com/stretchr/testify v1.3.0 gitlab.com/gitlab-org/gitaly v1.68.0 gitlab.com/gitlab-org/labkit v0.0.0-20190221122536-0c3fc7cdd57c google.golang.org/grpc v1.24.0 - gopkg.in/DataDog/dd-trace-go.v1 v1.9.0 // indirect gopkg.in/yaml.v2 v2.2.2 ) diff --git a/go/README.md b/go/README.md deleted file mode 100644 index 6bbc03e..0000000 --- a/go/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# Go executables for gitlab-shell - -This directory contains Go executables for use in gitlab-shell. To add -a new command `foobar` create a subdirectory `cmd/foobar` and put your -code in `package main` under `cmd/foobar`. This will automatically get -compiled into `bin/foobar` by `../bin/compile`. - -## Vendoring - -We use vendoring in order to include third-party Go libraries. This -project uses [govendor](https://github.com/kardianos/govendor). - -To update e.g. `gitaly-proto` run the following command in the root -directory of the project. - -``` -support/go-update-vendor gitlab.com/gitlab-org/gitaly-proto/go@v0.109.0 -``` diff --git a/go/internal/command/authorizedkeys/authorized_keys.go b/internal/command/authorizedkeys/authorized_keys.go index d5837b0..f1cab45 100644 --- a/go/internal/command/authorizedkeys/authorized_keys.go +++ b/internal/command/authorizedkeys/authorized_keys.go @@ -4,11 +4,11 @@ import ( "fmt" "strconv" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/authorizedkeys" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/keyline" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/authorizedkeys" + "gitlab.com/gitlab-org/gitlab-shell/internal/keyline" ) type Command struct { diff --git a/go/internal/command/authorizedkeys/authorized_keys_test.go b/internal/command/authorizedkeys/authorized_keys_test.go index 5cde366..3bf4153 100644 --- a/go/internal/command/authorizedkeys/authorized_keys_test.go +++ b/internal/command/authorizedkeys/authorized_keys_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" ) var ( diff --git a/go/internal/command/authorizedprincipals/authorized_principals.go b/internal/command/authorizedprincipals/authorized_principals.go index b04e5a4..10ae70e 100644 --- a/go/internal/command/authorizedprincipals/authorized_principals.go +++ b/internal/command/authorizedprincipals/authorized_principals.go @@ -3,10 +3,10 @@ package authorizedprincipals import ( "fmt" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/keyline" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/keyline" ) type Command struct { diff --git a/go/internal/command/authorizedprincipals/authorized_principals_test.go b/internal/command/authorizedprincipals/authorized_principals_test.go index 2db0d41..f0334e5 100644 --- a/go/internal/command/authorizedprincipals/authorized_principals_test.go +++ b/internal/command/authorizedprincipals/authorized_principals_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" + "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/config" ) func TestExecute(t *testing.T) { diff --git a/go/internal/command/command.go b/internal/command/command.go index 52393df..af63862 100644 --- a/go/internal/command/command.go +++ b/internal/command/command.go @@ -1,20 +1,20 @@ package command import ( - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/authorizedkeys" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/authorizedprincipals" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/discover" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/healthcheck" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/lfsauthenticate" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/receivepack" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/disallowedcommand" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/twofactorrecover" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/uploadarchive" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/uploadpack" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedkeys" + "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/discover" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/healthcheck" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/lfsauthenticate" + "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/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" ) type Command interface { diff --git a/go/internal/command/command_test.go b/internal/command/command_test.go index cd3ac9b..2ca319e 100644 --- a/go/internal/command/command_test.go +++ b/internal/command/command_test.go @@ -6,19 +6,19 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/authorizedkeys" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/authorizedprincipals" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/discover" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/healthcheck" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/lfsauthenticate" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/receivepack" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/disallowedcommand" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/twofactorrecover" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/uploadarchive" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/uploadpack" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedkeys" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedprincipals" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/discover" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/healthcheck" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/lfsauthenticate" + "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/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/testhelper" ) var ( diff --git a/go/internal/command/commandargs/authorized_keys.go b/internal/command/commandargs/authorized_keys.go index 2733954..2733954 100644 --- a/go/internal/command/commandargs/authorized_keys.go +++ b/internal/command/commandargs/authorized_keys.go diff --git a/go/internal/command/commandargs/authorized_principals.go b/internal/command/commandargs/authorized_principals.go index 746ae3f..746ae3f 100644 --- a/go/internal/command/commandargs/authorized_principals.go +++ b/internal/command/commandargs/authorized_principals.go diff --git a/go/internal/command/commandargs/command_args.go b/internal/command/commandargs/command_args.go index 4831134..b4bf334 100644 --- a/go/internal/command/commandargs/command_args.go +++ b/internal/command/commandargs/command_args.go @@ -1,7 +1,7 @@ package commandargs import ( - "gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" + "gitlab.com/gitlab-org/gitlab-shell/internal/executable" ) type CommandType string diff --git a/go/internal/command/commandargs/command_args_test.go b/internal/command/commandargs/command_args_test.go index 9f1575d..aa74237 100644 --- a/go/internal/command/commandargs/command_args_test.go +++ b/internal/command/commandargs/command_args_test.go @@ -3,8 +3,8 @@ package commandargs import ( "testing" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" + "gitlab.com/gitlab-org/gitlab-shell/internal/executable" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" "github.com/stretchr/testify/require" ) diff --git a/go/internal/command/commandargs/generic_args.go b/internal/command/commandargs/generic_args.go index 96bed99..96bed99 100644 --- a/go/internal/command/commandargs/generic_args.go +++ b/internal/command/commandargs/generic_args.go diff --git a/go/internal/command/commandargs/shell.go b/internal/command/commandargs/shell.go index 7e2b72e..7e2b72e 100644 --- a/go/internal/command/commandargs/shell.go +++ b/internal/command/commandargs/shell.go diff --git a/go/internal/command/discover/discover.go b/internal/command/discover/discover.go index de94b56..3aa7456 100644 --- a/go/internal/command/discover/discover.go +++ b/internal/command/discover/discover.go @@ -3,10 +3,10 @@ package discover import ( "fmt" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/discover" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/discover" ) type Command struct { diff --git a/go/internal/command/discover/discover_test.go b/internal/command/discover/discover_test.go index 7e052f7..3878286 100644 --- a/go/internal/command/discover/discover_test.go +++ b/internal/command/discover/discover_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" ) var ( diff --git a/go/internal/command/healthcheck/healthcheck.go b/internal/command/healthcheck/healthcheck.go index fef981c..bbc73dc 100644 --- a/go/internal/command/healthcheck/healthcheck.go +++ b/internal/command/healthcheck/healthcheck.go @@ -3,9 +3,9 @@ package healthcheck import ( "fmt" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/healthcheck" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/healthcheck" ) var ( diff --git a/go/internal/command/healthcheck/healthcheck_test.go b/internal/command/healthcheck/healthcheck_test.go index 6c92ebc..e59c5a2 100644 --- a/go/internal/command/healthcheck/healthcheck_test.go +++ b/internal/command/healthcheck/healthcheck_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/healthcheck" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/healthcheck" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" ) var ( diff --git a/go/internal/command/lfsauthenticate/lfsauthenticate.go b/internal/command/lfsauthenticate/lfsauthenticate.go index bff5e7f..1b2a742 100644 --- a/go/internal/command/lfsauthenticate/lfsauthenticate.go +++ b/internal/command/lfsauthenticate/lfsauthenticate.go @@ -5,12 +5,12 @@ import ( "encoding/json" "fmt" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/accessverifier" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/disallowedcommand" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/lfsauthenticate" + "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/accessverifier" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/lfsauthenticate" ) const ( diff --git a/go/internal/command/lfsauthenticate/lfsauthenticate_test.go b/internal/command/lfsauthenticate/lfsauthenticate_test.go index a6836a8..f2ccc20 100644 --- a/go/internal/command/lfsauthenticate/lfsauthenticate_test.go +++ b/internal/command/lfsauthenticate/lfsauthenticate_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/lfsauthenticate" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/lfsauthenticate" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers" ) func TestFailedRequests(t *testing.T) { diff --git a/go/internal/command/readwriter/readwriter.go b/internal/command/readwriter/readwriter.go index da18d30..da18d30 100644 --- a/go/internal/command/readwriter/readwriter.go +++ b/internal/command/readwriter/readwriter.go diff --git a/go/internal/command/receivepack/customaction.go b/internal/command/receivepack/customaction.go index 8623437..c94ae4c 100644 --- a/go/internal/command/receivepack/customaction.go +++ b/internal/command/receivepack/customaction.go @@ -9,8 +9,8 @@ import ( "net/http" "strings" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier" ) type Request struct { diff --git a/go/internal/command/receivepack/customaction_test.go b/internal/command/receivepack/customaction_test.go index bd4991d..2a4a718 100644 --- a/go/internal/command/receivepack/customaction_test.go +++ b/internal/command/receivepack/customaction_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" ) func TestCustomReceivePack(t *testing.T) { diff --git a/go/internal/command/receivepack/gitalycall.go b/internal/command/receivepack/gitalycall.go index d735f17..f440672 100644 --- a/go/internal/command/receivepack/gitalycall.go +++ b/internal/command/receivepack/gitalycall.go @@ -7,9 +7,9 @@ import ( "gitlab.com/gitlab-org/gitaly/client" pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/accessverifier" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/handler" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/accessverifier" + "gitlab.com/gitlab-org/gitlab-shell/internal/handler" ) func (c *Command) performGitalyCall(response *accessverifier.Response) error { diff --git a/go/internal/command/receivepack/gitalycall_test.go b/internal/command/receivepack/gitalycall_test.go index eac9218..361596a 100644 --- a/go/internal/command/receivepack/gitalycall_test.go +++ b/internal/command/receivepack/gitalycall_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers" ) func TestReceivePack(t *testing.T) { diff --git a/go/internal/command/receivepack/receivepack.go b/internal/command/receivepack/receivepack.go index eb0b2fe..aaaf7b0 100644 --- a/go/internal/command/receivepack/receivepack.go +++ b/internal/command/receivepack/receivepack.go @@ -1,11 +1,11 @@ package receivepack import ( - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/accessverifier" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/disallowedcommand" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" + "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/accessverifier" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" ) type Command struct { diff --git a/go/internal/command/receivepack/receivepack_test.go b/internal/command/receivepack/receivepack_test.go index a45d054..1d7bd21 100644 --- a/go/internal/command/receivepack/receivepack_test.go +++ b/internal/command/receivepack/receivepack_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers" ) func TestForbiddenAccess(t *testing.T) { diff --git a/go/internal/command/shared/accessverifier/accessverifier.go b/internal/command/shared/accessverifier/accessverifier.go index fc6fa17..3aaf98d 100644 --- a/go/internal/command/shared/accessverifier/accessverifier.go +++ b/internal/command/shared/accessverifier/accessverifier.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier" ) type Response = accessverifier.Response diff --git a/go/internal/command/shared/accessverifier/accessverifier_test.go b/internal/command/shared/accessverifier/accessverifier_test.go index c19ed37..39c2a66 100644 --- a/go/internal/command/shared/accessverifier/accessverifier_test.go +++ b/internal/command/shared/accessverifier/accessverifier_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" ) var ( diff --git a/go/internal/command/shared/disallowedcommand/disallowedcommand.go b/internal/command/shared/disallowedcommand/disallowedcommand.go index 3c98bcc..3c98bcc 100644 --- a/go/internal/command/shared/disallowedcommand/disallowedcommand.go +++ b/internal/command/shared/disallowedcommand/disallowedcommand.go diff --git a/go/internal/command/twofactorrecover/twofactorrecover.go b/internal/command/twofactorrecover/twofactorrecover.go index c68080a..2f13cc5 100644 --- a/go/internal/command/twofactorrecover/twofactorrecover.go +++ b/internal/command/twofactorrecover/twofactorrecover.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/twofactorrecover" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/twofactorrecover" ) type Command struct { diff --git a/go/internal/command/twofactorrecover/twofactorrecover_test.go b/internal/command/twofactorrecover/twofactorrecover_test.go index 291d499..283c45a 100644 --- a/go/internal/command/twofactorrecover/twofactorrecover_test.go +++ b/internal/command/twofactorrecover/twofactorrecover_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/twofactorrecover" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/twofactorrecover" ) var ( diff --git a/go/internal/command/uploadarchive/gitalycall.go b/internal/command/uploadarchive/gitalycall.go index e810ba3..1dfc864 100644 --- a/go/internal/command/uploadarchive/gitalycall.go +++ b/internal/command/uploadarchive/gitalycall.go @@ -7,9 +7,9 @@ import ( "gitlab.com/gitlab-org/gitaly/client" pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/handler" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier" + "gitlab.com/gitlab-org/gitlab-shell/internal/handler" ) func (c *Command) performGitalyCall(response *accessverifier.Response) error { diff --git a/go/internal/command/uploadarchive/gitalycall_test.go b/internal/command/uploadarchive/gitalycall_test.go index 5eb2eae..5c5353f 100644 --- a/go/internal/command/uploadarchive/gitalycall_test.go +++ b/internal/command/uploadarchive/gitalycall_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers" ) func TestUploadPack(t *testing.T) { diff --git a/go/internal/command/uploadarchive/uploadarchive.go b/internal/command/uploadarchive/uploadarchive.go index 2846455..9d4fbe0 100644 --- a/go/internal/command/uploadarchive/uploadarchive.go +++ b/internal/command/uploadarchive/uploadarchive.go @@ -1,11 +1,11 @@ package uploadarchive import ( - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/accessverifier" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/disallowedcommand" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" + "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/accessverifier" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" ) type Command struct { diff --git a/go/internal/command/uploadarchive/uploadarchive_test.go b/internal/command/uploadarchive/uploadarchive_test.go index 4cd6832..50f3f7e 100644 --- a/go/internal/command/uploadarchive/uploadarchive_test.go +++ b/internal/command/uploadarchive/uploadarchive_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers" ) func TestForbiddenAccess(t *testing.T) { diff --git a/go/internal/command/uploadpack/gitalycall.go b/internal/command/uploadpack/gitalycall.go index 5dff24a..8b97dee 100644 --- a/go/internal/command/uploadpack/gitalycall.go +++ b/internal/command/uploadpack/gitalycall.go @@ -7,9 +7,9 @@ import ( "gitlab.com/gitlab-org/gitaly/client" pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/handler" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier" + "gitlab.com/gitlab-org/gitlab-shell/internal/handler" ) func (c *Command) performGitalyCall(response *accessverifier.Response) error { diff --git a/go/internal/command/uploadpack/gitalycall_test.go b/internal/command/uploadpack/gitalycall_test.go index eb18aa8..71a253b 100644 --- a/go/internal/command/uploadpack/gitalycall_test.go +++ b/internal/command/uploadpack/gitalycall_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers" ) func TestUploadPack(t *testing.T) { diff --git a/go/internal/command/uploadpack/uploadpack.go b/internal/command/uploadpack/uploadpack.go index 4b08bf2..a5c71b2 100644 --- a/go/internal/command/uploadpack/uploadpack.go +++ b/internal/command/uploadpack/uploadpack.go @@ -1,11 +1,11 @@ package uploadpack import ( - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/accessverifier" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/disallowedcommand" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" + "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/accessverifier" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" ) type Command struct { diff --git a/go/internal/command/uploadpack/uploadpack_test.go b/internal/command/uploadpack/uploadpack_test.go index 27a0786..04fe2ba 100644 --- a/go/internal/command/uploadpack/uploadpack_test.go +++ b/internal/command/uploadpack/uploadpack_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" + "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/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers" ) func TestForbiddenAccess(t *testing.T) { diff --git a/go/internal/config/config.go b/internal/config/config.go index 2231851..2231851 100644 --- a/go/internal/config/config.go +++ b/internal/config/config.go diff --git a/go/internal/config/config_test.go b/internal/config/config_test.go index e31ff70..202db6d 100644 --- a/go/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" ) const ( diff --git a/go/internal/config/httpclient.go b/internal/config/httpclient.go index c71efad..c71efad 100644 --- a/go/internal/config/httpclient.go +++ b/internal/config/httpclient.go diff --git a/go/internal/config/httpclient_test.go b/internal/config/httpclient_test.go index 474deba..474deba 100644 --- a/go/internal/config/httpclient_test.go +++ b/internal/config/httpclient_test.go diff --git a/go/internal/executable/executable.go b/internal/executable/executable.go index c6355b9..c6355b9 100644 --- a/go/internal/executable/executable.go +++ b/internal/executable/executable.go diff --git a/go/internal/executable/executable_test.go b/internal/executable/executable_test.go index 581821d..3915f1a 100644 --- a/go/internal/executable/executable_test.go +++ b/internal/executable/executable_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" "github.com/stretchr/testify/require" ) diff --git a/go/internal/gitlabnet/accessverifier/client.go b/internal/gitlabnet/accessverifier/client.go index eb67703..217dcdb 100644 --- a/go/internal/gitlabnet/accessverifier/client.go +++ b/internal/gitlabnet/accessverifier/client.go @@ -5,10 +5,10 @@ import ( "net/http" pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/sshenv" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" + "gitlab.com/gitlab-org/gitlab-shell/internal/sshenv" ) const ( diff --git a/go/internal/gitlabnet/accessverifier/client_test.go b/internal/gitlabnet/accessverifier/client_test.go index a4d1cb4..96c80a7 100644 --- a/go/internal/gitlabnet/accessverifier/client_test.go +++ b/internal/gitlabnet/accessverifier/client_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/require" pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" ) var ( diff --git a/go/internal/gitlabnet/authorizedkeys/client.go b/internal/gitlabnet/authorizedkeys/client.go index 28b85fc..ac23a96 100644 --- a/go/internal/gitlabnet/authorizedkeys/client.go +++ b/internal/gitlabnet/authorizedkeys/client.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" ) const ( diff --git a/go/internal/gitlabnet/authorizedkeys/client_test.go b/internal/gitlabnet/authorizedkeys/client_test.go index c73aab2..965025f 100644 --- a/go/internal/gitlabnet/authorizedkeys/client_test.go +++ b/internal/gitlabnet/authorizedkeys/client_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" ) var ( diff --git a/go/internal/gitlabnet/client.go b/internal/gitlabnet/client.go index dacb1d6..bb8655a 100644 --- a/go/internal/gitlabnet/client.go +++ b/internal/gitlabnet/client.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" ) const ( diff --git a/go/internal/gitlabnet/client_test.go b/internal/gitlabnet/client_test.go index e8499dc..3f96b41 100644 --- a/go/internal/gitlabnet/client_test.go +++ b/internal/gitlabnet/client_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" ) func TestClients(t *testing.T) { diff --git a/go/internal/gitlabnet/discover/client.go b/internal/gitlabnet/discover/client.go index 46ab2de..3faef53 100644 --- a/go/internal/gitlabnet/discover/client.go +++ b/internal/gitlabnet/discover/client.go @@ -5,9 +5,9 @@ import ( "net/http" "net/url" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" ) type Client struct { diff --git a/go/internal/gitlabnet/discover/client_test.go b/internal/gitlabnet/discover/client_test.go index b98a28e..66e234b 100644 --- a/go/internal/gitlabnet/discover/client_test.go +++ b/internal/gitlabnet/discover/client_test.go @@ -7,9 +7,9 @@ import ( "net/url" "testing" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go/internal/gitlabnet/healthcheck/client.go b/internal/gitlabnet/healthcheck/client.go index 288b150..7db682a 100644 --- a/go/internal/gitlabnet/healthcheck/client.go +++ b/internal/gitlabnet/healthcheck/client.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" ) const ( diff --git a/go/internal/gitlabnet/healthcheck/client_test.go b/internal/gitlabnet/healthcheck/client_test.go index d32e6f4..d7212b0 100644 --- a/go/internal/gitlabnet/healthcheck/client_test.go +++ b/internal/gitlabnet/healthcheck/client_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" "github.com/stretchr/testify/require" ) diff --git a/go/internal/gitlabnet/httpclient_test.go b/internal/gitlabnet/httpclient_test.go index 9b635bd..a40ab6d 100644 --- a/go/internal/gitlabnet/httpclient_test.go +++ b/internal/gitlabnet/httpclient_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" ) const ( diff --git a/go/internal/gitlabnet/httpsclient_test.go b/internal/gitlabnet/httpsclient_test.go index 04901df..0acd425 100644 --- a/go/internal/gitlabnet/httpsclient_test.go +++ b/internal/gitlabnet/httpsclient_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" ) func TestSuccessfulRequests(t *testing.T) { diff --git a/go/internal/gitlabnet/lfsauthenticate/client.go b/internal/gitlabnet/lfsauthenticate/client.go index 51cb7a4..d7469dd 100644 --- a/go/internal/gitlabnet/lfsauthenticate/client.go +++ b/internal/gitlabnet/lfsauthenticate/client.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" ) type Client struct { diff --git a/go/internal/gitlabnet/lfsauthenticate/client_test.go b/internal/gitlabnet/lfsauthenticate/client_test.go index 07484a7..6faaa63 100644 --- a/go/internal/gitlabnet/lfsauthenticate/client_test.go +++ b/internal/gitlabnet/lfsauthenticate/client_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" ) const ( diff --git a/go/internal/gitlabnet/testserver/gitalyserver.go b/internal/gitlabnet/testserver/gitalyserver.go index 694fd41..694fd41 100644 --- a/go/internal/gitlabnet/testserver/gitalyserver.go +++ b/internal/gitlabnet/testserver/gitalyserver.go diff --git a/go/internal/gitlabnet/testserver/testserver.go b/internal/gitlabnet/testserver/testserver.go index bf59ce4..f3b7b71 100644 --- a/go/internal/gitlabnet/testserver/testserver.go +++ b/internal/gitlabnet/testserver/testserver.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" ) var ( diff --git a/go/internal/gitlabnet/twofactorrecover/client.go b/internal/gitlabnet/twofactorrecover/client.go index 37067db..a3052f8 100644 --- a/go/internal/gitlabnet/twofactorrecover/client.go +++ b/internal/gitlabnet/twofactorrecover/client.go @@ -5,10 +5,10 @@ import ( "fmt" "net/http" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/discover" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/discover" ) type Client struct { diff --git a/go/internal/gitlabnet/twofactorrecover/client_test.go b/internal/gitlabnet/twofactorrecover/client_test.go index a560fb1..d5073e3 100644 --- a/go/internal/gitlabnet/twofactorrecover/client_test.go +++ b/internal/gitlabnet/twofactorrecover/client_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/discover" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/discover" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" ) var ( diff --git a/go/internal/handler/exec.go b/internal/handler/exec.go index 1f3177d..ba9a4ff 100644 --- a/go/internal/handler/exec.go +++ b/internal/handler/exec.go @@ -8,7 +8,7 @@ import ( "gitlab.com/gitlab-org/gitaly/auth" "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" "gitlab.com/gitlab-org/labkit/tracing" "google.golang.org/grpc" ) diff --git a/go/internal/handler/exec_test.go b/internal/handler/exec_test.go index e6608ac..6c7d3f5 100644 --- a/go/internal/handler/exec_test.go +++ b/internal/handler/exec_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" ) func makeHandler(t *testing.T, err error) func(context.Context, *grpc.ClientConn) (int32, error) { diff --git a/go/internal/keyline/key_line.go b/internal/keyline/key_line.go index f92f50b..c29a320 100644 --- a/go/internal/keyline/key_line.go +++ b/internal/keyline/key_line.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" + "gitlab.com/gitlab-org/gitlab-shell/internal/executable" ) var ( diff --git a/go/internal/keyline/key_line_test.go b/internal/keyline/key_line_test.go index c6883c0..c6883c0 100644 --- a/go/internal/keyline/key_line_test.go +++ b/internal/keyline/key_line_test.go diff --git a/go/internal/logger/logger.go b/internal/logger/logger.go index c356d43..bbc6a51 100644 --- a/go/internal/logger/logger.go +++ b/internal/logger/logger.go @@ -8,7 +8,7 @@ import ( "os" "sync" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/internal/config" log "github.com/sirupsen/logrus" ) diff --git a/go/internal/sshenv/sshenv.go b/internal/sshenv/sshenv.go index 387feb2..387feb2 100644 --- a/go/internal/sshenv/sshenv.go +++ b/internal/sshenv/sshenv.go diff --git a/go/internal/sshenv/sshenv_test.go b/internal/sshenv/sshenv_test.go index d2207f5..e4a640e 100644 --- a/go/internal/sshenv/sshenv_test.go +++ b/internal/sshenv/sshenv_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" + "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" ) func TestLocalAddr(t *testing.T) { diff --git a/go/internal/testhelper/requesthandlers/requesthandlers.go b/internal/testhelper/requesthandlers/requesthandlers.go index a7bc427..11817e8 100644 --- a/go/internal/testhelper/requesthandlers/requesthandlers.go +++ b/internal/testhelper/requesthandlers/requesthandlers.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" + "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" ) func BuildDisallowedByApiHandlers(t *testing.T) []testserver.TestRequestHandler { diff --git a/go/internal/testhelper/testdata/testroot/.gitlab_shell_secret b/internal/testhelper/testdata/testroot/.gitlab_shell_secret index 9bd459d..9bd459d 100644 --- a/go/internal/testhelper/testdata/testroot/.gitlab_shell_secret +++ b/internal/testhelper/testdata/testroot/.gitlab_shell_secret diff --git a/go/internal/testhelper/testdata/testroot/certs/invalid/server.crt b/internal/testhelper/testdata/testroot/certs/invalid/server.crt index f8a42c1..f8a42c1 100644 --- a/go/internal/testhelper/testdata/testroot/certs/invalid/server.crt +++ b/internal/testhelper/testdata/testroot/certs/invalid/server.crt diff --git a/go/internal/testhelper/testdata/testroot/certs/valid/dir/.gitkeep b/internal/testhelper/testdata/testroot/certs/valid/dir/.gitkeep index e69de29..e69de29 100644 --- a/go/internal/testhelper/testdata/testroot/certs/valid/dir/.gitkeep +++ b/internal/testhelper/testdata/testroot/certs/valid/dir/.gitkeep diff --git a/go/internal/testhelper/testdata/testroot/certs/valid/server.crt b/internal/testhelper/testdata/testroot/certs/valid/server.crt index 11f1da7..11f1da7 100644 --- a/go/internal/testhelper/testdata/testroot/certs/valid/server.crt +++ b/internal/testhelper/testdata/testroot/certs/valid/server.crt diff --git a/go/internal/testhelper/testdata/testroot/certs/valid/server.key b/internal/testhelper/testdata/testroot/certs/valid/server.key index acec0fb..acec0fb 100644 --- a/go/internal/testhelper/testdata/testroot/certs/valid/server.key +++ b/internal/testhelper/testdata/testroot/certs/valid/server.key diff --git a/go/internal/testhelper/testdata/testroot/config.yml b/internal/testhelper/testdata/testroot/config.yml index e69de29..e69de29 100644 --- a/go/internal/testhelper/testdata/testroot/config.yml +++ b/internal/testhelper/testdata/testroot/config.yml diff --git a/go/internal/testhelper/testdata/testroot/custom/my-contents-is-secret b/internal/testhelper/testdata/testroot/custom/my-contents-is-secret index 645b575..645b575 100644 --- a/go/internal/testhelper/testdata/testroot/custom/my-contents-is-secret +++ b/internal/testhelper/testdata/testroot/custom/my-contents-is-secret diff --git a/go/internal/testhelper/testdata/testroot/gitlab-shell.log b/internal/testhelper/testdata/testroot/gitlab-shell.log index e69de29..e69de29 100644 --- a/go/internal/testhelper/testdata/testroot/gitlab-shell.log +++ b/internal/testhelper/testdata/testroot/gitlab-shell.log diff --git a/go/internal/testhelper/testdata/testroot/responses/allowed.json b/internal/testhelper/testdata/testroot/responses/allowed.json index d0403d9..d0403d9 100644 --- a/go/internal/testhelper/testdata/testroot/responses/allowed.json +++ b/internal/testhelper/testdata/testroot/responses/allowed.json diff --git a/go/internal/testhelper/testdata/testroot/responses/allowed_with_payload.json b/internal/testhelper/testdata/testroot/responses/allowed_with_payload.json index 331c3a9..331c3a9 100644 --- a/go/internal/testhelper/testdata/testroot/responses/allowed_with_payload.json +++ b/internal/testhelper/testdata/testroot/responses/allowed_with_payload.json diff --git a/go/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index a925c79..a925c79 100644 --- a/go/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb index 1416488..52ac5ee 100644 --- a/support/gitlab_config.rb +++ b/support/gitlab_config.rb @@ -1,5 +1,8 @@ require 'yaml' +# Determine the root of the gitlab-shell directory +ROOT_PATH = ENV.fetch('GITLAB_SHELL_DIR', File.expand_path('..', __dir__)) + class GitlabConfig attr_reader :config diff --git a/support/go-format b/support/go-format deleted file mode 100755 index 59af23c..0000000 --- a/support/go-format +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env ruby - -def main(check) - go_files = Dir['go/**/*.go'] - cmd = %w[gofmt -s -l] - cmd << '-w' unless check - cmd += go_files - output = IO.popen(cmd, 'r', &:read) - $stdout.write(output) - abort 'gofmt failed' unless $?.success? - if check && output.lines.any? { |l| l != "\n" } - abort "\nPlease run #{$0} to fix formatting" - end -end - -main(ARGV.first == 'check') diff --git a/support/go-test b/support/go-test deleted file mode 100755 index 0c043f6..0000000 --- a/support/go-test +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env ruby - -require_relative 'go_build' -include GoBuild - -def main - ensure_build_dir_exists - run!(GO_ENV, %w[go test ./...], chdir: GO_DIR) - puts 'OK' -end - -main diff --git a/support/go_build.rb b/support/go_build.rb deleted file mode 100644 index 6f4c92b..0000000 --- a/support/go_build.rb +++ /dev/null @@ -1,37 +0,0 @@ -# Helper functions to build go code in gitlab-shell - -require 'fileutils' - -# Determine the root of the gitlab-shell directory -ROOT_PATH = ENV.fetch('GITLAB_SHELL_DIR', File.expand_path('..', __dir__)) - -module GoBuild - GO_DIR = File.join(ROOT_PATH, 'go') - BUILD_DIR = File.join(ROOT_PATH, 'go_build') - - GO_ENV = { - # $GOBIN controls where 'go install' puts binaries. Prior to go mod, - # this was $GOPATH/bin. - 'GOBIN' => File.join(BUILD_DIR, 'bin'), - # Force the use of go mod, even if $GOPATH is set. - 'GO111MODULE' => 'on', - # Downloading dependencies via proxy.golang.org is faster and more - # reliable than downloading from canonical sources. We need this - # environment variable because as of Go 1.12, the default is still to - # download from canonical sources. - 'GOPROXY' => 'https://proxy.golang.org' - }.freeze - - def ensure_build_dir_exists - FileUtils.mkdir_p(BUILD_DIR) - end - - def run!(env, cmd, options = {}) - raise "env must be a hash" unless env.is_a?(Hash) - raise "cmd must be an array" unless cmd.is_a?(Array) - - unless system(env, *cmd, options) - abort "command failed: #{env.inspect} #{cmd.join(' ')}" - end - end -end |