Skip to content

Commit a2cba88

Browse files
dmkedmke
committed
update dependencies
1 parent 8bdfca0 commit a2cba88

File tree

3 files changed

+54
-120
lines changed

3 files changed

+54
-120
lines changed

‎exec/docker_client_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ func (m *apiMock) ContainerCreate(
7676
networking *network.NetworkingConfig,
7777
platform *specs.Platform,
7878
containerName string,
79-
) (container.ContainerCreateCreatedBody, error) {
79+
) (container.CreateResponse, error) {
8080
args := m.Called(ctx, config, host, networking, platform, containerName)
81-
return args.Get(0).(container.ContainerCreateCreatedBody), args.Error(1)
81+
return args.Get(0).(container.CreateResponse), args.Error(1)
8282
}
8383

8484
func (m *apiMock) ContainerStart(
@@ -94,9 +94,9 @@ func (m *apiMock) ContainerWait(
9494
ctx context.Context,
9595
containerID string,
9696
condition container.WaitCondition,
97-
) (<-chan container.ContainerWaitOKBody, <-chan error) {
97+
) (<-chan container.WaitResponse, <-chan error) {
9898
args := m.Called(ctx, containerID, condition)
99-
return args.Get(0).(chan container.ContainerWaitOKBody), args.Get(1).(chan error)
99+
return args.Get(0).(chan container.WaitResponse), args.Get(1).(chan error)
100100
}
101101

102102
type dockerClientSuite struct {
@@ -200,11 +200,11 @@ func (s *dockerClientSuite) TestFindImage_failure() {
200200
func (s *dockerClientSuite) prepareFs(inContainer bool, cidFileContent string) func() {
201201
fs := afero.NewMemMapFs()
202202
if inContainer {
203-
err := afero.WriteFile(fs, "/.dockerenv", nil, 0644)
203+
err := afero.WriteFile(fs, "/.dockerenv", nil, 0o644)
204204
s.Require().NoError(err)
205205

206206
if cidFileContent != "" {
207-
err = afero.WriteFile(fs, "/container.id", []byte(cidFileContent), 0644)
207+
err = afero.WriteFile(fs, "/container.id", []byte(cidFileContent), 0o644)
208208
s.Require().NoError(err)
209209
}
210210
}
@@ -529,7 +529,7 @@ search:
529529
var pltf *specs.Platform // nil!
530530

531531
s.cli.On("ContainerCreate", bg, ccfg, hcfg, ncfg, pltf, "").
532-
Return(container.ContainerCreateCreatedBody{ID: runningID}, startErr)
532+
Return(container.CreateResponse{ID: runningID}, startErr)
533533
}
534534

535535
func (s *dockerClientSuite) TestPrepareContainer() {
@@ -572,8 +572,8 @@ func (s *dockerClientSuite) TestRun() {
572572
s.cli.On("ContainerStart", bg, runningID, types.ContainerStartOptions{}).
573573
Return(nil)
574574

575-
statusCh := make(chan container.ContainerWaitOKBody, 1)
576-
statusCh <- container.ContainerWaitOKBody{StatusCode: 0}
575+
statusCh := make(chan container.WaitResponse, 1)
576+
statusCh <- container.WaitResponse{StatusCode: 0}
577577
errCh := make(chan error, 1)
578578
s.cli.On("ContainerWait", bg, runningID, container.WaitConditionNotRunning).
579579
Return(statusCh, errCh)
@@ -605,8 +605,8 @@ func (s *dockerClientSuite) TestRun_errRetreiveLogs() {
605605
s.cli.On("ContainerStart", bg, runningID, types.ContainerStartOptions{}).
606606
Return(nil)
607607

608-
statusCh := make(chan container.ContainerWaitOKBody, 1)
609-
statusCh <- container.ContainerWaitOKBody{StatusCode: 0}
608+
statusCh := make(chan container.WaitResponse, 1)
609+
statusCh <- container.WaitResponse{StatusCode: 0}
610610
errCh := make(chan error)
611611
s.cli.On("ContainerWait", bg, runningID, container.WaitConditionNotRunning).
612612
Return(statusCh, errCh)
@@ -634,8 +634,8 @@ func (s *dockerClientSuite) TestRun_errReadLogs() {
634634
s.cli.On("ContainerStart", bg, runningID, types.ContainerStartOptions{}).
635635
Return(nil)
636636

637-
statusCh := make(chan container.ContainerWaitOKBody, 1)
638-
statusCh <- container.ContainerWaitOKBody{StatusCode: 0}
637+
statusCh := make(chan container.WaitResponse, 1)
638+
statusCh <- container.WaitResponse{StatusCode: 0}
639639
errCh := make(chan error)
640640
s.cli.On("ContainerWait", bg, runningID, container.WaitConditionNotRunning).
641641
Return(statusCh, errCh)
@@ -673,7 +673,7 @@ func (s *dockerClientSuite) TestRun_errWaitForContainer() {
673673
s.cli.On("ContainerStart", bg, runningID, types.ContainerStartOptions{}).
674674
Return(nil)
675675

676-
statusCh := make(chan container.ContainerWaitOKBody)
676+
statusCh := make(chan container.WaitResponse)
677677
errCh := make(chan error, 1)
678678
errCh <- errors.New("unexpected restart")
679679
s.cli.On("ContainerWait", bg, runningID, container.WaitConditionNotRunning).
@@ -696,8 +696,8 @@ func (s *dockerClientSuite) TestRun_errExitStatus() {
696696
s.cli.On("ContainerStart", bg, runningID, types.ContainerStartOptions{}).
697697
Return(nil)
698698

699-
statusCh := make(chan container.ContainerWaitOKBody, 1)
700-
statusCh <- container.ContainerWaitOKBody{StatusCode: 127}
699+
statusCh := make(chan container.WaitResponse, 1)
700+
statusCh <- container.WaitResponse{StatusCode: 127}
701701
errCh := make(chan error, 1)
702702
s.cli.On("ContainerWait", bg, runningID, container.WaitConditionNotRunning).
703703
Return(statusCh, errCh)

‎go.mod‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ go 1.19
44

55
require (
66
github.com/bahlo/generic-list-go v0.2.0
7-
github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822
8-
github.com/docker/docker v20.10.23+incompatible
7+
github.com/bradfitz/gomemcache v0.0.0-20230124162541-5f7a7d875746
8+
github.com/docker/docker v23.0.0+incompatible
99
github.com/docker/go-units v0.5.0
1010
github.com/gorilla/handlers v1.5.1
1111
github.com/gorilla/mux v1.8.0
12-
github.com/moby/term v0.0.0-20221120202655-abb19827d345
12+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587
1313
github.com/opencontainers/image-spec v1.0.2
1414
github.com/prometheus/client_golang v1.14.0
1515
github.com/spf13/afero v1.9.3
@@ -20,17 +20,17 @@ require (
2020
)
2121

2222
require (
23-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
23+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
2424
github.com/Microsoft/go-winio v0.6.0 // indirect
2525
github.com/beorn7/perks v1.0.1 // indirect
26-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
26+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2727
github.com/davecgh/go-spew v1.1.1 // indirect
2828
github.com/docker/distribution v2.8.1+incompatible // indirect
2929
github.com/docker/go-connections v0.4.0 // indirect
3030
github.com/felixge/httpsnoop v1.0.3 // indirect
3131
github.com/gogo/protobuf v1.3.2 // indirect
3232
github.com/golang/protobuf v1.5.2 // indirect
33-
github.com/google/go-cmp v0.5.9 // indirect
33+
github.com/kr/pretty v0.2.1 // indirect
3434
github.com/kr/text v0.2.0 // indirect
3535
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
3636
github.com/morikuni/aec v1.0.0 // indirect
@@ -40,22 +40,21 @@ require (
4040
github.com/pkg/errors v0.9.1 // indirect
4141
github.com/pmezard/go-difflib v1.0.0 // indirect
4242
github.com/prometheus/client_model v0.3.0 // indirect
43-
github.com/prometheus/common v0.37.0 // indirect
44-
github.com/prometheus/procfs v0.8.0 // indirect
43+
github.com/prometheus/common v0.39.0 // indirect
44+
github.com/prometheus/procfs v0.9.0 // indirect
4545
github.com/sirupsen/logrus v1.9.0 // indirect
4646
github.com/spf13/cobra v1.6.1 // indirect
4747
github.com/stretchr/objx v0.5.0 // indirect
4848
go.uber.org/atomic v1.10.0 // indirect
4949
go.uber.org/goleak v1.2.0 // indirect
50-
go.uber.org/multierr v1.8.0 // indirect
50+
go.uber.org/multierr v1.9.0 // indirect
5151
golang.org/x/mod v0.7.0 // indirect
52-
golang.org/x/net v0.2.0 // indirect
53-
golang.org/x/sys v0.2.0 // indirect
54-
golang.org/x/text v0.4.0 // indirect
52+
golang.org/x/net v0.5.0 // indirect
53+
golang.org/x/sys v0.4.0 // indirect
54+
golang.org/x/text v0.6.0 // indirect
5555
golang.org/x/time v0.2.0 // indirect
56-
golang.org/x/tools v0.3.0 // indirect
56+
golang.org/x/tools v0.5.0 // indirect
5757
google.golang.org/protobuf v1.28.1 // indirect
58-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
5958
gopkg.in/yaml.v3 v3.0.1 // indirect
6059
gotest.tools/v3 v3.4.0 // indirect
6160
)

0 commit comments

Comments
 (0)