diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-05 05:03:16 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-05 05:03:16 +0000 |
| commit | c577eb9ed8bd0336870f7a83302f70821d510169 (patch) | |
| tree | ed7f7281633d97933e4465a2ac0f86d62c9a216e /go/internal/command/uploadpack | |
| parent | ed0460374a5ca13d9ea17c6a9c21151319b7fd53 (diff) | |
| parent | 3b6f9f7583755e041e76142d7caf7716937907fa (diff) | |
| download | gitlab-shell-c577eb9ed8bd0336870f7a83302f70821d510169.tar.gz | |
Merge branch '181-migrate-gitlab-shell-checks-fallback' into 'master'
Support falling back to ruby version of checkers
See merge request gitlab-org/gitlab-shell!318
Diffstat (limited to 'go/internal/command/uploadpack')
| -rw-r--r-- | go/internal/command/uploadpack/gitalycall_test.go | 2 | ||||
| -rw-r--r-- | go/internal/command/uploadpack/uploadpack.go | 2 | ||||
| -rw-r--r-- | go/internal/command/uploadpack/uploadpack_test.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/go/internal/command/uploadpack/gitalycall_test.go b/go/internal/command/uploadpack/gitalycall_test.go index 2097964..eb18aa8 100644 --- a/go/internal/command/uploadpack/gitalycall_test.go +++ b/go/internal/command/uploadpack/gitalycall_test.go @@ -29,7 +29,7 @@ func TestUploadPack(t *testing.T) { cmd := &Command{ Config: &config.Config{GitlabUrl: url}, - Args: &commandargs.CommandArgs{GitlabKeyId: userId, CommandType: commandargs.UploadPack, SshArgs: []string{"git-upload-pack", repo}}, + Args: &commandargs.Shell{GitlabKeyId: userId, CommandType: commandargs.UploadPack, SshArgs: []string{"git-upload-pack", repo}}, ReadWriter: &readwriter.ReadWriter{ErrOut: output, Out: output, In: input}, } diff --git a/go/internal/command/uploadpack/uploadpack.go b/go/internal/command/uploadpack/uploadpack.go index cff198d..4b08bf2 100644 --- a/go/internal/command/uploadpack/uploadpack.go +++ b/go/internal/command/uploadpack/uploadpack.go @@ -10,7 +10,7 @@ import ( type Command struct { Config *config.Config - Args *commandargs.CommandArgs + Args *commandargs.Shell ReadWriter *readwriter.ReadWriter } diff --git a/go/internal/command/uploadpack/uploadpack_test.go b/go/internal/command/uploadpack/uploadpack_test.go index a06ba24..27a0786 100644 --- a/go/internal/command/uploadpack/uploadpack_test.go +++ b/go/internal/command/uploadpack/uploadpack_test.go @@ -22,7 +22,7 @@ func TestForbiddenAccess(t *testing.T) { cmd := &Command{ Config: &config.Config{GitlabUrl: url}, - Args: &commandargs.CommandArgs{GitlabKeyId: "disallowed", SshArgs: []string{"git-upload-pack", "group/repo"}}, + Args: &commandargs.Shell{GitlabKeyId: "disallowed", SshArgs: []string{"git-upload-pack", "group/repo"}}, ReadWriter: &readwriter.ReadWriter{ErrOut: output, Out: output}, } |