Update registry so version is surfaced

registry/etcd/watcher.go

@@ -11,6 +11,77 @@ type etcdWatcher struct {
 	stop     chan bool
 }
 
+func addNodes(old, neu []*registry.Node) []*registry.Node {
+	for _, n := range neu {
+		var seen bool
+		for i, o := range old {
+			if o.Id == n.Id {
+				seen = true
+				old[i] = n
+				break
+			}
+		}
+		if !seen {
+			old = append(old, n)
+		}
+	}
+	return old
+}
+
+func addServices(old, neu []*registry.Service) []*registry.Service {
+	for _, s := range neu {
+		var seen bool
+		for i, o := range old {
+			if o.Version == s.Version {
+				s.Nodes = addNodes(o.Nodes, s.Nodes)
+				seen = true
+				old[i] = s
+				break
+			}
+		}
+		if !seen {
+			old = append(old, s)
+		}
+	}
+	return old
+}
+
+func delNodes(old, del []*registry.Node) []*registry.Node {
+	var nodes []*registry.Node
+	for _, o := range old {
+		var rem bool
+		for _, n := range del {
+			if o.Id == n.Id {
+				rem = true
+				break
+			}
+		}
+		if !rem {
+			nodes = append(nodes, o)
+		}
+	}
+	return nodes
+}
+
+func delServices(old, del []*registry.Service) []*registry.Service {
+	var services []*registry.Service
+	for i, o := range old {
+		var rem bool
+		for _, s := range del {
+			if o.Version == s.Version {
+				old[i].Nodes = delNodes(o.Nodes, s.Nodes)
+				if len(old[i].Nodes) == 0 {
+					rem = true
+				}
+			}
+		}
+		if !rem {
+			services = append(services, o)
+		}
+	}
+	return services
+}
+
 func newEtcdWatcher(r *etcdRegistry) (registry.Watcher, error) {
 	ew := &etcdWatcher{
 		registry: r,
@@ -53,7 +124,7 @@ func (e *etcdWatcher) watch(ctx context.Context, w etcd.Watcher) {
 		service, ok := e.registry.services[s.Name]
 		if !ok {
 			if rsp.Action == "create" {
-				e.registry.services[s.Name] = s
+				e.registry.services[s.Name] = []*registry.Service{s}
 			}
 			e.registry.Unlock()
 			continue
@@ -61,22 +132,14 @@ func (e *etcdWatcher) watch(ctx context.Context, w etcd.Watcher) {
 
 		switch rsp.Action {
 		case "delete":
-			var nodes []*registry.Node
-			for _, node := range service.Nodes {
-				var seen bool
-				for _, n := range s.Nodes {
-					if node.Id == n.Id {
-						seen = true
-						break
-					}
-				}
-				if !seen {
-					nodes = append(nodes, node)
-				}
+			services := delServices(service, []*registry.Service{s})
+			if len(services) > 0 {
+				e.registry.services[s.Name] = services
+			} else {
+				delete(e.registry.services, s.Name)
 			}
-			service.Nodes = nodes
 		case "create":
-			service.Nodes = append(service.Nodes, s.Nodes...)
+			e.registry.services[s.Name] = addServices(service, []*registry.Service{s})
 		}
 
 		e.registry.Unlock()