summaryrefslogtreecommitdiff
path: root/internal/handler/exec.go
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2022-05-02 09:34:52 +0000
committerJacob Vosmaer <jacob@gitlab.com>2022-05-02 09:35:12 +0000
commitb2b31cee4a27cccd100a5f0aa546d5a515576ada (patch)
treeff0878b5a1117a2cd05608237d5c852b6adfb126 /internal/handler/exec.go
parent4828228c95cf9789614a04df06d3d55dda63b2ca (diff)
downloadgitlab-shell-b2b31cee4a27cccd100a5f0aa546d5a515576ada.tar.gz
Always use Gitaly sidechannel connections
Before this change, the GitLab internal API could use a boolean response field to indicate whether gitlab-shell should make sidechannel connections go Gitaly. We now ignore that response field and always use sidechannel connections.
Diffstat (limited to 'internal/handler/exec.go')
-rw-r--r--internal/handler/exec.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/internal/handler/exec.go b/internal/handler/exec.go
index 44b02a7..0870d2b 100644
--- a/internal/handler/exec.go
+++ b/internal/handler/exec.go
@@ -33,10 +33,9 @@ type GitalyCommand struct {
func NewGitalyCommand(cfg *config.Config, serviceName string, response *accessverifier.Response) *GitalyCommand {
gc := gitaly.Command{
- ServiceName: serviceName,
- Address: response.Gitaly.Address,
- Token: response.Gitaly.Token,
- DialSidechannel: response.Gitaly.UseSidechannel,
+ ServiceName: serviceName,
+ Address: response.Gitaly.Address,
+ Token: response.Gitaly.Token,
}
return &GitalyCommand{Config: cfg, Response: response, Command: gc}