1 files changed, 51 insertions, 22 deletions

diff --git a/workhorse/internal/gitaly/gitaly_test.go b/workhorse/internal/gitaly/gitaly_test.go
index 9c54caae8c6..f693f102447 100644
--- a/workhorse/internal/gitaly/gitaly_test.go
+++ b/workhorse/internal/gitaly/gitaly_test.go
@@ -2,56 +2,72 @@ package gitaly
 
 import (
 	"context"
+	"os"
 	"testing"
 
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/metadata"
-)
-
-func TestNewSmartHTTPClient(t *testing.T) {
-	ctx, client, err := NewSmartHTTPClient(context.Background(), serverFixture())
-	require.NoError(t, err)
-	testOutgoingMetadata(t, ctx)
 
-	require.False(t, client.useSidechannel)
-	require.Nil(t, client.sidechannelRegistry)
-}
+	"gitlab.com/gitlab-org/gitlab/workhorse/internal/api"
+)
 
-func TestNewSmartHTTPClientWithSidechannel(t *testing.T) {
+func TestMain(m *testing.M) {
 	InitializeSidechannelRegistry(logrus.StandardLogger())
+	os.Exit(m.Run())
+}
 
-	fixture := serverFixture()
-	fixture.Sidechannel = true
-
-	ctx, client, err := NewSmartHTTPClient(context.Background(), fixture)
+func TestNewSmartHTTPClient(t *testing.T) {
+	ctx, client, err := NewSmartHTTPClient(
+		context.Background(),
+		serverFixture(),
+		WithFeatures(features()),
+		WithUsername("gl_username"),
+		WithUserID("gl_id"),
+	)
 	require.NoError(t, err)
 	testOutgoingMetadata(t, ctx)
-
-	require.True(t, client.useSidechannel)
+	testOutgoingIDAndUsername(t, ctx)
 	require.NotNil(t, client.sidechannelRegistry)
 }
 
 func TestNewBlobClient(t *testing.T) {
-	ctx, _, err := NewBlobClient(context.Background(), serverFixture())
+	ctx, _, err := NewBlobClient(
+		context.Background(),
+		serverFixture(),
+		WithFeatures(features()),
+	)
 	require.NoError(t, err)
 	testOutgoingMetadata(t, ctx)
 }
 
 func TestNewRepositoryClient(t *testing.T) {
-	ctx, _, err := NewRepositoryClient(context.Background(), serverFixture())
+	ctx, _, err := NewRepositoryClient(
+		context.Background(),
+		serverFixture(),
+		WithFeatures(features()),
+	)
+
 	require.NoError(t, err)
 	testOutgoingMetadata(t, ctx)
 }
 
 func TestNewNamespaceClient(t *testing.T) {
-	ctx, _, err := NewNamespaceClient(context.Background(), serverFixture())
+	ctx, _, err := NewNamespaceClient(
+		context.Background(),
+		serverFixture(),
+		WithFeatures(features()),
+	)
 	require.NoError(t, err)
 	testOutgoingMetadata(t, ctx)
 }
 
 func TestNewDiffClient(t *testing.T) {
-	ctx, _, err := NewDiffClient(context.Background(), serverFixture())
+	ctx, _, err := NewDiffClient(
+		context.Background(),
+		serverFixture(),
+		WithFeatures(features()),
+	)
 	require.NoError(t, err)
 	testOutgoingMetadata(t, ctx)
 }
@@ -71,16 +87,29 @@ func testOutgoingMetadata(t *testing.T, ctx context.Context) {
 	}
 }
 
-func serverFixture() Server {
+func testOutgoingIDAndUsername(t *testing.T, ctx context.Context) {
+	md, ok := metadata.FromOutgoingContext(ctx)
+	require.True(t, ok, "get metadata from context")
+
+	require.Equal(t, md["user_id"], []string{"gl_id"})
+	require.Equal(t, md["username"], []string{"gl_username"})
+}
+
+func features() map[string]string {
 	features := make(map[string]string)
 	for k, v := range allowedFeatures() {
 		features[k] = v
 	}
+
 	for k, v := range badFeatureMetadata() {
 		features[k] = v
 	}
 
-	return Server{Address: "tcp://localhost:123", Features: features}
+	return features
+}
+
+func serverFixture() api.GitalyServer {
+	return api.GitalyServer{Address: "tcp://localhost:123"}
 }
 
 func allowedFeatures() map[string]string {