1. docker
  2. Commit 4a830df4914457451d8fd0432eaf2fbadae8506a
Browse code

client/network: use containerd errdefs checks

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>

Paweł Gronowski authored on 2025/05/19 21:14:10
Showing 7 changed files
client/network_connect_test.go
History View file @ 4a830df
... ... 
@@ -10,8 +10,8 @@ import (
10 10 
 	"strings"
11 11 
 	"testing"
12 12
13 
+	cerrdefs "github.com/containerd/errdefs"
13 14 
 	"github.com/docker/docker/api/types/network"
14 
-	"github.com/docker/docker/errdefs"
15 15 
 	"gotest.tools/v3/assert"
16 16 
 	is "gotest.tools/v3/assert/cmp"
17 17 
 )
... ... 
@@ -22,15 +22,15 @@ func TestNetworkConnectError(t *testing.T) {
22 22 
 	}
23 23
24 24 
 	err := client.NetworkConnect(context.Background(), "network_id", "container_id", nil)
25 
-	assert.Check(t, is.ErrorType(err, errdefs.IsSystem))
25 
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
26 26
27 27 
 	// Empty network ID or container ID
28 28 
 	err = client.NetworkConnect(context.Background(), "", "container_id", nil)
29 
-	assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
29 
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
30 30 
 	assert.Check(t, is.ErrorContains(err, "value is empty"))
31 31
32 32 
 	err = client.NetworkConnect(context.Background(), "network_id", "", nil)
33 
-	assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
33 
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
34 34 
 	assert.Check(t, is.ErrorContains(err, "value is empty"))
35 35 
 }
36 36
client/network_create_test.go
History View file @ 4a830df
... ... 
@@ -10,8 +10,8 @@ import (
10 10 
 	"strings"
11 11 
 	"testing"
12 12
13 
+	cerrdefs "github.com/containerd/errdefs"
13 14 
 	"github.com/docker/docker/api/types/network"
14 
-	"github.com/docker/docker/errdefs"
15 15 
 	"gotest.tools/v3/assert"
16 16 
 	is "gotest.tools/v3/assert/cmp"
17 17 
 )
... ... 
@@ -22,7 +22,7 @@ func TestNetworkCreateError(t *testing.T) {
22 22 
 	}
23 23
24 24 
 	_, err := client.NetworkCreate(context.Background(), "mynetwork", network.CreateOptions{})
25 
-	assert.Check(t, is.ErrorType(err, errdefs.IsSystem))
25 
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
26 26 
 }
27 27
28 28 
 // TestNetworkCreateConnectionError verifies that connection errors occurring
client/network_disconnect_test.go
History View file @ 4a830df
... ... 
@@ -10,8 +10,8 @@ import (
10 10 
 	"strings"
11 11 
 	"testing"
12 12
13 
+	cerrdefs "github.com/containerd/errdefs"
13 14 
 	"github.com/docker/docker/api/types/network"
14 
-	"github.com/docker/docker/errdefs"
15 15 
 	"gotest.tools/v3/assert"
16 16 
 	is "gotest.tools/v3/assert/cmp"
17 17 
 )
... ... 
@@ -22,15 +22,15 @@ func TestNetworkDisconnectError(t *testing.T) {
22 22 
 	}
23 23
24 24 
 	err := client.NetworkDisconnect(context.Background(), "network_id", "container_id", false)
25 
-	assert.Check(t, is.ErrorType(err, errdefs.IsSystem))
25 
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
26 26
27 27 
 	// Empty network ID or container ID
28 28 
 	err = client.NetworkDisconnect(context.Background(), "", "container_id", false)
29 
-	assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
29 
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
30 30 
 	assert.Check(t, is.ErrorContains(err, "value is empty"))
31 31
32 32 
 	err = client.NetworkDisconnect(context.Background(), "network_id", "", false)
33 
-	assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
33 
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
34 34 
 	assert.Check(t, is.ErrorContains(err, "value is empty"))
35 35 
 }
36 36
client/network_inspect_test.go
History View file @ 4a830df
... ... 
@@ -10,8 +10,8 @@ import (
10 10 
 	"strings"
11 11 
 	"testing"
12 12
13 
+	cerrdefs "github.com/containerd/errdefs"
13 14 
 	"github.com/docker/docker/api/types/network"
14 
-	"github.com/docker/docker/errdefs"
15 15 
 	"gotest.tools/v3/assert"
16 16 
 	is "gotest.tools/v3/assert/cmp"
17 17 
 )
... ... 
@@ -69,11 +69,11 @@ func TestNetworkInspect(t *testing.T) {
69 69 
 	t.Run("empty ID", func(t *testing.T) {
70 70 
 		// verify that the client does not create a request if the network-ID/name is empty.
71 71 
 		_, err := client.NetworkInspect(context.Background(), "", network.InspectOptions{})
72 
-		assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
72 
+		assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
73 73 
 		assert.Check(t, is.ErrorContains(err, "value is empty"))
74 74
75 75 
 		_, err = client.NetworkInspect(context.Background(), "    ", network.InspectOptions{})
76 
-		assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
76 
+		assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
77 77 
 		assert.Check(t, is.ErrorContains(err, "value is empty"))
78 78 
 	})
79 79 
 	t.Run("no options", func(t *testing.T) {
... ... 
@@ -91,16 +91,16 @@ func TestNetworkInspect(t *testing.T) {
91 91 
 	t.Run("global scope", func(t *testing.T) {
92 92 
 		_, err := client.NetworkInspect(context.Background(), "network_id", network.InspectOptions{Scope: "global"})
93 93 
 		assert.Check(t, is.ErrorContains(err, "Error: No such network: network_id"))
94 
-		assert.Check(t, is.ErrorType(err, errdefs.IsNotFound))
94 
+		assert.Check(t, is.ErrorType(err, cerrdefs.IsNotFound))
95 95 
 	})
96 96 
 	t.Run("unknown network", func(t *testing.T) {
97 97 
 		_, err := client.NetworkInspect(context.Background(), "unknown", network.InspectOptions{})
98 98 
 		assert.Check(t, is.ErrorContains(err, "Error: No such network: unknown"))
99 
-		assert.Check(t, is.ErrorType(err, errdefs.IsNotFound))
99 
+		assert.Check(t, is.ErrorType(err, cerrdefs.IsNotFound))
100 100 
 	})
101 101 
 	t.Run("server error", func(t *testing.T) {
102 102 
 		// Just testing that an internal server error is converted correctly by the client
103 103 
 		_, err := client.NetworkInspect(context.Background(), "test-500-response", network.InspectOptions{})
104 
-		assert.Check(t, is.ErrorType(err, errdefs.IsSystem))
104 
+		assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
105 105 
 	})
106 106 
 }
client/network_list_test.go
History View file @ 4a830df
... ... 
@@ -10,9 +10,9 @@ import (
10 10 
 	"strings"
11 11 
 	"testing"
12 12
13 
+	cerrdefs "github.com/containerd/errdefs"
13 14 
 	"github.com/docker/docker/api/types/filters"
14 15 
 	"github.com/docker/docker/api/types/network"
15 
-	"github.com/docker/docker/errdefs"
16 16 
 	"gotest.tools/v3/assert"
17 17 
 	is "gotest.tools/v3/assert/cmp"
18 18 
 )
... ... 
@@ -23,7 +23,7 @@ func TestNetworkListError(t *testing.T) {
23 23 
 	}
24 24
25 25 
 	_, err := client.NetworkList(context.Background(), network.ListOptions{})
26 
-	assert.Check(t, is.ErrorType(err, errdefs.IsSystem))
26 
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
27 27 
 }
28 28
29 29 
 func TestNetworkList(t *testing.T) {
client/network_prune_test.go
History View file @ 4a830df
... ... 
@@ -10,9 +10,9 @@ import (
10 10 
 	"strings"
11 11 
 	"testing"
12 12
13 
+	cerrdefs "github.com/containerd/errdefs"
13 14 
 	"github.com/docker/docker/api/types/filters"
14 15 
 	"github.com/docker/docker/api/types/network"
15 
-	"github.com/docker/docker/errdefs"
16 16 
 	"gotest.tools/v3/assert"
17 17 
 	is "gotest.tools/v3/assert/cmp"
18 18 
 )
... ... 
@@ -24,7 +24,7 @@ func TestNetworksPruneError(t *testing.T) {
24 24 
 	}
25 25
26 26 
 	_, err := client.NetworksPrune(context.Background(), filters.NewArgs())
27 
-	assert.Check(t, is.ErrorType(err, errdefs.IsSystem))
27 
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
28 28 
 }
29 29
30 30 
 func TestNetworksPrune(t *testing.T) {
client/network_remove_test.go
History View file @ 4a830df
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"strings"
10 10 
 	"testing"
11 11
12 
-	"github.com/docker/docker/errdefs"
12 
+	cerrdefs "github.com/containerd/errdefs"
13 13 
 	"gotest.tools/v3/assert"
14 14 
 	is "gotest.tools/v3/assert/cmp"
15 15 
 )
... ... 
@@ -20,14 +20,14 @@ func TestNetworkRemoveError(t *testing.T) {
20 20 
 	}
21 21
22 22 
 	err := client.NetworkRemove(context.Background(), "network_id")
23 
-	assert.Check(t, is.ErrorType(err, errdefs.IsSystem))
23 
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
24 24
25 25 
 	err = client.NetworkRemove(context.Background(), "")
26 
-	assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
26 
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
27 27 
 	assert.Check(t, is.ErrorContains(err, "value is empty"))
28 28
29 29 
 	err = client.NetworkRemove(context.Background(), "    ")
30 
-	assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
30 
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
31 31 
 	assert.Check(t, is.ErrorContains(err, "value is empty"))
32 32 
 }
33 33