From d005af25ab3224efa0d23be53858710f77e672c6 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Fri, 21 Jan 2022 11:05:19 +0000 Subject: Optionally use SSHUploadPackWithSidechannel If the GitLab API returns an allowed response with use_sidechannel set to true, gitlab-shell will establish a sidechannel connection and use SSHUploadPackWithSidechannel instead of SSHUploadPack. This is an efficiency improvement. --- internal/testhelper/requesthandlers/requesthandlers.go | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'internal/testhelper') diff --git a/internal/testhelper/requesthandlers/requesthandlers.go b/internal/testhelper/requesthandlers/requesthandlers.go index 6d501d0..2fdaef6 100644 --- a/internal/testhelper/requesthandlers/requesthandlers.go +++ b/internal/testhelper/requesthandlers/requesthandlers.go @@ -29,6 +29,14 @@ func BuildDisallowedByApiHandlers(t *testing.T) []testserver.TestRequestHandler } func BuildAllowedWithGitalyHandlers(t *testing.T, gitalyAddress string) []testserver.TestRequestHandler { + return buildAllowedWithGitalyHandlers(t, gitalyAddress, false) +} + +func BuildAllowedWithGitalyHandlersWithSidechannel(t *testing.T, gitalyAddress string) []testserver.TestRequestHandler { + return buildAllowedWithGitalyHandlers(t, gitalyAddress, true) +} + +func buildAllowedWithGitalyHandlers(t *testing.T, gitalyAddress string, useSidechannel bool) []testserver.TestRequestHandler { requests := []testserver.TestRequestHandler{ { Path: "/api/v4/internal/allowed", @@ -56,6 +64,9 @@ func BuildAllowedWithGitalyHandlers(t *testing.T, gitalyAddress string) []testse }, }, } + if useSidechannel { + body["gitaly"].(map[string]interface{})["use_sidechannel"] = true + } require.NoError(t, json.NewEncoder(w).Encode(body)) }, }, -- cgit v1.2.1