GitList

Browse code

Change Forbidden Error (403) to Conflict(409)

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
(cherry picked from commit 31e8fcc67808488e9aade681a831d748df1af8a5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Arko Dasgupta authored on 2019/05/03 14:00:34
Showing 1 changed files

daemon/container_operations.go

History View file @ d44a488

@@ -359,7 +359,8 @@ func (daemon *Daemon) findAndAttachNetwork(container *container.Container, idOrN
 			networkName := n.Name()
 			containerName := strings.TrimPrefix(container.Name, "/")
 			if network, ok := container.NetworkSettings.Networks[networkName]; ok && network.EndpointID != "" {
-				return n, nil, types.ForbiddenErrorf("%s is already attached to network %s", containerName, networkName)
+				err := fmt.Errorf("%s is already attached to network %s", containerName, networkName)
+				return n, nil, errdefs.Conflict(err)
 			}
 		}
 	}

...	...	@@ -359,7 +359,8 @@ func (daemon Daemon) findAndAttachNetwork(container container.Container, idOrN
359	359	networkName := n.Name()
360	360	containerName := strings.TrimPrefix(container.Name, "/")
361	361	if network, ok := container.NetworkSettings.Networks[networkName]; ok && network.EndpointID != "" {
362		- return n, nil, types.ForbiddenErrorf("%s is already attached to network %s", containerName, networkName)
	362	+ err := fmt.Errorf("%s is already attached to network %s", containerName, networkName)
	363	+ return n, nil, errdefs.Conflict(err)
363	364	}
364	365	}
365	366	}