瀏覽代碼

daemon: Remove unneeded error wrapping in verifyNetworkingConfig

This function is called by `daemon.containerCreate()` which is already
wrapping errors coming from `verifyNetworkingConfig()` with
`errdefs.InvalidParameter()`. So `verifyNetworkingConfig()` should only
return standard errors.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Albin Kerouanton 1 年之前
父節點
當前提交
f3e62199ea
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      daemon/create.go
  2. 2 2
      daemon/create_test.go

+ 1 - 1
daemon/create.go

@@ -326,7 +326,7 @@ func verifyNetworkingConfig(nwConfig *networktypes.NetworkingConfig) error {
 
 	for k, v := range nwConfig.EndpointsConfig {
 		if v == nil {
-			return errdefs.InvalidParameter(errors.Errorf("no EndpointSettings for %s", k))
+			return errors.Errorf("no EndpointSettings for %s", k)
 		}
 		if v.IPAMConfig != nil {
 			if v.IPAMConfig.IPv4Address != "" && net.ParseIP(v.IPAMConfig.IPv4Address).To4() == nil {

+ 2 - 2
daemon/create_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/errdefs"
 	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
 )
 
 // Test case for 35752
@@ -17,5 +17,5 @@ func TestVerifyNetworkingConfig(t *testing.T) {
 		EndpointsConfig: endpoints,
 	}
 	err := verifyNetworkingConfig(nwConfig)
-	assert.Check(t, errdefs.IsInvalidParameter(err))
+	assert.Check(t, is.Error(err, "no EndpointSettings for mynet"), "should produce an error because no EndpointSettings were passed")
 }