Skip to content

Commit 5591fcd

Browse files
robmryrobmry
committed
SQUASH - more updates
Signed-off-by: Rob Murray <[email protected]>
1 parent cecf7d5 commit 5591fcd

31 files changed

+98
-105
lines changed

‎client/client.container.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ func (c *sdkClient) FindContainerByName(ctx context.Context, name string) (*cont
3232
return nil, fmt.Errorf("container list: %w", err)
3333
}
3434

35-
if len(containers) > 0 {
36-
return &containers[0], nil
35+
if len(containers.Items) > 0 {
36+
return &containers.Items[0], nil
3737
}
3838

3939
return nil, errdefs.ErrNotFound.WithMessage(fmt.Sprintf("container %s not found", name))

‎client/client.container_benchmarks_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,16 @@ func BenchmarkContainerPause(b *testing.B) {
7373
createContainer(b, dockerClient, img, containerName)
7474

7575
b.Run("container-pause-unpause", func(b *testing.B) {
76-
err = dockerClient.ContainerStart(context.Background(), containerName, dockerclient.ContainerStartOptions{})
76+
_, err = dockerClient.ContainerStart(context.Background(), containerName, dockerclient.ContainerStartOptions{})
7777
require.NoError(b, err)
7878

7979
b.ResetTimer()
8080
b.ReportAllocs()
8181
for i := 0; i < b.N; i++ {
82-
err := dockerClient.ContainerPause(context.Background(), containerName)
82+
_, err := dockerClient.ContainerPause(context.Background(), containerName, dockerclient.ContainerPauseOptions{})
8383
require.NoError(b, err)
8484

85-
err = dockerClient.ContainerUnpause(context.Background(), containerName)
85+
_, err = dockerClient.ContainerUnpause(context.Background(), containerName, dockerclient.ContainerUnpauseOptions{})
8686
require.NoError(b, err)
8787
}
8888
})

‎client/client.container_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ func TestContainerList(t *testing.T) {
4242

4343
containers, err := dockerClient.ContainerList(context.Background(), dockerclient.ContainerListOptions{All: true})
4444
require.NoError(t, err)
45-
require.NotEmpty(t, containers)
46-
require.Len(t, containers, max)
45+
require.NotEmpty(t, containers.Items)
46+
require.Len(t, containers.Items, max)
4747
}
4848

4949
func TestFindContainerByName(t *testing.T) {
@@ -84,13 +84,13 @@ func TestContainerPause(t *testing.T) {
8484
pullImage(t, dockerClient, img)
8585
createContainer(t, dockerClient, img, "nginx-test-pause")
8686

87-
err = dockerClient.ContainerStart(context.Background(), "nginx-test-pause", dockerclient.ContainerStartOptions{})
87+
_, err = dockerClient.ContainerStart(context.Background(), "nginx-test-pause", dockerclient.ContainerStartOptions{})
8888
require.NoError(t, err)
8989

90-
err = dockerClient.ContainerPause(context.Background(), "nginx-test-pause")
90+
_, err = dockerClient.ContainerPause(context.Background(), "nginx-test-pause", dockerclient.ContainerPauseOptions{})
9191
require.NoError(t, err)
9292

93-
err = dockerClient.ContainerUnpause(context.Background(), "nginx-test-pause")
93+
_, err = dockerClient.ContainerUnpause(context.Background(), "nginx-test-pause", dockerclient.ContainerUnpauseOptions{})
9494
require.NoError(t, err)
9595
}
9696

@@ -111,7 +111,7 @@ func createContainer(tb testing.TB, dockerClient client.SDKClient, img string, n
111111
require.NotEmpty(tb, resp.ID)
112112

113113
tb.Cleanup(func() {
114-
err := dockerClient.ContainerRemove(context.Background(), resp.ID, dockerclient.ContainerRemoveOptions{Force: true})
114+
_, err := dockerClient.ContainerRemove(context.Background(), resp.ID, dockerclient.ContainerRemoveOptions{Force: true})
115115
require.NoError(tb, err)
116116
})
117117
}

‎client/client_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestNew(t *testing.T) {
2424
require.NoError(t, err)
2525
require.NotNil(t, cli)
2626

27-
info, err := cli.Info(context.Background())
27+
info, err := cli.Info(context.Background(), dockerclient.InfoOptions{})
2828
require.NoError(t, err)
2929
require.NotNil(t, info)
3030
})
@@ -34,11 +34,11 @@ func TestNew(t *testing.T) {
3434
require.NoError(t, err)
3535
require.NotNil(t, cli)
3636

37-
info1, err := cli.Info(context.Background())
37+
info1, err := cli.Info(context.Background(), dockerclient.InfoOptions{})
3838
require.NoError(t, err)
3939
require.NotNil(t, info1)
4040

41-
info2, err := cli.Info(context.Background())
41+
info2, err := cli.Info(context.Background(), dockerclient.InfoOptions{})
4242
require.NoError(t, err)
4343
require.NotNil(t, info2)
4444

@@ -99,7 +99,7 @@ func TestNew(t *testing.T) {
9999

100100
infoHealthCheck := func(ctx context.Context) func(c client.SDKClient) error {
101101
return func(c client.SDKClient) error {
102-
_, err := c.Info(ctx)
102+
_, err := c.Info(ctx, dockerclient.InfoOptions{})
103103
return err
104104
}
105105
}

‎client/examples_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"fmt"
66
"log"
77

8+
dockerclient "github.com/moby/moby/client"
9+
810
"github.com/docker/go-sdk/client"
911
)
1012

@@ -15,13 +17,13 @@ func ExampleNew() {
1517
return
1618
}
1719

18-
info, err := cli.Info(context.Background())
20+
info, err := cli.Info(context.Background(), dockerclient.InfoOptions{})
1921
if err != nil {
2022
log.Printf("error getting info: %s", err)
2123
return
2224
}
2325

24-
fmt.Println(info.OperatingSystem != "")
26+
fmt.Println(info.Info.OperatingSystem != "")
2527

2628
// Output:
2729
// true

‎client/go.mod‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ replace (
77
github.com/docker/go-sdk/context => ../context
88
)
99

10-
replace (
11-
github.com/moby/moby/api => github.com/moby/moby/api v0.0.0-20251026152250-0a134ecc1623 // master
12-
github.com/moby/moby/client => github.com/moby/moby/client v0.0.0-20251026152250-0a134ecc1623 // master
13-
)
14-
1510
require (
1611
github.com/caarlos0/env/v11 v11.3.1
1712
github.com/containerd/errdefs v1.0.0

‎client/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
3535
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
3636
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
3737
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
38-
github.com/moby/moby/api v0.0.0-20251026152250-0a134ecc1623 h1:ek/EICZIMsITISiOkNoCf3B5h5kMKeOQ7/rFQirDomw=
39-
github.com/moby/moby/api v0.0.0-20251026152250-0a134ecc1623/go.mod h1:/ou52HkRydg4+odrUR3vFsGgjIyHvprrpEQEkweL10s=
40-
github.com/moby/moby/client v0.0.0-20251026152250-0a134ecc1623 h1:20zZOOh83N8FHVTeCGsEcHpgCQR/igYNrASTDKcDZ+8=
41-
github.com/moby/moby/client v0.0.0-20251026152250-0a134ecc1623/go.mod h1:sxVfwGqVgh7n+tdxA4gFToQ/lf+bM7zATnvQjVnsKT4=
38+
github.com/moby/moby/api v1.52.0-beta.2 h1:cuilbu4cLBZnlNpJXuv3QTleOxgo3kGqkNGt3ICe1yY=
39+
github.com/moby/moby/api v1.52.0-beta.2/go.mod h1:/ou52HkRydg4+odrUR3vFsGgjIyHvprrpEQEkweL10s=
40+
github.com/moby/moby/client v0.1.0-beta.2 h1:Uy7JhcAOvQAQriowODpHaAJokfw/AhUya0216sk1hAk=
41+
github.com/moby/moby/client v0.1.0-beta.2/go.mod h1:yYEv2G6pYi8u63ga0zlU9KsM7DpoGXubtMaZMJE7/dw=
4242
github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
4343
github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
4444
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=

‎client/types.go‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"sync"
88

99
"github.com/moby/moby/api/types/container"
10-
"github.com/moby/moby/api/types/system"
1110
"github.com/moby/moby/client"
1211
)
1312

@@ -21,7 +20,7 @@ type SDKClient interface {
2120
// Logger returns the logger for the client.
2221
Logger() *slog.Logger
2322

24-
// DaemonHost gets the host or ip of the Docker daemon where ports are exposed on
23+
// DaemonHostWithContext gets the host or ip of the Docker daemon where ports are exposed on
2524
DaemonHostWithContext(ctx context.Context) (string, error)
2625

2726
// FindContainerByName finds a container by name.
@@ -59,7 +58,7 @@ type sdkClient struct {
5958
extraHeaders map[string]string
6059

6160
// cached docker info
62-
dockerInfo system.Info
61+
dockerInfo client.SystemInfoResult
6362
dockerInfoSet bool
6463

6564
// healthCheck is a function that returns the health of the docker daemon.
@@ -75,38 +74,38 @@ func (c *sdkClient) Logger() *slog.Logger {
7574
// Info returns information about the docker server. The result of Info is cached
7675
// and reused every time Info is called.
7776
// It will also print out the docker server info, and the resolved Docker paths, to the default logger.
78-
func (c *sdkClient) Info(ctx context.Context) (system.Info, error) {
77+
func (c *sdkClient) Info(ctx context.Context, options client.InfoOptions) (client.SystemInfoResult, error) {
7978
c.mtx.Lock()
8079
if c.dockerInfoSet {
8180
defer c.mtx.Unlock()
8281
return c.dockerInfo, nil
8382
}
8483
c.mtx.Unlock()
8584

86-
var info system.Info
85+
var info client.SystemInfoResult
8786

88-
info, err := c.APIClient.Info(ctx)
87+
info, err := c.APIClient.Info(ctx, options)
8988
if err != nil {
9089
return info, fmt.Errorf("docker info: %w", err)
9190
}
9291
c.dockerInfo = info
9392
c.dockerInfoSet = true
9493

9594
infoLabels := ""
96-
if len(c.dockerInfo.Labels) > 0 {
95+
if len(c.dockerInfo.Info.Labels) > 0 {
9796
infoLabels = `
9897
Labels:`
99-
for _, lb := range c.dockerInfo.Labels {
98+
for _, lb := range c.dockerInfo.Info.Labels {
10099
infoLabels += "\n " + lb
101100
}
102101
}
103102

104103
c.log.Info("Connected to docker",
105104
"package", packagePath,
106-
"server_version", c.dockerInfo.ServerVersion,
105+
"server_version", c.dockerInfo.Info.ServerVersion,
107106
"client_version", c.ClientVersion(),
108-
"operating_system", c.dockerInfo.OperatingSystem,
109-
"mem_total", c.dockerInfo.MemTotal/1024/1024,
107+
"operating_system", c.dockerInfo.Info.OperatingSystem,
108+
"mem_total", c.dockerInfo.Info.MemTotal/1024/1024,
110109
"labels", infoLabels,
111110
"docker_context", c.dockerContext,
112111
"docker_host", c.dockerHost,

‎container/container.run.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,10 @@ func Run(ctx context.Context, opts ...ContainerCustomizer) (*Container, error) {
154154
endpointSetting := apinetwork.EndpointSettings{
155155
Aliases: def.networkAliases[n],
156156
}
157-
err = ctr.dockerClient.NetworkConnect(ctx, nwInspect.Network.ID, resp.ID, &endpointSetting)
158-
if err != nil {
157+
if _, err = ctr.dockerClient.NetworkConnect(ctx, nwInspect.Network.ID, dockerclient.NetworkConnectOptions{
158+
Container: resp.ID,
159+
EndpointConfig: &endpointSetting,
160+
}); err != nil {
159161
return ctr, fmt.Errorf("network connect: %w", err)
160162
}
161163
}

‎container/container.run_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ func testCreateNetwork(t *testing.T, networkName string) apinetwork.CreateRespon
888888
require.NoError(t, err)
889889

890890
t.Cleanup(func() {
891-
err := dockerClient.NetworkRemove(context.Background(), nw.ID)
891+
_, err := dockerClient.NetworkRemove(context.Background(), nw.ID, dockerclient.NetworkRemoveOptions{})
892892
require.NoError(t, err)
893893
require.NoError(t, dockerClient.Close())
894894
})

0 commit comments

Comments
 (0)