From 2ec2156a9d8e345d42d1bf093144a68735cc08ac Mon Sep 17 00:00:00 2001 From: Pavlo Strokov Date: Wed, 30 Sep 2020 14:17:23 +0300 Subject: Fix injection of gitaly servers info InjectGitalyServers used `NewOutgoingContext` that completely overrides all outgoing metadata values, so no values except 'gitaly-servers' were passed with outgoing requests. Fixed by replacing `NewOutgoingContext` with `AppendToOutgoingContext` that appends passed values to existing metadata or crete it if not present. Closes: https://gitlab.com/gitlab-org/gitaly/-/issues/3158 --- internal/helper/storage.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'internal/helper/storage.go') diff --git a/internal/helper/storage.go b/internal/helper/storage.go index 523ca7ed6..0a465756f 100644 --- a/internal/helper/storage.go +++ b/internal/helper/storage.go @@ -74,5 +74,5 @@ func InjectGitalyServers(ctx context.Context, name, address, token string) (cont return nil, err } - return metadata.NewOutgoingContext(ctx, metadata.Pairs("gitaly-servers", base64.StdEncoding.EncodeToString(gitalyServersJSON))), nil + return metadata.AppendToOutgoingContext(ctx, "gitaly-servers", base64.StdEncoding.EncodeToString(gitalyServersJSON)), nil } -- cgit v1.2.3