@@ -9,18 +9,18 @@ import (
99 "github.com/docker/docker/api/types/container"
1010 "github.com/docker/docker/api/types/swarm"
1111 "github.com/docker/docker/api/types/system"
12- dockerClient "github.com/docker/docker/client"
12+ "github.com/docker/docker/client"
1313)
1414
1515var (
1616 defaultHeaders = map [string ]string {"User-Agent" : "engine-api-cli-1.0" }
1717)
1818
19- type Client interface {
19+ type dockerClient interface {
2020 Info (ctx context.Context ) (system.Info , error )
21- ContainerList (ctx context.Context , options container.ListOptions ) ([]types. Container , error )
22- ContainerStats (ctx context.Context , containerID string , stream bool ) (types. ContainerStats , error )
23- ContainerInspect (ctx context.Context , containerID string ) (types. ContainerJSON , error )
21+ ContainerList (ctx context.Context , options container.ListOptions ) ([]container. Summary , error )
22+ ContainerStats (ctx context.Context , containerID string , stream bool ) (container. StatsResponseReader , error )
23+ ContainerInspect (ctx context.Context , containerID string ) (container. InspectResponse , error )
2424 ServiceList (ctx context.Context , options types.ServiceListOptions ) ([]swarm.Service , error )
2525 TaskList (ctx context.Context , options types.TaskListOptions ) ([]swarm.Task , error )
2626 NodeList (ctx context.Context , options types.NodeListOptions ) ([]swarm.Node , error )
@@ -29,65 +29,65 @@ type Client interface {
2929 Close () error
3030}
3131
32- func NewEnvClient () (Client , error ) {
33- client , err := dockerClient .NewClientWithOpts (dockerClient .FromEnv )
32+ func newEnvClient () (dockerClient , error ) {
33+ dockerClient , err := client .NewClientWithOpts (client .FromEnv )
3434 if err != nil {
3535 return nil , err
3636 }
37- return & SocketClient { client }, nil
37+ return & socketClient { dockerClient }, nil
3838}
3939
40- func NewClient (host string , tlsConfig * tls.Config ) (Client , error ) {
40+ func newClient (host string , tlsConfig * tls.Config ) (dockerClient , error ) {
4141 transport := & http.Transport {
4242 TLSClientConfig : tlsConfig ,
4343 }
4444 httpClient := & http.Client {Transport : transport }
4545
46- client , err := dockerClient .NewClientWithOpts (
47- dockerClient .WithHTTPHeaders (defaultHeaders ),
48- dockerClient .WithHTTPClient (httpClient ),
49- dockerClient .WithAPIVersionNegotiation (),
50- dockerClient .WithHost (host ))
46+ dockerClient , err := client .NewClientWithOpts (
47+ client .WithHTTPHeaders (defaultHeaders ),
48+ client .WithHTTPClient (httpClient ),
49+ client .WithAPIVersionNegotiation (),
50+ client .WithHost (host ))
5151 if err != nil {
5252 return nil , err
5353 }
5454
55- return & SocketClient { client }, nil
55+ return & socketClient { dockerClient }, nil
5656}
5757
58- type SocketClient struct {
59- client * dockerClient .Client
58+ type socketClient struct {
59+ client * client .Client
6060}
6161
62- func (c * SocketClient ) Info (ctx context.Context ) (system.Info , error ) {
62+ func (c * socketClient ) Info (ctx context.Context ) (system.Info , error ) {
6363 return c .client .Info (ctx )
6464}
65- func (c * SocketClient ) ContainerList (ctx context.Context , options container.ListOptions ) ([]types. Container , error ) {
65+ func (c * socketClient ) ContainerList (ctx context.Context , options container.ListOptions ) ([]container. Summary , error ) {
6666 return c .client .ContainerList (ctx , options )
6767}
68- func (c * SocketClient ) ContainerStats (ctx context.Context , containerID string , stream bool ) (types. ContainerStats , error ) {
68+ func (c * socketClient ) ContainerStats (ctx context.Context , containerID string , stream bool ) (container. StatsResponseReader , error ) {
6969 return c .client .ContainerStats (ctx , containerID , stream )
7070}
71- func (c * SocketClient ) ContainerInspect (ctx context.Context , containerID string ) (types. ContainerJSON , error ) {
71+ func (c * socketClient ) ContainerInspect (ctx context.Context , containerID string ) (container. InspectResponse , error ) {
7272 return c .client .ContainerInspect (ctx , containerID )
7373}
74- func (c * SocketClient ) ServiceList (ctx context.Context , options types.ServiceListOptions ) ([]swarm.Service , error ) {
74+ func (c * socketClient ) ServiceList (ctx context.Context , options types.ServiceListOptions ) ([]swarm.Service , error ) {
7575 return c .client .ServiceList (ctx , options )
7676}
77- func (c * SocketClient ) TaskList (ctx context.Context , options types.TaskListOptions ) ([]swarm.Task , error ) {
77+ func (c * socketClient ) TaskList (ctx context.Context , options types.TaskListOptions ) ([]swarm.Task , error ) {
7878 return c .client .TaskList (ctx , options )
7979}
80- func (c * SocketClient ) NodeList (ctx context.Context , options types.NodeListOptions ) ([]swarm.Node , error ) {
80+ func (c * socketClient ) NodeList (ctx context.Context , options types.NodeListOptions ) ([]swarm.Node , error ) {
8181 return c .client .NodeList (ctx , options )
8282}
83- func (c * SocketClient ) DiskUsage (ctx context.Context , options types.DiskUsageOptions ) (types.DiskUsage , error ) {
83+ func (c * socketClient ) DiskUsage (ctx context.Context , options types.DiskUsageOptions ) (types.DiskUsage , error ) {
8484 return c .client .DiskUsage (ctx , options )
8585}
8686
87- func (c * SocketClient ) ClientVersion () string {
87+ func (c * socketClient ) ClientVersion () string {
8888 return c .client .ClientVersion ()
8989}
9090
91- func (c * SocketClient ) Close () error {
91+ func (c * socketClient ) Close () error {
9292 return c .client .Close ()
9393}
0 commit comments