Skip to content

G
gitlab-shell
Commit 629e3bf9 authored by Igor's avatar Igor
Browse files
Options

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
parents 7d5229db ede41ee4
Hide whitespace changes
Inline Side-by-side
Showing with 235 additions and 338 deletions
Makefile
View file @ 629e3bf9
.PHONY: validate verify verify_ruby verify_golang test test_ruby test_golang setup _install build compile check clean .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 validate: verify test
...@@ -10,7 +10,7 @@ verify_ruby: ...@@ -10,7 +10,7 @@ verify_ruby:
bundle exec rubocop bundle exec rubocop
verify_golang: verify_golang:
support/go-format check gofmt -s -l $(GO_SOURCES)
test: test_ruby test_golang test: test_ruby test_golang
...@@ -19,7 +19,7 @@ test_ruby: ...@@ -19,7 +19,7 @@ test_ruby:
bundle exec rspec --color --format d spec bundle exec rspec --color --format d spec
test_golang: test_golang:
support/go-test go test ./...
setup: _install bin/gitlab-shell setup: _install bin/gitlab-shell
...@@ -29,10 +29,10 @@ _install: ...@@ -29,10 +29,10 @@ _install:
build: bin/gitlab-shell build: bin/gitlab-shell
compile: bin/gitlab-shell compile: bin/gitlab-shell
bin/gitlab-shell: $(GO_SOURCES) bin/gitlab-shell: $(GO_SOURCES)
bin/compile GOBIN="$(CURDIR)/bin" go install ./cmd/...
check: check:
bin/check bin/check
clean: 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
bin/compile deleted 100755 → 0
View file @ 7d5229db
#!/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
bin/install
View file @ 629e3bf9
#!/usr/bin/env ruby #!/usr/bin/env ruby
# Load ROOT_PATH and access the minimum necessary config file # Load ROOT_PATH and access the minimum necessary config file
require_relative '../support/go_build'
require_relative '../support/gitlab_config' require_relative '../support/gitlab_config'
config = GitlabConfig.new config = GitlabConfig.new
......
go/cmd/check/main.go → cmd/check/main.go
View file @ 629e3bf9
...@@ -4,10 +4,10 @@ import ( ...@@ -4,10 +4,10 @@ import (
"fmt" "fmt"
"os" "os"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command" "gitlab.com/gitlab-org/gitlab-shell/internal/command"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" "gitlab.com/gitlab-org/gitlab-shell/internal/executable"
) )
func main() { func main() {
......
go/cmd/gitlab-shell-authorized-keys-check/main.go → cmd/gitlab-shell-authorized-keys-check/main.go
View file @ 629e3bf9
...@@ -4,10 +4,10 @@ import ( ...@@ -4,10 +4,10 @@ import (
"fmt" "fmt"
"os" "os"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command" "gitlab.com/gitlab-org/gitlab-shell/internal/command"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" "gitlab.com/gitlab-org/gitlab-shell/internal/executable"
) )
func main() { func main() {
......
go/cmd/gitlab-shell-authorized-principals-check/main.go → cmd/gitlab-shell-authorized-principals-check/main.go
View file @ 629e3bf9
...@@ -4,10 +4,10 @@ import ( ...@@ -4,10 +4,10 @@ import (
"fmt" "fmt"
"os" "os"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command" "gitlab.com/gitlab-org/gitlab-shell/internal/command"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" "gitlab.com/gitlab-org/gitlab-shell/internal/executable"
) )
func main() { func main() {
......
go/cmd/gitlab-shell/main.go → cmd/gitlab-shell/main.go
View file @ 629e3bf9
...@@ -4,10 +4,10 @@ import ( ...@@ -4,10 +4,10 @@ import (
"fmt" "fmt"
"os" "os"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command" "gitlab.com/gitlab-org/gitlab-shell/internal/command"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" "gitlab.com/gitlab-org/gitlab-shell/internal/executable"
) )
func main() { func main() {
......
go/go.mod → go.mod
View file @ 629e3bf9
module gitlab.com/gitlab-org/gitlab-shell/go module gitlab.com/gitlab-org/gitlab-shell
go 1.12 go 1.12
require ( require (
github.com/mattn/go-shellwords v0.0.0-20190425161501-2444a32a19f4 github.com/mattn/go-shellwords v0.0.0-20190425161501-2444a32a19f4
github.com/otiai10/copy v1.0.1 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/sirupsen/logrus v1.2.0
github.com/stretchr/testify v1.3.0 github.com/stretchr/testify v1.3.0
gitlab.com/gitlab-org/gitaly v1.68.0 gitlab.com/gitlab-org/gitaly v1.68.0
gitlab.com/gitlab-org/labkit v0.0.0-20190221122536-0c3fc7cdd57c gitlab.com/gitlab-org/labkit v0.0.0-20190221122536-0c3fc7cdd57c
google.golang.org/grpc v1.24.0 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 gopkg.in/yaml.v2 v2.2.2
) )
go/README.md deleted 100644 → 0
View file @ 7d5229db
# 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
```
go/internal/command/authorizedkeys/authorized_keys.go → internal/command/authorizedkeys/authorized_keys.go
View file @ 629e3bf9
...@@ -4,11 +4,11 @@ import ( ...@@ -4,11 +4,11 @@ import (
"fmt" "fmt"
"strconv" "strconv"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/authorizedkeys" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/authorizedkeys"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/keyline" "gitlab.com/gitlab-org/gitlab-shell/internal/keyline"
) )
type Command struct { type Command struct {
......
go/internal/command/authorizedkeys/authorized_keys_test.go → internal/command/authorizedkeys/authorized_keys_test.go
View file @ 629e3bf9
...@@ -8,10 +8,10 @@ import ( ...@@ -8,10 +8,10 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
) )
var ( var (
......
go/internal/command/authorizedprincipals/authorized_principals.go → internal/command/authorizedprincipals/authorized_principals.go
View file @ 629e3bf9
...@@ -3,10 +3,10 @@ package authorizedprincipals ...@@ -3,10 +3,10 @@ package authorizedprincipals
import ( import (
"fmt" "fmt"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/keyline" "gitlab.com/gitlab-org/gitlab-shell/internal/keyline"
) )
type Command struct { type Command struct {
......
go/internal/command/authorizedprincipals/authorized_principals_test.go → internal/command/authorizedprincipals/authorized_principals_test.go
View file @ 629e3bf9
...@@ -6,9 +6,9 @@ import ( ...@@ -6,9 +6,9 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
) )
func TestExecute(t *testing.T) { func TestExecute(t *testing.T) {
......
go/internal/command/command.go → internal/command/command.go
View file @ 629e3bf9
package command package command
import ( import (
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/authorizedkeys" "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedkeys"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/authorizedprincipals" "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedprincipals"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/discover" "gitlab.com/gitlab-org/gitlab-shell/internal/command/discover"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/healthcheck" "gitlab.com/gitlab-org/gitlab-shell/internal/command/healthcheck"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/lfsauthenticate" "gitlab.com/gitlab-org/gitlab-shell/internal/command/lfsauthenticate"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/receivepack" "gitlab.com/gitlab-org/gitlab-shell/internal/command/receivepack"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/disallowedcommand" "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/twofactorrecover" "gitlab.com/gitlab-org/gitlab-shell/internal/command/twofactorrecover"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/uploadarchive" "gitlab.com/gitlab-org/gitlab-shell/internal/command/uploadarchive"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/uploadpack" "gitlab.com/gitlab-org/gitlab-shell/internal/command/uploadpack"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" "gitlab.com/gitlab-org/gitlab-shell/internal/executable"
) )
type Command interface { type Command interface {
......
go/internal/command/command_test.go → internal/command/command_test.go
View file @ 629e3bf9
...@@ -6,19 +6,19 @@ import ( ...@@ -6,19 +6,19 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/authorizedkeys" "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedkeys"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/authorizedprincipals" "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedprincipals"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/discover" "gitlab.com/gitlab-org/gitlab-shell/internal/command/discover"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/healthcheck" "gitlab.com/gitlab-org/gitlab-shell/internal/command/healthcheck"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/lfsauthenticate" "gitlab.com/gitlab-org/gitlab-shell/internal/command/lfsauthenticate"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/receivepack" "gitlab.com/gitlab-org/gitlab-shell/internal/command/receivepack"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/disallowedcommand" "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/twofactorrecover" "gitlab.com/gitlab-org/gitlab-shell/internal/command/twofactorrecover"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/uploadarchive" "gitlab.com/gitlab-org/gitlab-shell/internal/command/uploadarchive"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/uploadpack" "gitlab.com/gitlab-org/gitlab-shell/internal/command/uploadpack"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" "gitlab.com/gitlab-org/gitlab-shell/internal/executable"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
) )
var ( var (
......
go/internal/command/commandargs/command_args.go → internal/command/commandargs/command_args.go
View file @ 629e3bf9
package commandargs package commandargs
import ( import (
"gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" "gitlab.com/gitlab-org/gitlab-shell/internal/executable"
) )
type CommandType string type CommandType string
......
go/internal/command/commandargs/command_args_test.go → internal/command/commandargs/command_args_test.go
View file @ 629e3bf9
...@@ -3,8 +3,8 @@ package commandargs ...@@ -3,8 +3,8 @@ package commandargs
import ( import (
"testing" "testing"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" "gitlab.com/gitlab-org/gitlab-shell/internal/executable"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
......
go/internal/command/discover/discover.go → internal/command/discover/discover.go
View file @ 629e3bf9
...@@ -3,10 +3,10 @@ package discover ...@@ -3,10 +3,10 @@ package discover
import ( import (
"fmt" "fmt"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/discover" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/discover"
) )
type Command struct { type Command struct {
......
go/internal/command/discover/discover_test.go → internal/command/discover/discover_test.go
View file @ 629e3bf9
...@@ -9,10 +9,10 @@ import ( ...@@ -9,10 +9,10 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
) )
var ( var (
......
go/internal/command/healthcheck/healthcheck.go → internal/command/healthcheck/healthcheck.go
View file @ 629e3bf9
...@@ -3,9 +3,9 @@ package healthcheck ...@@ -3,9 +3,9 @@ package healthcheck
import ( import (
"fmt" "fmt"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/healthcheck" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/healthcheck"
) )
var ( var (
......
go/internal/command/healthcheck/healthcheck_test.go → internal/command/healthcheck/healthcheck_test.go
View file @ 629e3bf9
...@@ -8,10 +8,10 @@ import ( ...@@ -8,10 +8,10 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/healthcheck" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/healthcheck"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
) )
var ( var (
......
go/internal/command/lfsauthenticate/lfsauthenticate.go → internal/command/lfsauthenticate/lfsauthenticate.go
View file @ 629e3bf9
...@@ -5,12 +5,12 @@ import ( ...@@ -5,12 +5,12 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/disallowedcommand" "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/lfsauthenticate" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/lfsauthenticate"
) )
const ( const (
......
go/internal/command/lfsauthenticate/lfsauthenticate_test.go → internal/command/lfsauthenticate/lfsauthenticate_test.go
View file @ 629e3bf9
...@@ -9,13 +9,13 @@ import ( ...@@ -9,13 +9,13 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/lfsauthenticate" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/lfsauthenticate"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers"
) )
func TestFailedRequests(t *testing.T) { func TestFailedRequests(t *testing.T) {
......
go/internal/command/receivepack/customaction.go → internal/command/receivepack/customaction.go
View file @ 629e3bf9
...@@ -9,8 +9,8 @@ import ( ...@@ -9,8 +9,8 @@ import (
"net/http" "net/http"
"strings" "strings"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier"
) )
type Request struct { type Request struct {
......
go/internal/command/receivepack/customaction_test.go → internal/command/receivepack/customaction_test.go
View file @ 629e3bf9
...@@ -9,11 +9,11 @@ import ( ...@@ -9,11 +9,11 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
) )
func TestCustomReceivePack(t *testing.T) { func TestCustomReceivePack(t *testing.T) {
......
go/internal/command/receivepack/gitalycall.go → internal/command/receivepack/gitalycall.go
View file @ 629e3bf9
...@@ -7,9 +7,9 @@ import ( ...@@ -7,9 +7,9 @@ import (
"gitlab.com/gitlab-org/gitaly/client" "gitlab.com/gitlab-org/gitaly/client"
pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" 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/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/handler" "gitlab.com/gitlab-org/gitlab-shell/internal/handler"
) )
func (c *Command) performGitalyCall(response *accessverifier.Response) error { func (c *Command) performGitalyCall(response *accessverifier.Response) error {
......
go/internal/command/receivepack/gitalycall_test.go → internal/command/receivepack/gitalycall_test.go
View file @ 629e3bf9
...@@ -6,11 +6,11 @@ import ( ...@@ -6,11 +6,11 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers"
) )
func TestReceivePack(t *testing.T) { func TestReceivePack(t *testing.T) {
......
go/internal/command/receivepack/receivepack.go → internal/command/receivepack/receivepack.go
View file @ 629e3bf9
package receivepack package receivepack
import ( import (
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/disallowedcommand" "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
) )
type Command struct { type Command struct {
......
go/internal/command/receivepack/receivepack_test.go → internal/command/receivepack/receivepack_test.go
View file @ 629e3bf9
...@@ -6,11 +6,11 @@ import ( ...@@ -6,11 +6,11 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers"
) )
func TestForbiddenAccess(t *testing.T) { func TestForbiddenAccess(t *testing.T) {
......
go/internal/command/shared/accessverifier/accessverifier.go → internal/command/shared/accessverifier/accessverifier.go
View file @ 629e3bf9
...@@ -4,10 +4,10 @@ import ( ...@@ -4,10 +4,10 @@ import (
"errors" "errors"
"fmt" "fmt"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier"
) )
type Response = accessverifier.Response type Response = accessverifier.Response
......
go/internal/command/shared/accessverifier/accessverifier_test.go → internal/command/shared/accessverifier/accessverifier_test.go
View file @ 629e3bf9
...@@ -9,11 +9,11 @@ import ( ...@@ -9,11 +9,11 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
) )
var ( var (
......
go/internal/command/twofactorrecover/twofactorrecover.go → internal/command/twofactorrecover/twofactorrecover.go
View file @ 629e3bf9
...@@ -4,10 +4,10 @@ import ( ...@@ -4,10 +4,10 @@ import (
"fmt" "fmt"
"strings" "strings"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/twofactorrecover" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/twofactorrecover"
) )
type Command struct { type Command struct {
......
go/internal/command/twofactorrecover/twofactorrecover_test.go → internal/command/twofactorrecover/twofactorrecover_test.go
View file @ 629e3bf9
...@@ -10,11 +10,11 @@ import ( ...@@ -10,11 +10,11 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/twofactorrecover" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/twofactorrecover"
) )
var ( var (
......
go/internal/command/uploadarchive/gitalycall.go → internal/command/uploadarchive/gitalycall.go
View file @ 629e3bf9
...@@ -7,9 +7,9 @@ import ( ...@@ -7,9 +7,9 @@ import (
"gitlab.com/gitlab-org/gitaly/client" "gitlab.com/gitlab-org/gitaly/client"
pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" 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/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/handler" "gitlab.com/gitlab-org/gitlab-shell/internal/handler"
) )
func (c *Command) performGitalyCall(response *accessverifier.Response) error { func (c *Command) performGitalyCall(response *accessverifier.Response) error {
......
go/internal/command/uploadarchive/gitalycall_test.go → internal/command/uploadarchive/gitalycall_test.go
View file @ 629e3bf9
...@@ -6,11 +6,11 @@ import ( ...@@ -6,11 +6,11 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers"
) )
func TestUploadPack(t *testing.T) { func TestUploadPack(t *testing.T) {
......
go/internal/command/uploadarchive/uploadarchive.go → internal/command/uploadarchive/uploadarchive.go
View file @ 629e3bf9
package uploadarchive package uploadarchive
import ( import (
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/disallowedcommand" "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
) )
type Command struct { type Command struct {
......
go/internal/command/uploadarchive/uploadarchive_test.go → internal/command/uploadarchive/uploadarchive_test.go
View file @ 629e3bf9
...@@ -6,11 +6,11 @@ import ( ...@@ -6,11 +6,11 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers"
) )
func TestForbiddenAccess(t *testing.T) { func TestForbiddenAccess(t *testing.T) {
......
go/internal/command/uploadpack/gitalycall.go → internal/command/uploadpack/gitalycall.go
View file @ 629e3bf9
...@@ -7,9 +7,9 @@ import ( ...@@ -7,9 +7,9 @@ import (
"gitlab.com/gitlab-org/gitaly/client" "gitlab.com/gitlab-org/gitaly/client"
pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" 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/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/handler" "gitlab.com/gitlab-org/gitlab-shell/internal/handler"
) )
func (c *Command) performGitalyCall(response *accessverifier.Response) error { func (c *Command) performGitalyCall(response *accessverifier.Response) error {
......
go/internal/command/uploadpack/gitalycall_test.go → internal/command/uploadpack/gitalycall_test.go
View file @ 629e3bf9
...@@ -6,11 +6,11 @@ import ( ...@@ -6,11 +6,11 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers"
) )
func TestUploadPack(t *testing.T) { func TestUploadPack(t *testing.T) {
......
go/internal/command/uploadpack/uploadpack.go → internal/command/uploadpack/uploadpack.go
View file @ 629e3bf9
package uploadpack package uploadpack
import ( import (
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/accessverifier"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/disallowedcommand" "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
) )
type Command struct { type Command struct {
......
go/internal/command/uploadpack/uploadpack_test.go → internal/command/uploadpack/uploadpack_test.go
View file @ 629e3bf9
...@@ -6,11 +6,11 @@ import ( ...@@ -6,11 +6,11 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper/requesthandlers" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers"
) )
func TestForbiddenAccess(t *testing.T) { func TestForbiddenAccess(t *testing.T) {
......
go/internal/config/config_test.go → internal/config/config_test.go
View file @ 629e3bf9
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
) )
const ( const (
......
go/internal/executable/executable_test.go → internal/executable/executable_test.go
View file @ 629e3bf9
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"errors" "errors"
"testing" "testing"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
......
go/internal/gitlabnet/accessverifier/client.go → internal/gitlabnet/accessverifier/client.go
View file @ 629e3bf9
...@@ -5,10 +5,10 @@ import ( ...@@ -5,10 +5,10 @@ import (
"net/http" "net/http"
pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" 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/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/sshenv" "gitlab.com/gitlab-org/gitlab-shell/internal/sshenv"
) )
const ( const (
......
go/internal/gitlabnet/accessverifier/client_test.go → internal/gitlabnet/accessverifier/client_test.go
View file @ 629e3bf9
...@@ -10,11 +10,11 @@ import ( ...@@ -10,11 +10,11 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" 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/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
) )
var ( var (
......
go/internal/gitlabnet/authorizedkeys/client.go → internal/gitlabnet/authorizedkeys/client.go
View file @ 629e3bf9
...@@ -4,8 +4,8 @@ import ( ...@@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"net/url" "net/url"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet"
) )
const ( const (
......
go/internal/gitlabnet/authorizedkeys/client_test.go → internal/gitlabnet/authorizedkeys/client_test.go
View file @ 629e3bf9
...@@ -7,9 +7,9 @@ import ( ...@@ -7,9 +7,9 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
) )
var ( var (
......
go/internal/gitlabnet/client.go → internal/gitlabnet/client.go
View file @ 629e3bf9
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
) )
const ( const (
......
go/internal/gitlabnet/client_test.go → internal/gitlabnet/client_test.go
View file @ 629e3bf9
...@@ -12,9 +12,9 @@ import ( ...@@ -12,9 +12,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
) )
func TestClients(t *testing.T) { func TestClients(t *testing.T) {
......
go/internal/gitlabnet/discover/client.go → internal/gitlabnet/discover/client.go
View file @ 629e3bf9
...@@ -5,9 +5,9 @@ import ( ...@@ -5,9 +5,9 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet"
) )
type Client struct { type Client struct {
......
go/internal/gitlabnet/discover/client_test.go → internal/gitlabnet/discover/client_test.go
View file @ 629e3bf9
...@@ -7,9 +7,9 @@ import ( ...@@ -7,9 +7,9 @@ import (
"net/url" "net/url"
"testing" "testing"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
......
go/internal/gitlabnet/healthcheck/client.go → internal/gitlabnet/healthcheck/client.go
View file @ 629e3bf9
...@@ -4,8 +4,8 @@ import ( ...@@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet"
) )
const ( const (
......
go/internal/gitlabnet/healthcheck/client_test.go → internal/gitlabnet/healthcheck/client_test.go
View file @ 629e3bf9
...@@ -5,8 +5,8 @@ import ( ...@@ -5,8 +5,8 @@ import (
"net/http" "net/http"
"testing" "testing"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
......
go/internal/gitlabnet/httpclient_test.go → internal/gitlabnet/httpclient_test.go
View file @ 629e3bf9
...@@ -10,8 +10,8 @@ import ( ...@@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
) )
const ( const (
......
go/internal/gitlabnet/httpsclient_test.go → internal/gitlabnet/httpsclient_test.go
View file @ 629e3bf9
...@@ -9,9 +9,9 @@ import ( ...@@ -9,9 +9,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
) )
func TestSuccessfulRequests(t *testing.T) { func TestSuccessfulRequests(t *testing.T) {
......
go/internal/gitlabnet/lfsauthenticate/client.go → internal/gitlabnet/lfsauthenticate/client.go
View file @ 629e3bf9
...@@ -5,9 +5,9 @@ import ( ...@@ -5,9 +5,9 @@ import (
"net/http" "net/http"
"strings" "strings"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet"
) )
type Client struct { type Client struct {
......
go/internal/gitlabnet/lfsauthenticate/client_test.go → internal/gitlabnet/lfsauthenticate/client_test.go
View file @ 629e3bf9
...@@ -8,9 +8,9 @@ import ( ...@@ -8,9 +8,9 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
) )
const ( const (
......
go/internal/gitlabnet/testserver/testserver.go → internal/gitlabnet/testserver/testserver.go
View file @ 629e3bf9
...@@ -14,7 +14,7 @@ import ( ...@@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
) )
var ( var (
......
go/internal/gitlabnet/twofactorrecover/client.go → internal/gitlabnet/twofactorrecover/client.go
View file @ 629e3bf9
...@@ -5,10 +5,10 @@ import ( ...@@ -5,10 +5,10 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/discover" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/discover"
) )
type Client struct { type Client struct {
......
go/internal/gitlabnet/twofactorrecover/client_test.go → internal/gitlabnet/twofactorrecover/client_test.go
View file @ 629e3bf9
...@@ -9,11 +9,11 @@ import ( ...@@ -9,11 +9,11 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/discover" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/discover"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
) )
var ( var (
......
go/internal/handler/exec.go → internal/handler/exec.go
View file @ 629e3bf9
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"gitlab.com/gitlab-org/gitaly/auth" "gitlab.com/gitlab-org/gitaly/auth"
"gitlab.com/gitlab-org/gitaly/client" "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" "gitlab.com/gitlab-org/labkit/tracing"
"google.golang.org/grpc" "google.golang.org/grpc"
) )
......
go/internal/handler/exec_test.go → internal/handler/exec_test.go
View file @ 629e3bf9
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"google.golang.org/grpc" "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) { func makeHandler(t *testing.T, err error) func(context.Context, *grpc.ClientConn) (int32, error) {
......
go/internal/keyline/key_line.go → internal/keyline/key_line.go
View file @ 629e3bf9
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/executable" "gitlab.com/gitlab-org/gitlab-shell/internal/executable"
) )
var ( var (
......
go/internal/logger/logger.go → internal/logger/logger.go
View file @ 629e3bf9
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"os" "os"
"sync" "sync"
"gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/config"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
......
go/internal/sshenv/sshenv_test.go → internal/sshenv/sshenv_test.go
View file @ 629e3bf9
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"testing" "testing"
"github.com/stretchr/testify/require" "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) { func TestLocalAddr(t *testing.T) {
......
go/internal/testhelper/requesthandlers/requesthandlers.go → internal/testhelper/requesthandlers/requesthandlers.go
View file @ 629e3bf9
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/require" "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 { func BuildDisallowedByApiHandlers(t *testing.T) []testserver.TestRequestHandler {
......
support/gitlab_config.rb
View file @ 629e3bf9
require 'yaml' require 'yaml'
# Determine the root of the gitlab-shell directory
ROOT_PATH = ENV.fetch('GITLAB_SHELL_DIR', File.expand_path('..', __dir__))
class GitlabConfig class GitlabConfig
attr_reader :config attr_reader :config
......
support/go-format deleted 100755 → 0
View file @ 7d5229db
#!/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')
support/go-test deleted 100755 → 0
View file @ 7d5229db
#!/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
support/go_build.rb deleted 100644 → 0
View file @ 7d5229db
# 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7