Merge branch 'issue/705' of https://github.com/denismakogon/go-dockerclient

fsouza · fsouza · commit 213c8316617a · 2018-01-22T22:21:02.000-05:00
diff --git a/client.go b/client.go
@@ -218,10 +218,16 @@ func NewVersionedClient(endpoint string, apiVersionString string) (*Client, erro
 		eventMonitor:        new(eventMonitoringState),
 		requestedAPIVersion: requestedAPIVersion,
 	}
-	c.initializeNativeClient()
+	c.initializeNativeClient(defaultTransport)
 	return c, nil
 }
 
+// WithTransport replaces underlying HTTP client of Docker Client by accepting
+// a function that returns pointer to a transport object.
+func (c *Client) WithTransport(trFunc func () *http.Transport) {
+	c.initializeNativeClient(trFunc)
+}
+
 // NewVersionnedTLSClient has been DEPRECATED, please use NewVersionedTLSClient.
 func NewVersionnedTLSClient(endpoint string, cert, key, ca, apiVersionString string) (*Client, error) {
 	return NewVersionedTLSClient(endpoint, cert, key, ca, apiVersionString)
@@ -339,7 +345,7 @@ func NewVersionedTLSClientFromBytes(endpoint string, certPEMBlock, keyPEMBlock,
 		eventMonitor:        new(eventMonitoringState),
 		requestedAPIVersion: requestedAPIVersion,
 	}
-	c.initializeNativeClient()
+	c.initializeNativeClient(defaultTransport)
 	return c, nil
 }
 
diff --git a/client_unix.go b/client_unix.go
@@ -9,21 +9,24 @@ package docker
 import (
 	"context"
 	"net"
+	"net/http"
 )
 
 // initializeNativeClient initializes the native Unix domain socket client on
 // Unix-style operating systems
-func (c *Client) initializeNativeClient() {
+func (c *Client) initializeNativeClient(trFunc func () *http.Transport) {
 	if c.endpointURL.Scheme != unixProtocol {
 		return
 	}
-	socketPath := c.endpointURL.Path
-	tr := defaultTransport()
+	sockPath := c.endpointURL.Path
+
+	tr := trFunc()
+
 	tr.Dial = func(network, addr string) (net.Conn, error) {
-		return c.Dialer.Dial(unixProtocol, socketPath)
+		return c.Dialer.Dial(unixProtocol, sockPath)
 	}
 	tr.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
-		return c.Dialer.Dial(unixProtocol, socketPath)
+		return c.Dialer.Dial(unixProtocol, sockPath)
 	}
 	c.HTTPClient.Transport = tr
 }
diff --git a/client_windows.go b/client_windows.go
@@ -10,6 +10,7 @@ import (
 	"context"
 	"net"
 	"time"
+	"net/http"
 
 	"github.com/Microsoft/go-winio"
 )
@@ -25,7 +26,7 @@ func (p pipeDialer) Dial(network, address string) (net.Conn, error) {
 }
 
 // initializeNativeClient initializes the native Named Pipe client for Windows
-func (c *Client) initializeNativeClient() {
+func (c *Client) initializeNativeClient(trFunc func () *http.Transport) {
 	if c.endpointURL.Scheme != namedPipeProtocol {
 		return
 	}
@@ -34,7 +35,7 @@ func (c *Client) initializeNativeClient() {
 		timeout := namedPipeConnectTimeout
 		return winio.DialPipe(namedPipePath, &timeout)
 	}
-	tr := defaultTransport()
+	tr := trFunc()
 	tr.Dial = dialFunc
 	tr.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
 		return dialFunc(network, addr)

Original file line number	Diff line number	Diff line change
`@@ -218,10 +218,16 @@ func NewVersionedClient(endpoint string, apiVersionString string) (*Client, erro`
`218`	`218`	`eventMonitor: new(eventMonitoringState),`
`219`	`219`	`requestedAPIVersion: requestedAPIVersion,`
`220`	`220`	`}`
`221`		`- c.initializeNativeClient()`
	`221`	`+ c.initializeNativeClient(defaultTransport)`
`222`	`222`	`return c, nil`
`223`	`223`	`}`
`224`	`224`
	`225`	`+// WithTransport replaces underlying HTTP client of Docker Client by accepting`
	`226`	`+// a function that returns pointer to a transport object.`
	`227`	`+func (c Client) WithTransport(trFunc func () http.Transport) {`
	`228`	`+ c.initializeNativeClient(trFunc)`
	`229`	`+}`
	`230`	`+`
`225`	`231`	`// NewVersionnedTLSClient has been DEPRECATED, please use NewVersionedTLSClient.`
`226`	`232`	`func NewVersionnedTLSClient(endpoint string, cert, key, ca, apiVersionString string) (*Client, error) {`
`227`	`233`	`return NewVersionedTLSClient(endpoint, cert, key, ca, apiVersionString)`
`@@ -339,7 +345,7 @@ func NewVersionedTLSClientFromBytes(endpoint string, certPEMBlock, keyPEMBlock,`
`339`	`345`	`eventMonitor: new(eventMonitoringState),`
`340`	`346`	`requestedAPIVersion: requestedAPIVersion,`
`341`	`347`	`}`
`342`		`- c.initializeNativeClient()`
	`348`	`+ c.initializeNativeClient(defaultTransport)`
`343`	`349`	`return c, nil`
`344`	`350`	`}`
`345`	`351`
Original file line number	Diff line number	Diff line change
`@@ -9,21 +9,24 @@ package docker`
`9`	`9`	`import (`
`10`	`10`	`"context"`
`11`	`11`	`"net"`
	`12`	`+ "net/http"`
`12`	`13`	`)`
`13`	`14`
`14`	`15`	`// initializeNativeClient initializes the native Unix domain socket client on`
`15`	`16`	`// Unix-style operating systems`
`16`		`-func (c *Client) initializeNativeClient() {`
	`17`	`+func (c Client) initializeNativeClient(trFunc func () http.Transport) {`
`17`	`18`	`if c.endpointURL.Scheme != unixProtocol {`
`18`	`19`	`return`
`19`	`20`	`}`
`20`		`- socketPath := c.endpointURL.Path`
`21`		`- tr := defaultTransport()`
	`21`	`+ sockPath := c.endpointURL.Path`
	`22`	`+`
	`23`	`+ tr := trFunc()`
	`24`	`+`
`22`	`25`	`tr.Dial = func(network, addr string) (net.Conn, error) {`
`23`		`- return c.Dialer.Dial(unixProtocol, socketPath)`
	`26`	`+ return c.Dialer.Dial(unixProtocol, sockPath)`
`24`	`27`	`}`
`25`	`28`	`tr.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {`
`26`		`- return c.Dialer.Dial(unixProtocol, socketPath)`
	`29`	`+ return c.Dialer.Dial(unixProtocol, sockPath)`
`27`	`30`	`}`
`28`	`31`	`c.HTTPClient.Transport = tr`
`29`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`"context"`
`11`	`11`	`"net"`
`12`	`12`	`"time"`
	`13`	`+ "net/http"`
`13`	`14`
`14`	`15`	`"github.com/Microsoft/go-winio"`
`15`	`16`	`)`
`@@ -25,7 +26,7 @@ func (p pipeDialer) Dial(network, address string) (net.Conn, error) {`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`// initializeNativeClient initializes the native Named Pipe client for Windows`
`28`		`-func (c *Client) initializeNativeClient() {`
	`29`	`+func (c Client) initializeNativeClient(trFunc func () http.Transport) {`
`29`	`30`	`if c.endpointURL.Scheme != namedPipeProtocol {`
`30`	`31`	`return`
`31`	`32`	`}`
`@@ -34,7 +35,7 @@ func (c *Client) initializeNativeClient() {`
`34`	`35`	`timeout := namedPipeConnectTimeout`
`35`	`36`	`return winio.DialPipe(namedPipePath, &timeout)`
`36`	`37`	`}`
`37`		`- tr := defaultTransport()`
	`38`	`+ tr := trFunc()`
`38`	`39`	`tr.Dial = dialFunc`
`39`	`40`	`tr.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {`
`40`	`41`	`return dialFunc(network, addr)`