Fix error handling in createLoadBalncerSandbox()

ctelfer · ctelfer · commit 4543e14fe449 · 2018-04-10T13:47:27.000-04:00
Error unwinding only works if the error variable is used consistently
and isn't hidden in the scope of other if statements.

Signed-off-by: Chris Telfer &lt;ctelfer@docker.com&gt;
diff --git a/network.go b/network.go
@@ -2110,6 +2110,7 @@ func (n *network) lbEndpointName() string {
 }
 
 func (n *network) createLoadBalancerSandbox() error {
+	var err error
 	sandboxName := n.lbSandboxName()
 	sbOptions := []SandboxOption{}
 	if n.ingress {
@@ -2144,10 +2145,13 @@ func (n *network) createLoadBalancerSandbox() error {
 		}
 	}()
 
-	if err := ep.Join(sb, nil); err != nil {
+	err = ep.Join(sb, nil)
+	if err != nil {
 		return err
 	}
-	return sb.EnableService()
+
+	err = sb.EnableService()
+	return err
 }
 
 func (n *network) deleteLoadBalancerSandbox() error {

Original file line number	Diff line number	Diff line change
`@@ -2110,6 +2110,7 @@ func (n *network) lbEndpointName() string {`
`2110`	`2110`	`}`
`2111`	`2111`
`2112`	`2112`	`func (n *network) createLoadBalancerSandbox() error {`
	`2113`	`+ var err error`
`2113`	`2114`	`sandboxName := n.lbSandboxName()`
`2114`	`2115`	`sbOptions := []SandboxOption{}`
`2115`	`2116`	`if n.ingress {`
`@@ -2144,10 +2145,13 @@ func (n *network) createLoadBalancerSandbox() error {`
`2144`	`2145`	`}`
`2145`	`2146`	`}()`
`2146`	`2147`
`2147`		`- if err := ep.Join(sb, nil); err != nil {`
	`2148`	`+ err = ep.Join(sb, nil)`
	`2149`	`+ if err != nil {`
`2148`	`2150`	`return err`
`2149`	`2151`	`}`
`2150`		`- return sb.EnableService()`
	`2152`	`+`
	`2153`	`+ err = sb.EnableService()`
	`2154`	`+ return err`
`2151`	`2155`	`}`
`2152`	`2156`
`2153`	`2157`	`func (n *network) deleteLoadBalancerSandbox() error {`