diff options
Diffstat (limited to 'internal/command/receivepack')
| -rw-r--r-- | internal/command/receivepack/gitalycall.go | 4 | ||||
| -rw-r--r-- | internal/command/receivepack/gitalycall_test.go | 7 | ||||
| -rw-r--r-- | internal/command/receivepack/receivepack.go | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/internal/command/receivepack/gitalycall.go b/internal/command/receivepack/gitalycall.go index 713f323..06e7b2c 100644 --- a/internal/command/receivepack/gitalycall.go +++ b/internal/command/receivepack/gitalycall.go @@ -12,7 +12,7 @@ import ( "gitlab.com/gitlab-org/gitlab-shell/internal/handler" ) -func (c *Command) performGitalyCall(response *accessverifier.Response) error { +func (c *Command) performGitalyCall(ctx context.Context, response *accessverifier.Response) error { gc := &handler.GitalyCommand{ Config: c.Config, ServiceName: string(commandargs.ReceivePack), @@ -30,7 +30,7 @@ func (c *Command) performGitalyCall(response *accessverifier.Response) error { GitConfigOptions: response.GitConfigOptions, } - return gc.RunGitalyCommand(func(ctx context.Context, conn *grpc.ClientConn) (int32, error) { + return gc.RunGitalyCommand(ctx, func(ctx context.Context, conn *grpc.ClientConn) (int32, error) { ctx, cancel := gc.PrepareContext(ctx, request.Repository, response, c.Args.Env) defer cancel() diff --git a/internal/command/receivepack/gitalycall_test.go b/internal/command/receivepack/gitalycall_test.go index 9a1019d..70f2b2e 100644 --- a/internal/command/receivepack/gitalycall_test.go +++ b/internal/command/receivepack/gitalycall_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/sirupsen/logrus" - "github.com/stretchr/testify/require" + "gitlab.com/gitlab-org/labkit/correlation" "gitlab.com/gitlab-org/gitlab-shell/client/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" @@ -61,8 +61,9 @@ func TestReceivePack(t *testing.T) { } hook := testhelper.SetupLogger() + ctx := correlation.ContextWithCorrelation(context.Background(), "a-correlation-id") - err := cmd.Execute(context.Background()) + err := cmd.Execute(ctx) require.NoError(t, err) if tc.username != "" { @@ -80,6 +81,6 @@ func TestReceivePack(t *testing.T) { require.Contains(t, entries[1].Message, "remote_ip=127.0.0.1") require.Contains(t, entries[1].Message, "gl_key_type=key") require.Contains(t, entries[1].Message, "gl_key_id=123") - require.Contains(t, entries[1].Message, "correlation_id=") + require.Contains(t, entries[1].Message, "correlation_id=a-correlation-id") } } diff --git a/internal/command/receivepack/receivepack.go b/internal/command/receivepack/receivepack.go index 4d5c686..27e4b72 100644 --- a/internal/command/receivepack/receivepack.go +++ b/internal/command/receivepack/receivepack.go @@ -38,7 +38,7 @@ func (c *Command) Execute(ctx context.Context) error { return customAction.Execute(ctx, response) } - return c.performGitalyCall(response) + return c.performGitalyCall(ctx, response) } func (c *Command) verifyAccess(ctx context.Context, repo string) (*accessverifier.Response, error) { |