Browse code

rm-gocheck: goimports

goimports -w \
-- "./pkg/discovery/file" "./pkg/discovery/kv" "./pkg/discovery/memory" "./pkg/discovery/nodes" "./integration-cli" "./integration-cli/daemon" "./pkg/discovery" \
&& \
gofmt -w -s \
-- "./pkg/discovery/file" "./pkg/discovery/kv" "./pkg/discovery/memory" "./pkg/discovery/nodes" "./integration-cli" "./integration-cli/daemon" "./pkg/discovery"

Signed-off-by: Tibor Vass <tibor@docker.com>

Tibor Vass authored on 2019/09/10 06:08:38
Showing 44 changed files
... ...
@@ -7,7 +7,6 @@ import (
7 7
 	"time"
8 8
 
9 9
 	"github.com/docker/docker/internal/test/daemon"
10
-	"github.com/go-check/check"
11 10
 	"github.com/pkg/errors"
12 11
 	"gotest.tools/assert"
13 12
 	"gotest.tools/icmd"
... ...
@@ -10,7 +10,6 @@ import (
10 10
 	"github.com/docker/docker/api/types/filters"
11 11
 	"github.com/docker/docker/api/types/swarm"
12 12
 	"github.com/docker/docker/client"
13
-	"github.com/go-check/check"
14 13
 	"gotest.tools/assert"
15 14
 )
16 15
 
... ...
@@ -31,7 +31,6 @@ import (
31 31
 	"github.com/docker/docker/pkg/stringid"
32 32
 	"github.com/docker/docker/volume"
33 33
 	"github.com/docker/go-connections/nat"
34
-	"github.com/go-check/check"
35 34
 	"gotest.tools/assert"
36 35
 	is "gotest.tools/assert/cmp"
37 36
 	"gotest.tools/poll"
... ...
@@ -17,7 +17,6 @@ import (
17 17
 	"github.com/docker/docker/client"
18 18
 	"github.com/docker/docker/integration-cli/checker"
19 19
 	"github.com/docker/docker/internal/test/request"
20
-	"github.com/go-check/check"
21 20
 	"gotest.tools/assert"
22 21
 )
23 22
 
... ...
@@ -3,13 +3,13 @@
3 3
 package main
4 4
 
5 5
 import (
6
+	"fmt"
6 7
 	"testing"
7 8
 	"time"
8 9
 
9 10
 	"github.com/docker/docker/api/types/swarm"
10 11
 	"github.com/docker/docker/integration-cli/checker"
11 12
 	"github.com/docker/docker/integration-cli/daemon"
12
-	"github.com/go-check/check"
13 13
 	"gotest.tools/assert"
14 14
 )
15 15
 
... ...
@@ -17,7 +17,6 @@ import (
17 17
 	"github.com/docker/docker/integration-cli/cli/build"
18 18
 	"github.com/docker/docker/integration-cli/daemon"
19 19
 	testdaemon "github.com/docker/docker/internal/test/daemon"
20
-	"github.com/go-check/check"
21 20
 	"golang.org/x/sys/unix"
22 21
 	"gotest.tools/assert"
23 22
 	"gotest.tools/icmd"
... ...
@@ -27,7 +27,6 @@ import (
27 27
 	testdaemon "github.com/docker/docker/internal/test/daemon"
28 28
 	"github.com/docker/docker/internal/test/request"
29 29
 	"github.com/docker/swarmkit/ca"
30
-	"github.com/go-check/check"
31 30
 	"github.com/pkg/errors"
32 31
 	"gotest.tools/assert"
33 32
 	is "gotest.tools/assert/cmp"
... ...
@@ -4,6 +4,7 @@ package main
4 4
 
5 5
 import (
6 6
 	"bufio"
7
+	"fmt"
7 8
 	"io/ioutil"
8 9
 	"os/exec"
9 10
 	"strings"
... ...
@@ -11,7 +12,6 @@ import (
11 11
 	"time"
12 12
 
13 13
 	"github.com/creack/pty"
14
-	"github.com/go-check/check"
15 14
 	"gotest.tools/assert"
16 15
 )
17 16
 
... ...
@@ -25,7 +25,6 @@ import (
25 25
 	"github.com/docker/docker/internal/testutil"
26 26
 	"github.com/docker/docker/pkg/archive"
27 27
 	"github.com/docker/docker/pkg/system"
28
-	"github.com/go-check/check"
29 28
 	"github.com/moby/buildkit/frontend/dockerfile/command"
30 29
 	"github.com/opencontainers/go-digest"
31 30
 	"gotest.tools/assert"
... ...
@@ -20,7 +20,6 @@ import (
20 20
 	"github.com/docker/docker/integration-cli/cli/build"
21 21
 	"github.com/docker/docker/internal/test/fakecontext"
22 22
 	"github.com/docker/go-units"
23
-	"github.com/go-check/check"
24 23
 	"gotest.tools/assert"
25 24
 	"gotest.tools/icmd"
26 25
 )
... ...
@@ -14,7 +14,6 @@ import (
14 14
 	"github.com/docker/docker/api/types"
15 15
 	"github.com/docker/docker/integration-cli/cli"
16 16
 	"github.com/docker/docker/integration-cli/cli/build"
17
-	"github.com/go-check/check"
18 17
 	"github.com/opencontainers/go-digest"
19 18
 	"gotest.tools/assert"
20 19
 	is "gotest.tools/assert/cmp"
... ...
@@ -1,12 +1,12 @@
1 1
 package main
2 2
 
3 3
 import (
4
+	"fmt"
4 5
 	"strings"
5 6
 	"testing"
6 7
 
7 8
 	"github.com/docker/docker/api/types/versions"
8 9
 	"github.com/docker/docker/integration-cli/cli"
9
-	"github.com/go-check/check"
10 10
 	"gotest.tools/assert"
11 11
 )
12 12
 
... ...
@@ -1,11 +1,11 @@
1 1
 package main
2 2
 
3 3
 import (
4
+	"fmt"
4 5
 	"os"
5 6
 	"path/filepath"
6 7
 	"testing"
7 8
 
8
-	"github.com/go-check/check"
9 9
 	"gotest.tools/assert"
10 10
 )
11 11
 
... ...
@@ -1,10 +1,10 @@
1 1
 package main
2 2
 
3 3
 import (
4
+	"fmt"
4 5
 	"os"
5 6
 	"testing"
6 7
 
7
-	"github.com/go-check/check"
8 8
 	"gotest.tools/assert"
9 9
 )
10 10
 
... ...
@@ -14,7 +14,6 @@ import (
14 14
 	"github.com/docker/docker/internal/test/fakecontext"
15 15
 	"github.com/docker/docker/pkg/stringid"
16 16
 	"github.com/docker/go-connections/nat"
17
-	"github.com/go-check/check"
18 17
 	"gotest.tools/assert"
19 18
 	is "gotest.tools/assert/cmp"
20 19
 )
... ...
@@ -37,7 +37,6 @@ import (
37 37
 	"github.com/docker/go-units"
38 38
 	"github.com/docker/libnetwork/iptables"
39 39
 	"github.com/docker/libtrust"
40
-	"github.com/go-check/check"
41 40
 	"golang.org/x/sys/unix"
42 41
 	"gotest.tools/assert"
43 42
 	"gotest.tools/icmd"
... ...
@@ -21,7 +21,6 @@ import (
21 21
 	testdaemon "github.com/docker/docker/internal/test/daemon"
22 22
 	"github.com/docker/docker/pkg/stringid"
23 23
 	"github.com/docker/docker/volume"
24
-	"github.com/go-check/check"
25 24
 	"gotest.tools/assert"
26 25
 )
27 26
 
... ...
@@ -8,7 +8,6 @@ import (
8 8
 	"testing"
9 9
 
10 10
 	"github.com/docker/docker/integration-cli/cli/build"
11
-	"github.com/go-check/check"
12 11
 	"gotest.tools/assert"
13 12
 	"gotest.tools/assert/cmp"
14 13
 )
... ...
@@ -13,7 +13,6 @@ import (
13 13
 
14 14
 	"github.com/docker/docker/integration-cli/cli/build"
15 15
 	"github.com/docker/docker/pkg/stringid"
16
-	"github.com/go-check/check"
17 16
 	"gotest.tools/assert"
18 17
 	is "gotest.tools/assert/cmp"
19 18
 	"gotest.tools/icmd"
... ...
@@ -11,7 +11,6 @@ import (
11 11
 	"testing"
12 12
 
13 13
 	"github.com/docker/docker/integration-cli/cli"
14
-	"github.com/go-check/check"
15 14
 	"gotest.tools/assert"
16 15
 	"gotest.tools/icmd"
17 16
 )
... ...
@@ -9,7 +9,6 @@ import (
9 9
 
10 10
 	"github.com/docker/docker/integration-cli/daemon"
11 11
 	testdaemon "github.com/docker/docker/internal/test/daemon"
12
-	"github.com/go-check/check"
13 12
 	"gotest.tools/assert"
14 13
 )
15 14
 
... ...
@@ -11,7 +11,6 @@ import (
11 11
 
12 12
 	"github.com/docker/docker/api/types"
13 13
 	"github.com/docker/docker/api/types/container"
14
-	"github.com/go-check/check"
15 14
 	"gotest.tools/assert"
16 15
 	"gotest.tools/icmd"
17 16
 )
... ...
@@ -9,7 +9,6 @@ import (
9 9
 	"testing"
10 10
 
11 11
 	"github.com/docker/docker/runconfig"
12
-	"github.com/go-check/check"
13 12
 	"gotest.tools/assert"
14 13
 	"gotest.tools/assert/cmp"
15 14
 )
... ...
@@ -1,11 +1,11 @@
1 1
 package main
2 2
 
3 3
 import (
4
+	"fmt"
4 5
 	"strings"
5 6
 	"testing"
6 7
 
7 8
 	"github.com/docker/docker/runconfig"
8
-	"github.com/go-check/check"
9 9
 	"gotest.tools/assert"
10 10
 )
11 11
 
... ...
@@ -26,7 +26,6 @@ import (
26 26
 	"github.com/docker/libnetwork/ipamapi"
27 27
 	remoteipam "github.com/docker/libnetwork/ipams/remote/api"
28 28
 	"github.com/docker/libnetwork/netlabel"
29
-	"github.com/go-check/check"
30 29
 	"github.com/vishvananda/netlink"
31 30
 	"golang.org/x/sys/unix"
32 31
 	"gotest.tools/assert"
... ...
@@ -16,7 +16,6 @@ import (
16 16
 	"github.com/docker/docker/integration-cli/cli"
17 17
 	"github.com/docker/docker/integration-cli/daemon"
18 18
 	"github.com/docker/docker/internal/test/fixtures/plugin"
19
-	"github.com/go-check/check"
20 19
 	"gotest.tools/assert"
21 20
 )
22 21
 
... ...
@@ -9,7 +9,6 @@ import (
9 9
 	"strings"
10 10
 	"testing"
11 11
 
12
-	"github.com/go-check/check"
13 12
 	"gotest.tools/assert"
14 13
 )
15 14
 
... ...
@@ -15,7 +15,6 @@ import (
15 15
 	"github.com/docker/docker/integration-cli/cli"
16 16
 	"github.com/docker/docker/integration-cli/cli/build"
17 17
 	"github.com/docker/docker/integration-cli/daemon"
18
-	"github.com/go-check/check"
19 18
 	"gotest.tools/assert"
20 19
 	"gotest.tools/icmd"
21 20
 )
... ...
@@ -12,7 +12,6 @@ import (
12 12
 	"github.com/docker/docker/integration-cli/cli"
13 13
 	"github.com/docker/docker/integration-cli/cli/build"
14 14
 	"github.com/docker/docker/pkg/stringid"
15
-	"github.com/go-check/check"
16 15
 	"gotest.tools/assert"
17 16
 	is "gotest.tools/assert/cmp"
18 17
 	"gotest.tools/icmd"
... ...
@@ -15,7 +15,6 @@ import (
15 15
 	"github.com/docker/distribution/manifest/manifestlist"
16 16
 	"github.com/docker/distribution/manifest/schema2"
17 17
 	"github.com/docker/docker/integration-cli/cli/build"
18
-	"github.com/go-check/check"
19 18
 	"github.com/opencontainers/go-digest"
20 19
 	"gotest.tools/assert"
21 20
 	"gotest.tools/icmd"
... ...
@@ -8,7 +8,6 @@ import (
8 8
 	"time"
9 9
 
10 10
 	"github.com/docker/docker/integration-cli/checker"
11
-	"github.com/go-check/check"
12 11
 	"gotest.tools/assert"
13 12
 	is "gotest.tools/assert/cmp"
14 13
 )
... ...
@@ -9,7 +9,6 @@ import (
9 9
 	"github.com/docker/docker/integration-cli/cli"
10 10
 	"github.com/docker/docker/integration-cli/cli/build"
11 11
 	"github.com/docker/docker/pkg/stringid"
12
-	"github.com/go-check/check"
13 12
 	"gotest.tools/assert"
14 13
 	"gotest.tools/icmd"
15 14
 )
... ...
@@ -36,7 +36,6 @@ import (
36 36
 	"github.com/docker/go-connections/nat"
37 37
 	"github.com/docker/libnetwork/resolvconf"
38 38
 	"github.com/docker/libnetwork/types"
39
-	"github.com/go-check/check"
40 39
 	"gotest.tools/assert"
41 40
 	"gotest.tools/icmd"
42 41
 )
... ...
@@ -26,7 +26,6 @@ import (
26 26
 	"github.com/docker/docker/pkg/mount"
27 27
 	"github.com/docker/docker/pkg/parsers"
28 28
 	"github.com/docker/docker/pkg/sysinfo"
29
-	"github.com/go-check/check"
30 29
 	"gotest.tools/assert"
31 30
 	"gotest.tools/icmd"
32 31
 )
... ...
@@ -17,7 +17,6 @@ import (
17 17
 	"time"
18 18
 
19 19
 	"github.com/docker/docker/integration-cli/cli/build"
20
-	"github.com/go-check/check"
21 20
 	"github.com/opencontainers/go-digest"
22 21
 	"gotest.tools/assert"
23 22
 	is "gotest.tools/assert/cmp"
... ...
@@ -13,7 +13,6 @@ import (
13 13
 	"github.com/docker/docker/api/types/mount"
14 14
 	"github.com/docker/docker/api/types/swarm"
15 15
 	"github.com/docker/docker/integration-cli/checker"
16
-	"github.com/go-check/check"
17 16
 	"gotest.tools/assert"
18 17
 )
19 18
 
... ...
@@ -12,7 +12,6 @@ import (
12 12
 	"github.com/docker/docker/integration-cli/checker"
13 13
 	"github.com/docker/docker/integration-cli/cli"
14 14
 	"github.com/docker/docker/integration-cli/cli/build"
15
-	"github.com/go-check/check"
16 15
 	"gotest.tools/assert"
17 16
 	"gotest.tools/icmd"
18 17
 )
... ...
@@ -13,7 +13,6 @@ import (
13 13
 
14 14
 	"github.com/docker/docker/integration-cli/checker"
15 15
 	"github.com/docker/docker/integration-cli/daemon"
16
-	"github.com/go-check/check"
17 16
 	"gotest.tools/assert"
18 17
 	"gotest.tools/icmd"
19 18
 )
... ...
@@ -7,7 +7,6 @@ import (
7 7
 	"time"
8 8
 
9 9
 	"github.com/docker/docker/integration-cli/cli"
10
-	"github.com/go-check/check"
11 10
 	"gotest.tools/assert"
12 11
 	"gotest.tools/icmd"
13 12
 )
... ...
@@ -28,7 +28,6 @@ import (
28 28
 	"github.com/docker/libnetwork/ipamapi"
29 29
 	remoteipam "github.com/docker/libnetwork/ipams/remote/api"
30 30
 	"github.com/docker/swarmkit/ca/keyutils"
31
-	"github.com/go-check/check"
32 31
 	"github.com/vishvananda/netlink"
33 32
 	"gotest.tools/assert"
34 33
 	"gotest.tools/fs"
... ...
@@ -15,7 +15,6 @@ import (
15 15
 
16 16
 	"github.com/docker/docker/pkg/stringid"
17 17
 	"github.com/docker/docker/pkg/system"
18
-	"github.com/go-check/check"
19 18
 	"gotest.tools/assert"
20 19
 )
21 20
 
... ...
@@ -15,7 +15,6 @@ import (
15 15
 	"github.com/docker/docker/api/types/network"
16 16
 	"github.com/docker/docker/client"
17 17
 	"github.com/docker/docker/integration-cli/cli/build"
18
-	"github.com/go-check/check"
19 18
 	"gotest.tools/assert"
20 19
 	"gotest.tools/icmd"
21 20
 )
... ...
@@ -1,6 +1,7 @@
1 1
 package main
2 2
 
3 3
 import (
4
+	"fmt"
4 5
 	"os/exec"
5 6
 	"runtime"
6 7
 	"strings"
... ...
@@ -8,7 +9,6 @@ import (
8 8
 
9 9
 	"github.com/docker/docker/integration-cli/daemon"
10 10
 	testdaemon "github.com/docker/docker/internal/test/daemon"
11
-	"github.com/go-check/check"
12 11
 	"gotest.tools/assert"
13 12
 )
14 13
 
... ...
@@ -19,7 +19,6 @@ import (
19 19
 	"github.com/docker/docker/client"
20 20
 	"github.com/docker/docker/integration-cli/cli"
21 21
 	"github.com/docker/docker/integration-cli/daemon"
22
-	"github.com/go-check/check"
23 22
 	"gotest.tools/assert"
24 23
 	"gotest.tools/icmd"
25 24
 )