Merge pull request #2272 from johnstep/transparent-network-resiliency

Flavio Crisciani · web-flow · commit 6ec8e4591bb5 · 2018-09-27T14:46:44.000-07:00
Do not fail with an empty transparent IPv4 address
diff --git a/drivers/windows/windows_store.go b/drivers/windows/windows_store.go
@@ -261,7 +261,7 @@ func (ep *hnsEndpoint) UnmarshalJSON(b []byte) error {
 	}
 	if v, ok := epMap["Addr"]; ok {
 		if ep.addr, err = types.ParseCIDR(v.(string)); err != nil {
-			return types.InternalErrorf("failed to decode endpoint IPv4 address (%s) after json unmarshal: %v", v.(string), err)
+			logrus.Warnf("failed to decode endpoint IPv4 address (%s) after json unmarshal: %v", v.(string), err)
 		}
 	}
 	if v, ok := epMap["gateway"]; ok {

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ func (ep *hnsEndpoint) UnmarshalJSON(b []byte) error {`
`261`	`261`	`}`
`262`	`262`	`if v, ok := epMap["Addr"]; ok {`
`263`	`263`	`if ep.addr, err = types.ParseCIDR(v.(string)); err != nil {`
`264`		`- return types.InternalErrorf("failed to decode endpoint IPv4 address (%s) after json unmarshal: %v", v.(string), err)`
	`264`	`+ logrus.Warnf("failed to decode endpoint IPv4 address (%s) after json unmarshal: %v", v.(string), err)`
`265`	`265`	`}`
`266`	`266`	`}`
`267`	`267`	`if v, ok := epMap["gateway"]; ok {`