diff options
Diffstat (limited to 'internal/command/uploadpack/gitalycall.go')
| -rw-r--r-- | internal/command/uploadpack/gitalycall.go | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/internal/command/uploadpack/gitalycall.go b/internal/command/uploadpack/gitalycall.go index 0e6a6d0..43ae4f8 100644 --- a/internal/command/uploadpack/gitalycall.go +++ b/internal/command/uploadpack/gitalycall.go @@ -21,13 +21,30 @@ func (c *Command) performGitalyCall(ctx context.Context, response *accessverifie Features: response.Gitaly.Features, } + if response.Gitaly.UseSidechannel { + gc.DialSidechannel = true + request := &pb.SSHUploadPackWithSidechannelRequest{ + Repository: &response.Gitaly.Repo, + GitProtocol: c.Args.Env.GitProtocolVersion, + GitConfigOptions: response.GitConfigOptions, + } + + return gc.RunGitalyCommand(ctx, func(ctx context.Context, conn *grpc.ClientConn, registry *client.SidechannelRegistry) (int32, error) { + ctx, cancel := gc.PrepareContext(ctx, request.Repository, response, c.Args.Env) + defer cancel() + + rw := c.ReadWriter + return client.UploadPackWithSidechannel(ctx, conn, registry, rw.In, rw.Out, rw.ErrOut, request) + }) + } + request := &pb.SSHUploadPackRequest{ Repository: &response.Gitaly.Repo, GitProtocol: c.Args.Env.GitProtocolVersion, GitConfigOptions: response.GitConfigOptions, } - return gc.RunGitalyCommand(ctx, func(ctx context.Context, conn *grpc.ClientConn) (int32, error) { + return gc.RunGitalyCommand(ctx, func(ctx context.Context, conn *grpc.ClientConn, registry *client.SidechannelRegistry) (int32, error) { ctx, cancel := gc.PrepareContext(ctx, request.Repository, response, c.Args.Env) defer cancel() |