daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use http.NewRequestWithContext() 

Signed-off-by: Alfonso Acosta <fons@syntacticsugar.consulting>
master
Alfonso Acosta 2020-02-25 12:40:15 +01:00
parent 58331abf58
commit 282351e954
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
registry/client/repository.go
View File

@ -307,7 +307,7 @@ func (t *tags) Get(ctx context.Context, tag string) (distribution.Descriptor, er
} }
newRequest := func(method string) (*http.Response, error) { 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 { if err != nil {
return nil, err return nil, err
} }
@ -467,7 +467,7 @@ func (ms *manifests) Get(ctx context.Context, dgst digest.Digest, options ...dis
return nil, err return nil, err
} }
req, err := newRequestWithContext(ctx, "GET", u, nil) req, err := http.NewRequestWithContext(ctx, "GET", u, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -552,7 +552,7 @@ func (ms *manifests) Put(ctx context.Context, m distribution.Manifest, options .
return "", err return "", err
} }
putRequest, err := newRequestWithContext(ctx, "PUT", manifestURL, bytes.NewReader(p)) putRequest, err := http.NewRequestWithContext(ctx, "PUT", manifestURL, bytes.NewReader(p))
if err != nil { if err != nil {
return "", err return "", err
} }
@ -587,7 +587,7 @@ func (ms *manifests) Delete(ctx context.Context, dgst digest.Digest) error {
if err != nil { if err != nil {
return err return err
} }
req, err := newRequestWithContext(ctx, "DELETE", u, nil) req, err := http.NewRequestWithContext(ctx, "DELETE", u, nil)
if err != nil { if err != nil {
return err return err
} }
@ -885,7 +885,7 @@ func (bs *blobStatter) Clear(ctx context.Context, dgst digest.Digest) error {
return err return err
} }
req, err := newRequestWithContext(ctx, "DELETE", blobURL, nil) req, err := http.NewRequestWithContext(ctx, "DELETE", blobURL, nil)
if err != nil { if err != nil {
return err return err
} }
@ -906,16 +906,8 @@ func (bs *blobStatter) SetDescriptor(ctx context.Context, dgst digest.Digest, de
return nil 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) { 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 { if err != nil {
return nil, err 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) { 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 { if err != nil {
return nil, err return nil, err
} }

3
registry/client/transport/http_reader.go
View File

@ -171,11 +171,10 @@ func (hrs *httpReadSeeker) reader() (io.Reader, error) {
return hrs.rc, nil 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 { if err != nil {
return nil, err return nil, err
} }
req = req.WithContext(hrs.ctx)
if hrs.readerOffset > 0 { if hrs.readerOffset > 0 {
// If we are at different offset, issue a range request from there. // If we are at different offset, issue a range request from there.