Skip to content

Commit 455fc31

Browse files
thediveothediveo
authored
Merge pull request #18 from thediveo/develop
chore: upgrade deps, keep up with Docker API type shuffling
2 parents 1dfcb6a + f261059 commit 455fc31

File tree

7 files changed

+102
-92
lines changed

7 files changed

+102
-92
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"GOPATH": "/home/vscode/go",
3131
"PATH": "/home/vscode/go/bin:/go/bin:/usr/local/go/bin:${localEnv:PATH}"
3232
},
33+
"postCreateCommand": "go install go.uber.org/mock/mockgen@latest",
3334
"customizations": {
3435
"vscode": {
3536
"extensions": [

‎client_mock_test.go‎

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,25 +131,25 @@ func newWrappedClient(ctrl *mock.Controller, wrapped moby.Client, withouts []str
131131

132132
if !slices.Contains(withouts, "ContainerExecCreate") {
133133
rec.ContainerExecCreate(Any, Any, Any).AnyTimes().
134-
DoAndReturn(func(ctx context.Context, container string, config types.ExecConfig) (types.IDResponse, error) {
134+
DoAndReturn(func(ctx context.Context, container string, config container.ExecOptions) (container.ExecCreateResponse, error) {
135135
return wrapped.ContainerExecCreate(ctx, container, config)
136136
})
137137
}
138138
if !slices.Contains(withouts, "ContainerExecStart") {
139139
rec.ContainerExecStart(Any, Any, Any).AnyTimes().
140-
DoAndReturn(func(ctx context.Context, execID string, config types.ExecStartCheck) error {
140+
DoAndReturn(func(ctx context.Context, execID string, config container.ExecStartOptions) error {
141141
return wrapped.ContainerExecStart(ctx, execID, config)
142142
})
143143
}
144144
if !slices.Contains(withouts, "ContainerExecAttach") {
145145
rec.ContainerExecAttach(Any, Any, Any).AnyTimes().
146-
DoAndReturn(func(ctx context.Context, execID string, config types.ExecStartCheck) (types.HijackedResponse, error) {
146+
DoAndReturn(func(ctx context.Context, execID string, config container.ExecAttachOptions) (types.HijackedResponse, error) {
147147
return wrapped.ContainerExecAttach(ctx, execID, config)
148148
})
149149
}
150150
if !slices.Contains(withouts, "ContainerExecInspect") {
151151
rec.ContainerExecInspect(Any, Any).AnyTimes().
152-
DoAndReturn(func(ctx context.Context, execID string) (types.ContainerExecInspect, error) {
152+
DoAndReturn(func(ctx context.Context, execID string) (container.ExecInspect, error) {
153153
return wrapped.ContainerExecInspect(ctx, execID)
154154
})
155155
}
@@ -193,19 +193,19 @@ func newWrappedClient(ctrl *mock.Controller, wrapped moby.Client, withouts []str
193193

194194
if !slices.Contains(withouts, "NetworkCreate") {
195195
rec.NetworkCreate(Any, Any, Any).AnyTimes().
196-
DoAndReturn(func(ctx context.Context, name string, options types.NetworkCreate) (types.NetworkCreateResponse, error) {
196+
DoAndReturn(func(ctx context.Context, name string, options network.CreateOptions) (network.CreateResponse, error) {
197197
return wrapped.NetworkCreate(ctx, name, options)
198198
})
199199
}
200200
if !slices.Contains(withouts, "NetworkInspect") {
201201
rec.NetworkInspect(Any, Any, Any).AnyTimes().
202-
DoAndReturn(func(ctx context.Context, networkID string, options types.NetworkInspectOptions) (types.NetworkResource, error) {
202+
DoAndReturn(func(ctx context.Context, networkID string, options network.InspectOptions) (network.Summary, error) {
203203
return wrapped.NetworkInspect(ctx, networkID, options)
204204
})
205205
}
206206
if !slices.Contains(withouts, "NetworkList") {
207207
rec.NetworkList(Any, Any).AnyTimes().
208-
DoAndReturn(func(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error) {
208+
DoAndReturn(func(ctx context.Context, options network.ListOptions) ([]network.Summary, error) {
209209
return wrapped.NetworkList(ctx, options)
210210
})
211211
}

‎go.mod‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,31 @@
11
module github.com/thediveo/morbyd
22

3-
go 1.22.0
3+
go 1.23.8
4+
5+
toolchain go1.24.2
46

57
require (
6-
github.com/docker/docker v27.4.1+incompatible
8+
github.com/docker/docker v28.1.1+incompatible
79
github.com/docker/go-connections v0.5.0
810
github.com/docker/go-units v0.5.0
911
github.com/moby/patternmatcher v0.6.0
10-
github.com/onsi/ginkgo/v2 v2.22.2
12+
github.com/onsi/ginkgo/v2 v2.23.3
1113
github.com/onsi/gomega v1.36.2
12-
github.com/opencontainers/image-spec v1.1.0
14+
github.com/opencontainers/image-spec v1.1.1
1315
github.com/pkg/errors v0.9.1
1416
github.com/thediveo/fdooze v0.3.2
1517
github.com/thediveo/success v1.0.3
16-
go.uber.org/mock v0.5.0
18+
go.uber.org/mock v0.5.1
1719
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
1820
)
1921

2022
require (
21-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
23+
github.com/moby/go-archive v0.1.0 // indirect
24+
github.com/moby/sys/atomicwriter v0.1.0 // indirect
25+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
26+
)
27+
28+
require (
2229
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2330
github.com/Microsoft/go-winio v0.6.2 // indirect
2431
github.com/containerd/log v0.1.0 // indirect
@@ -30,31 +37,29 @@ require (
3037
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3138
github.com/gogo/protobuf v1.3.2 // indirect
3239
github.com/golang/protobuf v1.5.4 // indirect
33-
github.com/google/go-cmp v0.6.0 // indirect
34-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
35-
github.com/klauspost/compress v1.17.4 // indirect
36-
github.com/kr/pretty v0.3.1 // indirect
40+
github.com/google/go-cmp v0.7.0 // indirect
41+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
42+
github.com/klauspost/compress v1.18.0 // indirect
3743
github.com/moby/docker-image-spec v1.3.1 // indirect
38-
github.com/moby/sys/sequential v0.5.0 // indirect
39-
github.com/moby/sys/user v0.1.0 // indirect
44+
github.com/moby/sys/sequential v0.6.0 // indirect
45+
github.com/moby/sys/user v0.4.0 // indirect
4046
github.com/moby/sys/userns v0.1.0 // indirect
4147
github.com/moby/term v0.5.0 // indirect
4248
github.com/morikuni/aec v1.0.0 // indirect
4349
github.com/opencontainers/go-digest v1.0.0 // indirect
4450
github.com/sirupsen/logrus v1.9.3 // indirect
4551
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
46-
go.opentelemetry.io/otel v1.21.0 // indirect
52+
go.opentelemetry.io/otel v1.35.0 // indirect
4753
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
48-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
54+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
4955
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
50-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
51-
golang.org/x/net v0.34.0 // indirect
52-
golang.org/x/sys v0.29.0 // indirect
53-
golang.org/x/text v0.21.0 // indirect
56+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
57+
golang.org/x/net v0.39.0 // indirect
58+
golang.org/x/sys v0.32.0 // indirect
59+
golang.org/x/text v0.24.0 // indirect
5460
golang.org/x/time v0.3.0 // indirect
55-
golang.org/x/tools v0.29.0 // indirect
61+
golang.org/x/tools v0.30.0 // indirect
5662
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
5763
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
5864
gopkg.in/yaml.v3 v3.0.1 // indirect
59-
gotest.tools/v3 v3.5.1 // indirect
6065
)

0 commit comments

Comments
 (0)