Fix errors with network get cidrs.

externalreality · externalreality · commit 7f60d1980661 · 2018-05-28T19:06:13.000-04:00
diff --git a/apiserver/common/firewall/egressaddresswatcher.go b/apiserver/common/firewall/egressaddresswatcher.go
@@ -142,7 +142,10 @@ func (w *EgressAddressWatcher) loop() error {
 			}
 			changed = false
 			if !setEquals(addresses, lastAddresses) {
-				addressesCIDR = network.FormatAsCIDR(addresses.Values())
+				addressesCIDR, err = network.FormatAsCIDR(addresses.Values())
+				if err != nil {
+					return errors.Trace(err)
+				}
 				ready = ready || sentInitial
 			}
 		}
diff --git a/apiserver/facades/agent/uniter/uniter.go b/apiserver/facades/agent/uniter/uniter.go
@@ -2114,7 +2114,10 @@ func (u *UniterAPI) NetworkInfo(args params.NetworkInfoParams) (params.NetworkIn
 		// default to the first ingress address. This matches the behaviour when
 		// there's a relation in place.
 		if len(info.EgressSubnets) == 0 && len(info.IngressAddresses) > 0 {
-			info.EgressSubnets = network.FormatAsCIDR([]string{info.IngressAddresses[0]})
+			info.EgressSubnets, err = network.FormatAsCIDR([]string{info.IngressAddresses[0]})
+			if err != nil {
+				return result, errors.Trace(err)
+			}
 		}
 
 		result.Results[binding] = info
diff --git a/network/network.go b/network/network.go
@@ -610,20 +610,23 @@ func SubnetInAnyRange(cidrs []*net.IPNet, subnet *net.IPNet) bool {
 
 // FormatAsCIDR converts the specified IP addresses to
 // a slice of CIDRs.
-func FormatAsCIDR(addresses []string) []string {
+func FormatAsCIDR(addresses []string) ([]string, error) {
 	result := make([]string, len(addresses))
 	for i, a := range addresses {
 		cidr := a
 		// If address is not already a cidr, add a /32 (ipv4) or /128 (ipv6).
 		if _, _, err := net.ParseCIDR(a); err != nil {
-			ip := net.ParseIP(a)
-			if ip.To4() != nil {
-				cidr = a + "/32"
+			address, err := net.ResolveIPAddr("ip", a)
+			if err != nil {
+				return nil, errors.Trace(err)
+			}
+			if address.IP.To4() != nil {
+				cidr = address.String() + "/32"
 			} else {
-				cidr = a + "/128"
+				cidr = address.String() + "/128"
 			}
 		}
 		result[i] = cidr
 	}
-	return result
+	return result, nil
 }
diff --git a/state/relationunit.go b/state/relationunit.go
@@ -586,7 +586,10 @@ func NetworksForRelation(
 
 	// If no egress subnets defined, We default to the ingress address.
 	if len(egress) == 0 && len(ingress) > 0 {
-		egress = network.FormatAsCIDR([]string{ingress[0]})
+		egress, err = network.FormatAsCIDR([]string{ingress[0]})
+		if err != nil {
+			return "", nil, nil, errors.Trace(err)
+		}
 	}
 	return boundSpace, ingress, egress, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,10 @@ func (w *EgressAddressWatcher) loop() error {`
`142`	`142`	`}`
`143`	`143`	`changed = false`
`144`	`144`	`if !setEquals(addresses, lastAddresses) {`
`145`		`- addressesCIDR = network.FormatAsCIDR(addresses.Values())`
	`145`	`+ addressesCIDR, err = network.FormatAsCIDR(addresses.Values())`
	`146`	`+ if err != nil {`
	`147`	`+ return errors.Trace(err)`
	`148`	`+ }`
`146`	`149`	`ready = ready \|\| sentInitial`
`147`	`150`	`}`
`148`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,10 @@ func NetworksForRelation(`
`586`	`586`
`587`	`587`	`// If no egress subnets defined, We default to the ingress address.`
`588`	`588`	`if len(egress) == 0 && len(ingress) > 0 {`
`589`		`- egress = network.FormatAsCIDR([]string{ingress[0]})`
	`589`	`+ egress, err = network.FormatAsCIDR([]string{ingress[0]})`
	`590`	`+ if err != nil {`
	`591`	`+ return "", nil, nil, errors.Trace(err)`
	`592`	`+ }`
`590`	`593`	`}`
`591`	`594`	`return boundSpace, ingress, egress, nil`
`592`	`595`	`}`