From e9dcff49e087d2912053ddde06e79545edfb39f7 Mon Sep 17 00:00:00 2001
From: Asim Aslam <asim@aslam.me>
Date: Mon, 7 Oct 2019 16:11:52 +0100
Subject: [PATCH] Support listing full service info in etcd

---
 registry/etcd/etcd.go | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/registry/etcd/etcd.go b/registry/etcd/etcd.go
index 73415530..9f01de8d 100644
--- a/registry/etcd/etcd.go
+++ b/registry/etcd/etcd.go
@@ -349,7 +349,7 @@ func (e *etcdRegistry) GetService(name string) ([]*registry.Service, error) {
 
 func (e *etcdRegistry) ListServices() ([]*registry.Service, error) {
 	var services []*registry.Service
-	nameSet := make(map[string]struct{})
+	versions := make(map[string]*registry.Service)
 
 	ctx, cancel := context.WithTimeout(context.Background(), e.options.Timeout)
 	defer cancel()
@@ -364,13 +364,20 @@ func (e *etcdRegistry) ListServices() ([]*registry.Service, error) {
 	}
 
 	for _, n := range rsp.Kvs {
-		if sn := decode(n.Value); sn != nil {
-			nameSet[sn.Name] = struct{}{}
+		sn := decode(n.Value)
+		if sn == nil {
+			continue
 		}
+		v, ok := versions[sn.Name+sn.Version]
+		if !ok {
+			versions[sn.Name+sn.Version] = sn
+			continue
+		}
+		// append to service:version nodes
+		v.Nodes = append(v.Nodes, sn.Nodes...)
 	}
-	for k := range nameSet {
-		service := &registry.Service{}
-		service.Name = k
+
+	for _, service := range versions {
 		services = append(services, service)
 	}