Merge branch 'smh-fix-build-500' into 'master'

Bring back WithID to backchannel package as it is used in tests

See merge request gitlab-org/gitaly!3849

1 files changed, 7 insertions, 0 deletions

diff --git a/internal/backchannel/server.go b/internal/backchannel/server.go
index 1d40c0241..d318e929a 100644
--- a/internal/backchannel/server.go
+++ b/internal/backchannel/server.go
@@ -42,6 +42,13 @@ func GetPeerID(ctx context.Context) (ID, error) {
 	return wrapper.peerID(), nil
 }
 
+// WithID stores the ID in the provided AuthInfo so it can be later accessed by the RPC handler.
+// GetYamuxSession gets the yamux session of the current peer connection.
+// This is exported to facilitate testing.
+func WithID(authInfo credentials.AuthInfo, id ID) credentials.AuthInfo {
+	return authInfoWrapper{id: id, AuthInfo: authInfo}
+}
+
 // GetYamuxSession gets the yamux session of the current peer connection.
 func GetYamuxSession(ctx context.Context) (*yamux.Session, error) {
 	peerInfo, ok := peer.FromContext(ctx)