From 282351e95434d62c5c16fc62c4b1d9d67ce56f7e Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Tue, 25 Feb 2020 12:40:15 +0100
Subject: [PATCH] Use http.NewRequestWithContext()

Signed-off-by: Alfonso Acosta <fons@syntacticsugar.consulting>
---
 registry/client/repository.go            | 22 +++++++---------------
 registry/client/transport/http_reader.go |  3 +--
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/registry/client/repository.go b/registry/client/repository.go
index 57bad437f..49fc0672e 100644
--- a/registry/client/repository.go
+++ b/registry/client/repository.go
@@ -307,7 +307,7 @@ func (t *tags) Get(ctx context.Context, tag string) (distribution.Descriptor, er
 	}
 
 	newRequest := func(method string) (*http.Response, error) {
-		req, err := newRequestWithContext(ctx, method, u, nil)
+		req, err := http.NewRequestWithContext(ctx, method, u, nil)
 		if err != nil {
 			return nil, err
 		}
@@ -467,7 +467,7 @@ func (ms *manifests) Get(ctx context.Context, dgst digest.Digest, options ...dis
 		return nil, err
 	}
 
-	req, err := newRequestWithContext(ctx, "GET", u, nil)
+	req, err := http.NewRequestWithContext(ctx, "GET", u, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -552,7 +552,7 @@ func (ms *manifests) Put(ctx context.Context, m distribution.Manifest, options .
 		return "", err
 	}
 
-	putRequest, err := newRequestWithContext(ctx, "PUT", manifestURL, bytes.NewReader(p))
+	putRequest, err := http.NewRequestWithContext(ctx, "PUT", manifestURL, bytes.NewReader(p))
 	if err != nil {
 		return "", err
 	}
@@ -587,7 +587,7 @@ func (ms *manifests) Delete(ctx context.Context, dgst digest.Digest) error {
 	if err != nil {
 		return err
 	}
-	req, err := newRequestWithContext(ctx, "DELETE", u, nil)
+	req, err := http.NewRequestWithContext(ctx, "DELETE", u, nil)
 	if err != nil {
 		return err
 	}
@@ -885,7 +885,7 @@ func (bs *blobStatter) Clear(ctx context.Context, dgst digest.Digest) error {
 		return err
 	}
 
-	req, err := newRequestWithContext(ctx, "DELETE", blobURL, nil)
+	req, err := http.NewRequestWithContext(ctx, "DELETE", blobURL, nil)
 	if err != nil {
 		return err
 	}
@@ -906,16 +906,8 @@ func (bs *blobStatter) SetDescriptor(ctx context.Context, dgst digest.Digest, de
 	return nil
 }
 
-func newRequestWithContext(ctx context.Context, method, url string, body io.Reader) (*http.Request, error) {
-	req, err := http.NewRequest(method, url, body)
-	if err != nil {
-		return nil, err
-	}
-	return req.WithContext(ctx), nil
-}
-
 func headWithContext(ctx context.Context, client *http.Client, url string) (resp *http.Response, err error) {
-	req, err := newRequestWithContext(ctx, "HEAD", url, nil)
+	req, err := http.NewRequestWithContext(ctx, "HEAD", url, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -923,7 +915,7 @@ func headWithContext(ctx context.Context, client *http.Client, url string) (resp
 }
 
 func getWithContext(ctx context.Context, client *http.Client, url string) (resp *http.Response, err error) {
-	req, err := newRequestWithContext(ctx, "GET", url, nil)
+	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/registry/client/transport/http_reader.go b/registry/client/transport/http_reader.go
index d9edcf030..0f8194fed 100644
--- a/registry/client/transport/http_reader.go
+++ b/registry/client/transport/http_reader.go
@@ -171,11 +171,10 @@ func (hrs *httpReadSeeker) reader() (io.Reader, error) {
 		return hrs.rc, nil
 	}
 
-	req, err := http.NewRequest("GET", hrs.url, nil)
+	req, err := http.NewRequestWithContext(hrs.ctx, "GET", hrs.url, nil)
 	if err != nil {
 		return nil, err
 	}
-	req = req.WithContext(hrs.ctx)
 
 	if hrs.readerOffset > 0 {
 		// If we are at different offset, issue a range request from there.