github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-09-20 02:34:27 +00:00
Code Issues Projects Releases Wiki Activity

transport.NewHTTPReadSeeker: return concrete type, deprecate ReadSeekCloser

Browse Source 
General convention is to define interfaces on the receiver side, and
to return concrete types.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d71ad5b3a6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2022-11-10 17:23:11 +01:00
parent e22b555089
commit 1be402c953
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,24 +19,25 @@ var (
) )
// ReadSeekCloser combines io.ReadSeeker with io.Closer. // ReadSeekCloser combines io.ReadSeeker with io.Closer.
type ReadSeekCloser interface { //
io.ReadSeeker // Deprecated: use [io.ReadSeekCloser].
io.Closer type ReadSeekCloser = io.ReadSeekCloser
}
// NewHTTPReadSeeker handles reading from an HTTP endpoint using a GET // NewHTTPReadSeeker handles reading from an HTTP endpoint using a GET
// request. When seeking and starting a read from a non-zero offset // request. When seeking and starting a read from a non-zero offset
// the a "Range" header will be added which sets the offset. // the a "Range" header will be added which sets the offset.
//
// TODO(dmcgowan): Move this into a separate utility package // TODO(dmcgowan): Move this into a separate utility package
func NewHTTPReadSeeker(client *http.Client, url string, errorHandler func(*http.Response) error) ReadSeekCloser { func NewHTTPReadSeeker(client *http.Client, url string, errorHandler func(*http.Response) error) *HTTPReadSeeker {
return &httpReadSeeker{ return &HTTPReadSeeker{
client: client, client: client,
url: url, url: url,
errorHandler: errorHandler, errorHandler: errorHandler,
} }
} }
type httpReadSeeker struct { // HTTPReadSeeker implements an [io.ReadSeekCloser].
type HTTPReadSeeker struct {
client *http.Client client *http.Client
url string url string
@@ -60,7 +61,7 @@ type httpReadSeeker struct {
err error err error
} }
func (hrs *httpReadSeeker) Read(p []byte) (n int, err error) { func (hrs *HTTPReadSeeker) Read(p []byte) (n int, err error) {
if hrs.err != nil { if hrs.err != nil {
return 0, hrs.err return 0, hrs.err
} }
@@ -89,7 +90,7 @@ func (hrs *httpReadSeeker) Read(p []byte) (n int, err error) {
return n, err return n, err
} }
func (hrs *httpReadSeeker) Seek(offset int64, whence int) (int64, error) { func (hrs *HTTPReadSeeker) Seek(offset int64, whence int) (int64, error) {
if hrs.err != nil { if hrs.err != nil {
return 0, hrs.err return 0, hrs.err
} }
@@ -132,7 +133,7 @@ func (hrs *httpReadSeeker) Seek(offset int64, whence int) (int64, error) {
return hrs.seekOffset, err return hrs.seekOffset, err
} }
func (hrs *httpReadSeeker) Close() error { func (hrs *HTTPReadSeeker) Close() error {
if hrs.err != nil { if hrs.err != nil {
return hrs.err return hrs.err
} }
@@ -149,7 +150,7 @@ func (hrs *httpReadSeeker) Close() error {
return nil return nil
} }
func (hrs *httpReadSeeker) reset() { func (hrs *HTTPReadSeeker) reset() {
if hrs.err != nil { if hrs.err != nil {
return return
} }
@@ -159,7 +160,7 @@ func (hrs *httpReadSeeker) reset() {
} }
} }
func (hrs *httpReadSeeker) reader() (io.Reader, error) { func (hrs *HTTPReadSeeker) reader() (io.Reader, error) {
if hrs.err != nil { if hrs.err != nil {
return nil, hrs.err return nil, hrs.err
} }