Skip to content

Commit 94d2e31

Browse files
defbindefbin
committed
replace deprecated functions by alternative
1 parent f044b38 commit 94d2e31

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

‎e2e-tests/pkg/pbm/clock_skew.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,26 @@ import (
44
"context"
55
"log"
66

7-
"github.com/docker/docker/api/types"
87
"github.com/docker/docker/api/types/container"
98
"github.com/docker/docker/api/types/filters"
109
"github.com/docker/docker/api/types/network"
11-
docker "github.com/docker/docker/client"
10+
"github.com/docker/docker/client"
1211

1312
"github.com/percona/percona-backup-mongodb/pbm/errors"
1413
)
1514

1615
func ClockSkew(rsName, ts, dockerHost string) error {
1716
log.Printf("== Skew the clock for %s on the replicaset %s ", ts, rsName)
1817

19-
cn, err := docker.NewClientWithOpts(docker.WithHost(dockerHost))
18+
cn, err := client.NewClientWithOpts(client.WithHost(dockerHost))
2019
if err != nil {
2120
return errors.Wrap(err, "docker client")
2221
}
2322
defer cn.Close()
2423

2524
fltr := filters.NewArgs()
2625
fltr.Add("label", "com.percona.pbm.agent.rs="+rsName)
27-
containers, err := cn.ContainerList(context.Background(), types.ContainerListOptions{
26+
containers, err := cn.ContainerList(context.Background(), container.ListOptions{
2827
Filters: fltr,
2928
})
3029
if err != nil {
@@ -38,7 +37,7 @@ func ClockSkew(rsName, ts, dockerHost string) error {
3837
}
3938

4039
log.Printf("Removing container %s/%s\n", containerOld.ID, containerOld.Name)
41-
err = cn.ContainerRemove(context.Background(), c.ID, types.ContainerRemoveOptions{Force: true})
40+
err = cn.ContainerRemove(context.Background(), c.ID, container.RemoveOptions{Force: true})
4241
if err != nil {
4342
return errors.Wrapf(err, "remove container %s", c.ID)
4443
}
@@ -67,7 +66,7 @@ func ClockSkew(rsName, ts, dockerHost string) error {
6766
return errors.Wrap(err, "ContainerCreate")
6867
}
6968

70-
err = cn.ContainerStart(context.Background(), containerNew.ID, types.ContainerStartOptions{})
69+
err = cn.ContainerStart(context.Background(), containerNew.ID, container.StartOptions{})
7170
if err != nil {
7271
return errors.Wrap(err, "ContainerStart")
7372
}

‎e2e-tests/pkg/pbm/docker.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ import (
1111
"github.com/docker/docker/api/types"
1212
"github.com/docker/docker/api/types/container"
1313
"github.com/docker/docker/api/types/filters"
14-
docker "github.com/docker/docker/client"
14+
"github.com/docker/docker/client"
1515

1616
"github.com/percona/percona-backup-mongodb/pbm/errors"
1717
)
1818

1919
type Docker struct {
20-
cn *docker.Client
20+
cn *client.Client
2121
ctx context.Context
2222
}
2323

2424
func NewDocker(ctx context.Context, host string) (*Docker, error) {
25-
cn, err := docker.NewClientWithOpts(docker.WithHost(host))
25+
cn, err := client.NewClientWithOpts(client.WithHost(host))
2626
if err != nil {
2727
return nil, errors.Wrap(err, "docker client")
2828
}
@@ -39,7 +39,7 @@ func (d *Docker) StopContainers(labels []string) error {
3939
for _, v := range labels {
4040
fltr.Add("label", v)
4141
}
42-
containers, err := d.cn.ContainerList(d.ctx, types.ContainerListOptions{
42+
containers, err := d.cn.ContainerList(d.ctx, container.ListOptions{
4343
Filters: fltr,
4444
})
4545
if err != nil {
@@ -66,7 +66,7 @@ func (d *Docker) StopAgents(rsName string) error {
6666
func (d *Docker) PauseAgents(rsName string) error {
6767
fltr := filters.NewArgs()
6868
fltr.Add("label", "com.percona.pbm.agent.rs="+rsName)
69-
containers, err := d.cn.ContainerList(d.ctx, types.ContainerListOptions{
69+
containers, err := d.cn.ContainerList(d.ctx, container.ListOptions{
7070
Filters: fltr,
7171
})
7272
if err != nil {
@@ -91,7 +91,7 @@ func (d *Docker) PauseAgents(rsName string) error {
9191
func (d *Docker) UnpauseAgents(rsName string) error {
9292
fltr := filters.NewArgs()
9393
fltr.Add("label", "com.percona.pbm.agent.rs="+rsName)
94-
containers, err := d.cn.ContainerList(d.ctx, types.ContainerListOptions{
94+
containers, err := d.cn.ContainerList(d.ctx, container.ListOptions{
9595
Filters: fltr,
9696
})
9797
if err != nil {
@@ -123,7 +123,7 @@ func (d *Docker) StartContainers(labels []string) error {
123123
for _, v := range labels {
124124
fltr.Add("label", v)
125125
}
126-
containers, err := d.cn.ContainerList(d.ctx, types.ContainerListOptions{
126+
containers, err := d.cn.ContainerList(d.ctx, container.ListOptions{
127127
All: true,
128128
Filters: fltr,
129129
})
@@ -136,7 +136,7 @@ func (d *Docker) StartContainers(labels []string) error {
136136

137137
for _, c := range containers {
138138
log.Println("Straing container", c.ID)
139-
err = d.cn.ContainerStart(d.ctx, c.ID, types.ContainerStartOptions{})
139+
err = d.cn.ContainerStart(d.ctx, c.ID, container.StartOptions{})
140140
if err != nil {
141141
return errors.Wrapf(err, "start container %s", c.ID)
142142
}
@@ -156,7 +156,7 @@ func (d *Docker) RestartContainers(labels []string) error {
156156
for _, v := range labels {
157157
fltr.Add("label", v)
158158
}
159-
containers, err := d.cn.ContainerList(d.ctx, types.ContainerListOptions{
159+
containers, err := d.cn.ContainerList(d.ctx, container.ListOptions{
160160
Filters: fltr,
161161
})
162162
if err != nil {
@@ -177,7 +177,7 @@ func (d *Docker) RestartContainers(labels []string) error {
177177
func (d *Docker) RunOnReplSet(rsName string, wait time.Duration, cmd ...string) error {
178178
fltr := filters.NewArgs()
179179
fltr.Add("label", "com.percona.pbm.agent.rs="+rsName)
180-
containers, err := d.cn.ContainerList(d.ctx, types.ContainerListOptions{
180+
containers, err := d.cn.ContainerList(d.ctx, container.ListOptions{
181181
Filters: fltr,
182182
})
183183
if err != nil {
@@ -260,7 +260,7 @@ func (d *Docker) StartAgentContainers(labels []string) error {
260260
fltr.Add("label", v)
261261
}
262262

263-
containers, err := d.cn.ContainerList(d.ctx, types.ContainerListOptions{
263+
containers, err := d.cn.ContainerList(d.ctx, container.ListOptions{
264264
All: true,
265265
Filters: fltr,
266266
})
@@ -282,15 +282,15 @@ func (d *Docker) StartAgentContainers(labels []string) error {
282282
var buf strings.Builder
283283
var started bool
284284
for i := 1; i <= 5; i++ {
285-
err := d.cn.ContainerStart(d.ctx, cont.ID, types.ContainerStartOptions{})
285+
err := d.cn.ContainerStart(d.ctx, cont.ID, container.StartOptions{})
286286
if err != nil {
287287
errCh <- errors.Wrapf(err, "start container %s", cont.ID)
288288
return
289289
}
290290

291291
since := time.Now().Format(time.RFC3339Nano)
292292
time.Sleep(5 * time.Second)
293-
out, err := d.cn.ContainerLogs(d.ctx, cont.ID, types.ContainerLogsOptions{
293+
out, err := d.cn.ContainerLogs(d.ctx, cont.ID, container.LogsOptions{
294294
ShowStdout: true,
295295
ShowStderr: true,
296296
Follow: false,

‎e2e-tests/pkg/pbm/pbm_ctl.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ import (
1010
"strings"
1111
"time"
1212

13-
dtypes "github.com/docker/docker/api/types"
14-
docker "github.com/docker/docker/client"
13+
"github.com/docker/docker/api/types"
14+
"github.com/docker/docker/api/types/container"
15+
"github.com/docker/docker/client"
1516

1617
"github.com/percona/percona-backup-mongodb/pbm/defs"
1718
"github.com/percona/percona-backup-mongodb/pbm/errors"
1819
"github.com/percona/percona-backup-mongodb/pbm/oplog"
1920
)
2021

2122
type Ctl struct {
22-
cn *docker.Client
23+
cn *client.Client
2324
ctx context.Context
2425
container string
2526
env []string
@@ -28,7 +29,7 @@ type Ctl struct {
2829
var backupNameRE = regexp.MustCompile(`Starting backup '([0-9\-\:TZ]+)'`)
2930

3031
func NewCtl(ctx context.Context, host, pbmContainer string) (*Ctl, error) {
31-
cn, err := docker.NewClientWithOpts(docker.WithHost(host))
32+
cn, err := client.NewClientWithOpts(client.WithHost(host))
3233
if err != nil {
3334
return nil, errors.Wrap(err, "docker client")
3435
}
@@ -286,7 +287,7 @@ func (c *Ctl) PITRestoreClusterTime(t, i uint32) error {
286287
}
287288

288289
func (c *Ctl) RunCmd(cmds ...string) (string, error) {
289-
execConf := dtypes.ExecConfig{
290+
execConf := types.ExecConfig{
290291
Env: c.env,
291292
Cmd: cmds,
292293
AttachStderr: true,
@@ -297,7 +298,7 @@ func (c *Ctl) RunCmd(cmds ...string) (string, error) {
297298
return "", errors.Wrap(err, "ContainerExecCreate")
298299
}
299300

300-
container, err := c.cn.ContainerExecAttach(c.ctx, id.ID, dtypes.ExecStartCheck{})
301+
container, err := c.cn.ContainerExecAttach(c.ctx, id.ID, types.ExecStartCheck{})
301302
if err != nil {
302303
return "", errors.Wrap(err, "attach to failed container")
303304
}
@@ -334,7 +335,7 @@ func (c *Ctl) RunCmd(cmds ...string) (string, error) {
334335
func (c *Ctl) ContainerLogs() (string, error) {
335336
r, err := c.cn.ContainerLogs(
336337
c.ctx, c.container,
337-
dtypes.ContainerLogsOptions{
338+
container.LogsOptions{
338339
ShowStderr: true,
339340
})
340341
if err != nil {

0 commit comments

Comments
 (0)