diff options
Diffstat (limited to 'internal/command/uploadarchive')
| -rw-r--r-- | internal/command/uploadarchive/gitalycall.go | 4 | ||||
| -rw-r--r-- | internal/command/uploadarchive/gitalycall_test.go | 6 | ||||
| -rw-r--r-- | internal/command/uploadarchive/uploadarchive.go | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/internal/command/uploadarchive/gitalycall.go b/internal/command/uploadarchive/gitalycall.go index 05bb794..5b66bbb 100644 --- a/internal/command/uploadarchive/gitalycall.go +++ b/internal/command/uploadarchive/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.UploadArchive), @@ -23,7 +23,7 @@ func (c *Command) performGitalyCall(response *accessverifier.Response) error { request := &pb.SSHUploadArchiveRequest{Repository: &response.Gitaly.Repo} - 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/uploadarchive/gitalycall_test.go b/internal/command/uploadarchive/gitalycall_test.go index 03223e9..b89b749 100644 --- a/internal/command/uploadarchive/gitalycall_test.go +++ b/internal/command/uploadarchive/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" @@ -36,8 +36,9 @@ func TestUploadPack(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) require.Equal(t, "UploadArchive: "+repo, output.String()) @@ -50,4 +51,5 @@ func TestUploadPack(t *testing.T) { require.Contains(t, entries[1].Message, "command=git-upload-archive") 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=a-correlation-id") } diff --git a/internal/command/uploadarchive/uploadarchive.go b/internal/command/uploadarchive/uploadarchive.go index 178b42b..3c86be3 100644 --- a/internal/command/uploadarchive/uploadarchive.go +++ b/internal/command/uploadarchive/uploadarchive.go @@ -28,7 +28,7 @@ func (c *Command) Execute(ctx context.Context) error { return err } - return c.performGitalyCall(response) + return c.performGitalyCall(ctx, response) } func (c *Command) verifyAccess(ctx context.Context, repo string) (*accessverifier.Response, error) { |