diff options
| author | Nick Thomas <nick@gitlab.com> | 2021-05-05 16:00:35 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2021-05-05 17:07:23 +0100 |
| commit | d79d4777a88fcbf8f44771df76c4a6f1d3baa58b (patch) | |
| tree | a62dc12af04fe38c0bd78d8247ffa3ccf1d7ad8e /internal/gitlabnet | |
| parent | 584643e0e10e0cbeee4f8366b5e50656dfee9ea4 (diff) | |
| download | gitlab-shell-d79d4777a88fcbf8f44771df76c4a6f1d3baa58b.tar.gz | |
Respect parent context for Gitaly calls
Without these changes, Gitaly calls would not be linked to a parent
context. This means that they would have an unassociated correlationID,
and Gitaly RPC calls would not be cancel()ed by parent context
cancellation.
Changelog: fixed
Diffstat (limited to 'internal/gitlabnet')
| -rw-r--r-- | internal/gitlabnet/accessverifier/client.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/internal/gitlabnet/accessverifier/client.go b/internal/gitlabnet/accessverifier/client.go index 9389257..6272c8b 100644 --- a/internal/gitlabnet/accessverifier/client.go +++ b/internal/gitlabnet/accessverifier/client.go @@ -65,7 +65,6 @@ type Response struct { ConsoleMessages []string `json:"gl_console_messages"` Who string StatusCode int - CorrelationID string } func NewClient(config *config.Config) (*Client, error) { @@ -110,8 +109,6 @@ func parse(hr *http.Response, args *commandargs.Shell) (*Response, error) { } response.StatusCode = hr.StatusCode - // We expect the same correlation ID that we sent - response.CorrelationID = hr.Header.Get("X-Request-Id") return response, nil } |