Skip to content

Commit 00657ff

Browse files
adecaroadecaro
authored
update(dep): switch to github.com/moby/moby (#1724)
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
1 parent b1d9869 commit 00657ff

4 files changed

Lines changed: 26 additions & 45 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ fabric-smart-client/
1010
/.bob/
1111
cmd/token_validation_service/example-*.txt
1212
cmd/token_validation_service/out/
13+
/.antigravitycli/

‎token/services/storage/db/kvs/hashicorp/go.mod‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ go 1.26.3
55
replace github.com/hyperledger-labs/fabric-token-sdk => ./../../../../../../
66

77
require (
8-
github.com/docker/docker v28.5.2+incompatible
9-
github.com/docker/go-connections v0.6.0
108
github.com/hashicorp/vault/api v1.23.0
119
github.com/hyperledger-labs/fabric-smart-client v0.11.0
1210
github.com/hyperledger-labs/fabric-token-sdk v0.4.1-0.20250528165839-032fb9265504
11+
github.com/moby/moby/api v1.54.2
12+
github.com/moby/moby/client v0.4.1
1313
github.com/stretchr/testify v1.11.1
1414
)
1515

@@ -28,10 +28,10 @@ require (
2828
github.com/consensys/gnark-crypto v0.20.1 // indirect
2929
github.com/containerd/errdefs v1.0.0 // indirect
3030
github.com/containerd/errdefs/pkg v0.3.0 // indirect
31-
github.com/containerd/log v0.1.0 // indirect
3231
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3332
github.com/dgraph-io/ristretto/v2 v2.4.0 // indirect
3433
github.com/distribution/reference v0.6.0 // indirect
34+
github.com/docker/go-connections v0.7.0 // indirect
3535
github.com/docker/go-units v0.5.0 // indirect
3636
github.com/dustin/go-humanize v1.0.1 // indirect
3737
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -73,10 +73,6 @@ require (
7373
github.com/mitchellh/mapstructure v1.5.0 // indirect
7474
github.com/mitchellh/reflectwalk v1.0.2 // indirect
7575
github.com/moby/docker-image-spec v1.3.1 // indirect
76-
github.com/moby/moby/api v1.54.2 // indirect
77-
github.com/moby/moby/client v0.4.0 // indirect
78-
github.com/moby/sys/atomicwriter v0.1.0 // indirect
79-
github.com/morikuni/aec v1.0.0 // indirect
8076
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8177
github.com/ncruces/go-strftime v1.0.0 // indirect
8278
github.com/onsi/gomega v1.40.0 // indirect
@@ -101,7 +97,6 @@ require (
10197
go.opentelemetry.io/otel v1.43.0 // indirect
10298
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
10399
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
104-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect
105100
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.40.0 // indirect
106101
go.opentelemetry.io/otel/log v0.6.0 // indirect
107102
go.opentelemetry.io/otel/metric v1.43.0 // indirect

‎token/services/storage/db/kvs/hashicorp/go.sum‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
2-
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
31
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
42
github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
53
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
@@ -43,8 +41,6 @@ github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG
4341
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
4442
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
4543
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
46-
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
47-
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
4844
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
4945
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5046
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -56,10 +52,8 @@ github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da h1:aIftn67I1fkbMa5
5652
github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
5753
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
5854
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
59-
github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=
60-
github.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
61-
github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
62-
github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
55+
github.com/docker/go-connections v0.7.0 h1:6SsRfJddP22WMrCkj19x9WKjEDTB+ahsdiGYf0mN39c=
56+
github.com/docker/go-connections v0.7.0/go.mod h1:no1qkHdjq7kLMGUXYAduOhYPSJxxvgWBh7ogVvptn3Q=
6357
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
6458
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
6559
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
@@ -197,16 +191,8 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
197191
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
198192
github.com/moby/moby/api v1.54.2 h1:wiat9QAhnDQjA7wk1kh/TqHz2I1uUA7M7t9SAl/JNXg=
199193
github.com/moby/moby/api v1.54.2/go.mod h1:+RQ6wluLwtYaTd1WnPLykIDPekkuyD/ROWQClE83pzs=
200-
github.com/moby/moby/client v0.4.0 h1:S+2XegzHQrrvTCvF6s5HFzcrywWQmuVnhOXe2kiWjIw=
201-
github.com/moby/moby/client v0.4.0/go.mod h1:QWPbvWchQbxBNdaLSpoKpCdf5E+WxFAgNHogCWDoa7g=
202-
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
203-
github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
204-
github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
205-
github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
206-
github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
207-
github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
208-
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
209-
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
194+
github.com/moby/moby/client v0.4.1 h1:DMQgisVoMkmMs7fp3ROSdiBnoAu8+vo3GggFl06M/wY=
195+
github.com/moby/moby/client v0.4.1/go.mod h1:z52C9O2POPOsnxZAy//WtKcQ32P+jT/NGeXu/7nfjGQ=
210196
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
211197
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
212198
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
@@ -244,8 +230,6 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
244230
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
245231
github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
246232
github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
247-
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
248-
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
249233
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
250234
github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4=
251235
github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0=
@@ -274,8 +258,6 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 h1:88Y4s2C8oTui1LGM6bT
274258
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0/go.mod h1:Vl1/iaggsuRlrHf/hfPJPvVag77kKyvrLeD10kpMl+A=
275259
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 h1:DvJDOPmSWQHWywQS6lKL+pb8s3gBLOZUtw4N+mavW1I=
276260
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0/go.mod h1:EtekO9DEJb4/jRyN4v4Qjc2yA7AtfCBuz2FynRUWTXs=
277-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 h1:3iZJKlCZufyRzPzlQhUIWVmfltrXuGyfjREgGP3UUjc=
278-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0/go.mod h1:/G+nUPfhq2e+qiXMGxMwumDrP5jtzU+mWN7/sjT2rak=
279261
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.40.0 h1:MzfofMZN8ulNqobCmCAVbqVL5syHw+eB2qPRkCMA/fQ=
280262
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.40.0/go.mod h1:E73G9UFtKRXrxhBsHtG00TB5WxX57lpsQzogDkqBTz8=
281263
go.opentelemetry.io/otel/log v0.6.0 h1:nH66tr+dmEgW5y+F9LanGJUBYPrRgP4g2EkmPE3LeK8=

‎token/services/storage/db/kvs/hashicorp/vault_kvs_test_utils.go‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@ package hashicorp
99
import (
1010
"fmt"
1111
"net/http"
12+
"net/netip"
1213
"runtime/debug"
1314
"strings"
1415
"testing"
1516
"time"
1617

17-
"github.com/docker/docker/api/types/container"
18-
"github.com/docker/docker/client"
19-
"github.com/docker/go-connections/nat"
2018
vault "github.com/hashicorp/vault/api"
2119
docker2 "github.com/hyperledger-labs/fabric-smart-client/integration/nwo/common/docker"
2220
"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
21+
"github.com/moby/moby/api/types/container"
22+
"github.com/moby/moby/api/types/network"
23+
"github.com/moby/moby/client"
2324
)
2425

2526
const (
@@ -61,26 +62,26 @@ func StartHashicorpVaultContainer(t *testing.T, port int) (func(), string, strin
6162
token := "00000000-0000-0000-0000-000000000000"
6263
listenAddress := "0.0.0.0:" + portStr
6364
clientAddress := "127.0.0.1:" + portStr
64-
portBinding := nat.Port(fmt.Sprintf("%d/tcp", port))
65+
portBinding := network.MustParsePort(fmt.Sprintf("%d/tcp", port))
6566
containerConfig := &container.Config{
6667
Image: ImageName,
6768
Env: []string{
6869
"SKIP_SETCAP=true",
6970
"VAULT_DEV_ROOT_TOKEN_ID=" + token,
7071
"VAULT_DEV_LISTEN_ADDRESS=" + listenAddress,
7172
},
72-
ExposedPorts: map[nat.Port]struct{}{
73+
ExposedPorts: network.PortSet{
7374
portBinding: {},
7475
},
7576
}
7677

7778
// Define the host configuration
7879
hostConfig := &container.HostConfig{
7980
CapAdd: []string{"IPC_LOCK"},
80-
PortBindings: nat.PortMap{ // Use nat.PortMap for port bindings
81-
portBinding: []nat.PortBinding{
81+
PortBindings: network.PortMap{ // Use network.PortMap for port bindings
82+
portBinding: []network.PortBinding{
8283
{
83-
HostIP: "0.0.0.0",
84+
HostIP: netip.MustParseAddr("0.0.0.0"),
8485
HostPort: portStr,
8586
},
8687
},
@@ -91,17 +92,19 @@ func StartHashicorpVaultContainer(t *testing.T, port int) (func(), string, strin
9192
containerName := ContainerNamePrefix + portStr
9293
resp, err := cli.ContainerCreate(
9394
ctx,
94-
containerConfig,
95-
hostConfig,
96-
nil,
97-
nil,
98-
containerName,
95+
client.ContainerCreateOptions{
96+
Config: containerConfig,
97+
HostConfig: hostConfig,
98+
NetworkingConfig: nil,
99+
Platform: nil,
100+
Name: containerName,
101+
},
99102
)
100103
if err != nil {
101104
t.Fatal(err)
102105
}
103106

104-
if err := cli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
107+
if _, err := cli.ContainerStart(ctx, resp.ID, client.ContainerStartOptions{}); err != nil {
105108
t.Fatal(err)
106109
}
107110

@@ -120,7 +123,7 @@ func StartHashicorpVaultContainer(t *testing.T, port int) (func(), string, strin
120123

121124
return func() {
122125
noWaitTimeout := 0 // to not wait for the container to exit gracefully
123-
if err := cli.ContainerStop(ctx, resp.ID, container.StopOptions{Timeout: &noWaitTimeout}); err != nil {
126+
if _, err := cli.ContainerStop(ctx, resp.ID, client.ContainerStopOptions{Timeout: &noWaitTimeout}); err != nil {
124127
logger.Errorf("failed to terminate hashicorp/vault [%s][%s]", err, string(debug.Stack()))
125128
}
126129
fmt.Println("Success")

0 commit comments

Comments
 (0)