Add test for command logging

2 files changed, 5 insertions, 13 deletions

diff --git a/internal/command/uploadpack/gitalycall.go b/internal/command/uploadpack/gitalycall.go
index a9a05e4..8ab163d 100644
--- a/internal/command/uploadpack/gitalycall.go
+++ b/internal/command/uploadpack/gitalycall.go
@@ -6,10 +6,10 @@ import (
 
 	"google.golang.org/grpc"
 
-	log "github.com/sirupsen/logrus"
 	"gitlab.com/gitlab-org/gitaly/client"
 	pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs"
+	"gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/commandlogger"
 	"gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier"
 	"gitlab.com/gitlab-org/gitlab-shell/internal/handler"
 )
@@ -29,16 +29,7 @@ func (c *Command) performGitalyCall(response *accessverifier.Response) error {
 		GitConfigOptions: response.GitConfigOptions,
 	}
 
-	fields := log.Fields{
-		"command":       "git-upload-pack",
-		"glProjectPath": request.Repository.GlProjectPath,
-		"glRepository":  request.Repository.GlRepository,
-		"userId":        response.UserId,
-		"userName":      response.Username,
-		"gitProtocol":   request.GitProtocol,
-	}
-
-	log.WithFields(fields).Info("executing git command")
+	commandlogger.Log("git-upload-pack", request.Repository, response, request.GitProtocol)
 
 	return gc.RunGitalyCommand(func(ctx context.Context, conn *grpc.ClientConn) (int32, error) {
 		ctx, cancel := context.WithCancel(ctx)
diff --git a/internal/command/uploadpack/gitalycall_test.go b/internal/command/uploadpack/gitalycall_test.go
index 86dfbf1..e5fe8b2 100644
--- a/internal/command/uploadpack/gitalycall_test.go
+++ b/internal/command/uploadpack/gitalycall_test.go
@@ -2,8 +2,8 @@ package uploadpack
 
 import (
 	"bytes"
-	"testing"
 	"strings"
+	"testing"
 
 	"github.com/sirupsen/logrus"
 
@@ -14,8 +14,8 @@ import (
 	"gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter"
 	"gitlab.com/gitlab-org/gitlab-shell/internal/config"
 	"gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver"
-	"gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers"
 	"gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
+	"gitlab.com/gitlab-org/gitlab-shell/internal/testhelper/requesthandlers"
 )
 
 func TestUploadPack(t *testing.T) {
@@ -46,6 +46,7 @@ func TestUploadPack(t *testing.T) {
 	require.Equal(t, "UploadPack: "+repo, output.String())
 	require.Equal(t, logrus.InfoLevel, hook.LastEntry().Level)
 	require.True(t, strings.Contains(hook.LastEntry().Message, "executing git command"))
+	require.True(t, strings.Contains(hook.LastEntry().Message, "command=git-upload-pack"))
 
 	for k, v := range map[string]string{
 		"gitaly-feature-cache_invalidator":        "true",