Skip to content

Commit 276c640

Browse files
author
Tibor Vass
committed
remove pkg/transport and use the one from distribution
Signed-off-by: Tibor Vass <[email protected]>
1 parent 745820f commit 276c640

9 files changed

Lines changed: 49 additions & 183 deletions

File tree

‎graph/pull.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212

1313
"github.com/Sirupsen/logrus"
1414
"github.com/docker/distribution/digest"
15+
"github.com/docker/distribution/registry/client/transport"
1516
"github.com/docker/docker/cliconfig"
1617
"github.com/docker/docker/pkg/progressreader"
1718
"github.com/docker/docker/pkg/streamformatter"
1819
"github.com/docker/docker/pkg/stringid"
19-
"github.com/docker/docker/pkg/transport"
2020
"github.com/docker/docker/registry"
2121
"github.com/docker/docker/utils"
2222
)

‎graph/push.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010

1111
"github.com/Sirupsen/logrus"
1212
"github.com/docker/distribution/digest"
13+
"github.com/docker/distribution/registry/client/transport"
1314
"github.com/docker/docker/cliconfig"
1415
"github.com/docker/docker/pkg/ioutils"
1516
"github.com/docker/docker/pkg/progressreader"
1617
"github.com/docker/docker/pkg/streamformatter"
1718
"github.com/docker/docker/pkg/stringid"
18-
"github.com/docker/docker/pkg/transport"
1919
"github.com/docker/docker/registry"
2020
"github.com/docker/docker/runconfig"
2121
"github.com/docker/docker/utils"

‎pkg/ioutils/readers.go‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,3 +225,29 @@ func HashData(src io.Reader) (string, error) {
225225
}
226226
return "sha256:" + hex.EncodeToString(h.Sum(nil)), nil
227227
}
228+
229+
type OnEOFReader struct {
230+
Rc io.ReadCloser
231+
Fn func()
232+
}
233+
234+
func (r *OnEOFReader) Read(p []byte) (n int, err error) {
235+
n, err = r.Rc.Read(p)
236+
if err == io.EOF {
237+
r.runFunc()
238+
}
239+
return
240+
}
241+
242+
func (r *OnEOFReader) Close() error {
243+
err := r.Rc.Close()
244+
r.runFunc()
245+
return err
246+
}
247+
248+
func (r *OnEOFReader) runFunc() {
249+
if fn := r.Fn; fn != nil {
250+
fn()
251+
r.Fn = nil
252+
}
253+
}

‎pkg/transport/LICENSE‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎pkg/transport/transport.go‎

Lines changed: 0 additions & 148 deletions
This file was deleted.

‎registry/endpoint.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/Sirupsen/logrus"
1313
"github.com/docker/distribution/registry/api/v2"
14-
"github.com/docker/docker/pkg/transport"
14+
"github.com/docker/distribution/registry/client/transport"
1515
)
1616

1717
// for mocking in unit tests

‎registry/registry.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import (
1717
"time"
1818

1919
"github.com/Sirupsen/logrus"
20+
"github.com/docker/distribution/registry/client/transport"
2021
"github.com/docker/docker/autogen/dockerversion"
2122
"github.com/docker/docker/pkg/parsers/kernel"
2223
"github.com/docker/docker/pkg/timeoutconn"
2324
"github.com/docker/docker/pkg/tlsconfig"
24-
"github.com/docker/docker/pkg/transport"
2525
"github.com/docker/docker/pkg/useragent"
2626
)
2727

@@ -92,7 +92,7 @@ func (m *httpsRequestModifier) ModifyRequest(req *http.Request) error {
9292
logrus.Debugf("hostDir: %s", hostDir)
9393
fs, err := ioutil.ReadDir(hostDir)
9494
if err != nil && !os.IsNotExist(err) {
95-
return nil
95+
return err
9696
}
9797

9898
for _, f := range fs {

‎registry/registry_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"strings"
99
"testing"
1010

11+
"github.com/docker/distribution/registry/client/transport"
1112
"github.com/docker/docker/cliconfig"
12-
"github.com/docker/docker/pkg/transport"
1313
)
1414

1515
var (

‎registry/session.go‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"github.com/Sirupsen/logrus"
2323
"github.com/docker/docker/cliconfig"
2424
"github.com/docker/docker/pkg/httputils"
25+
"github.com/docker/docker/pkg/ioutils"
2526
"github.com/docker/docker/pkg/tarsum"
26-
"github.com/docker/docker/pkg/transport"
2727
)
2828

2929
var (
@@ -73,6 +73,21 @@ func AuthTransport(base http.RoundTripper, authConfig *cliconfig.AuthConfig, alw
7373
}
7474
}
7575

76+
// cloneRequest returns a clone of the provided *http.Request.
77+
// The clone is a shallow copy of the struct and its Header map.
78+
func cloneRequest(r *http.Request) *http.Request {
79+
// shallow copy of the struct
80+
r2 := new(http.Request)
81+
*r2 = *r
82+
// deep copy of the Header
83+
r2.Header = make(http.Header, len(r.Header))
84+
for k, s := range r.Header {
85+
r2.Header[k] = append([]string(nil), s...)
86+
}
87+
88+
return r2
89+
}
90+
7691
func (tr *authTransport) RoundTrip(orig *http.Request) (*http.Response, error) {
7792
// Authorization should not be set on 302 redirect for untrusted locations.
7893
// This logic mirrors the behavior in AddRequiredHeadersToRedirectedRequests.
@@ -112,7 +127,7 @@ func (tr *authTransport) RoundTrip(orig *http.Request) (*http.Response, error) {
112127
if len(resp.Header["X-Docker-Token"]) > 0 {
113128
tr.token = resp.Header["X-Docker-Token"]
114129
}
115-
resp.Body = &transport.OnEOFReader{
130+
resp.Body = &ioutils.OnEOFReader{
116131
Rc: resp.Body,
117132
Fn: func() {
118133
tr.mu.Lock()

0 commit comments

Comments
 (0)