gitaly-hooks: Pass in user details to call to PackObjectsHookjc-pass-user-details-to-pack-objects

Now that we have access to the user_id, username, and protocol, we can
pass these values into the request to PackObjectsHookWithSidechannel

1 files changed, 35 insertions, 1 deletions

diff --git a/cmd/gitaly-hooks/hooks.go b/cmd/gitaly-hooks/hooks.go
index 5a56464c8..10a0d2514 100644
--- a/cmd/gitaly-hooks/hooks.go
+++ b/cmd/gitaly-hooks/hooks.go
@@ -25,6 +25,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v15/streamio"
 	"gitlab.com/gitlab-org/labkit/tracing"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/metadata"
 )
 
 type hookError struct {
@@ -387,9 +388,42 @@ func handlePackObjectsWithSidechannel(ctx context.Context, payload git.HooksPayl
 	}
 	defer wt.Close()
 
+	var glID, glUsername, gitProtocol string
+
+	// TODO: remove this conditional in 15.2.
+	// Since the git2go binary is replaced before the gitaly binary, there
+	// is a period of time during an upgrade when the gitaly binary is older
+	// than the corresponding git2go binary, which means gitaly will still
+	// be sending ReceiveHooksPayload until the upgrade is finished.
+	if payload.UserDetails != nil {
+		glID = payload.UserDetails.UserID
+		glUsername = payload.UserDetails.Username
+		gitProtocol = payload.UserDetails.Protocol
+	} else {
+		glID = payload.ReceiveHooksPayload.UserID
+		glUsername = payload.ReceiveHooksPayload.Username
+		gitProtocol = payload.ReceiveHooksPayload.Protocol
+	}
+
+	ctx = metadata.AppendToOutgoingContext(
+		ctx,
+		"user_id",
+		glID,
+		"username",
+		glUsername,
+		"protocol",
+		gitProtocol,
+	)
+
 	if _, err := hookClient.PackObjectsHookWithSidechannel(
 		ctx,
-		&gitalypb.PackObjectsHookWithSidechannelRequest{Repository: payload.Repo, Args: args},
+		&gitalypb.PackObjectsHookWithSidechannelRequest{
+			Repository:  payload.Repo,
+			Args:        args,
+			GlId:        glID,
+			GlUsername:  glUsername,
+			GitProtocol: gitProtocol,
+		},
 	); err != nil {
 		return fmt.Errorf("call PackObjectsHookWithSidechannel: %w", err)
 	}