Switch request.WithContext to request.Clone (#2017)

The Go docs now say to use request.Clone (introduced in Go
1.13) instead of request.WithContext (introduced in Go 1.7) as it deep
copies instead of shallow copies.
This commit is contained in:
Jeff Mitchell authored and GitHub committed 2022-04-15 13:28:17 -04:00
1 parent 0b12feb953
commit 3d9e541930
3 files changed
+4 -4

No files matched your search

+2 -2
View File
@@ -678,7 +678,7 @@ func (c *Client) NewRequest(ctx context.Context, method, requestPath string, bod
req.Header.Set("authorization", "Bearer "+token)
req.Header.Set("content-type", "application/json")
if ctx != nil {
req = req.WithContext(ctx)
req = req.Clone(ctx)
}
ret := &retryablehttp.Request{
@@ -735,7 +735,7 @@ func (c *Client) Do(r *retryablehttp.Request, opt ...Option) (*Response, error)
// this as it will make reading the response body impossible
_ = cancel
}
r.Request = r.Request.WithContext(ctx)
r.Request = r.Request.Clone(ctx)
if backoff == nil {
backoff = retryablehttp.LinearJitterBackoff
+1 -1
View File
@@ -152,7 +152,7 @@ func WrapWithEventsHandler(h http.Handler, e *event.Eventer, kms *kms.Kms, liste
}
// Set the context back on the request
r = r.WithContext(ctx)
r = r.Clone(ctx)
{
method := r.Method
+1 -1
View File
@@ -352,7 +352,7 @@ func wrapHandlerWithCommonFuncs(h http.Handler, c *Controller, props HandlerProp
r.Header.Set("Grpc-Metadata-"+requestInfoMdKey, base58.FastBase58Encoding(marshalledRequestInfo))
// Set the context back on the request
r = r.WithContext(ctx)
r = r.Clone(ctx)
h.ServeHTTP(w, r)
})
}