move reg util to own package (#1523)

* move reg util to own package

* fix test

* fix broken static router

util/registry/util.go

@@ -0,0 +1,148 @@
+package registry
+
+import (
+	"github.com/micro/go-micro/v2/registry"
+)
+
+func addNodes(old, neu []*registry.Node) []*registry.Node {
+	nodes := make([]*registry.Node, len(neu))
+	// add all new nodes
+	for i, n := range neu {
+		node := *n
+		nodes[i] = &node
+	}
+
+	// look at old nodes
+	for _, o := range old {
+		var exists bool
+
+		// check against new nodes
+		for _, n := range nodes {
+			// ids match then skip
+			if o.Id == n.Id {
+				exists = true
+				break
+			}
+		}
+
+		// keep old node
+		if !exists {
+			node := *o
+			nodes = append(nodes, &node)
+		}
+	}
+
+	return nodes
+}
+
+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
+}
+
+// CopyService make a copy of service
+func CopyService(service *registry.Service) *registry.Service {
+	// copy service
+	s := new(registry.Service)
+	*s = *service
+
+	// copy nodes
+	nodes := make([]*registry.Node, len(service.Nodes))
+	for j, node := range service.Nodes {
+		n := new(registry.Node)
+		*n = *node
+		nodes[j] = n
+	}
+	s.Nodes = nodes
+
+	// copy endpoints
+	eps := make([]*registry.Endpoint, len(service.Endpoints))
+	for j, ep := range service.Endpoints {
+		e := new(registry.Endpoint)
+		*e = *ep
+		eps[j] = e
+	}
+	s.Endpoints = eps
+	return s
+}
+
+// Copy makes a copy of services
+func Copy(current []*registry.Service) []*registry.Service {
+	services := make([]*registry.Service, len(current))
+	for i, service := range current {
+		services[i] = CopyService(service)
+	}
+	return services
+}
+
+// Merge merges two lists of services and returns a new copy
+func Merge(olist []*registry.Service, nlist []*registry.Service) []*registry.Service {
+	var srv []*registry.Service
+
+	for _, n := range nlist {
+		var seen bool
+		for _, o := range olist {
+			if o.Version == n.Version {
+				sp := new(registry.Service)
+				// make copy
+				*sp = *o
+				// set nodes
+				sp.Nodes = addNodes(o.Nodes, n.Nodes)
+
+				// mark as seen
+				seen = true
+				srv = append(srv, sp)
+				break
+			} else {
+				sp := new(registry.Service)
+				// make copy
+				*sp = *o
+				srv = append(srv, sp)
+			}
+		}
+		if !seen {
+			srv = append(srv, Copy([]*registry.Service{n})...)
+		}
+	}
+	return srv
+}
+
+// Remove removes services and returns a new copy
+func Remove(old, del []*registry.Service) []*registry.Service {
+	var services []*registry.Service
+
+	for _, o := range old {
+		srv := new(registry.Service)
+		*srv = *o
+
+		var rem bool
+
+		for _, s := range del {
+			if srv.Version == s.Version {
+				srv.Nodes = delNodes(srv.Nodes, s.Nodes)
+
+				if len(srv.Nodes) == 0 {
+					rem = true
+				}
+			}
+		}
+
+		if !rem {
+			services = append(services, srv)
+		}
+	}
+
+	return services
+}

util/registry/util_test.go

@@ -0,0 +1,78 @@
+package registry
+
+import (
+	"os"
+	"testing"
+
+	"github.com/micro/go-micro/v2/registry"
+)
+
+func TestRemove(t *testing.T) {
+	services := []*registry.Service{
+		{
+			Name:    "foo",
+			Version: "1.0.0",
+			Nodes: []*registry.Node{
+				{
+					Id:      "foo-123",
+					Address: "localhost:9999",
+				},
+			},
+		},
+		{
+			Name:    "foo",
+			Version: "1.0.0",
+			Nodes: []*registry.Node{
+				{
+					Id:      "foo-123",
+					Address: "localhost:6666",
+				},
+			},
+		},
+	}
+
+	servs := Remove([]*registry.Service{services[0]}, []*registry.Service{services[1]})
+	if i := len(servs); i > 0 {
+		t.Errorf("Expected 0 nodes, got %d: %+v", i, servs)
+	}
+	if len(os.Getenv("IN_TRAVIS_CI")) == 0 {
+		t.Logf("Services %+v", servs)
+	}
+}
+
+func TestRemoveNodes(t *testing.T) {
+	services := []*registry.Service{
+		{
+			Name:    "foo",
+			Version: "1.0.0",
+			Nodes: []*registry.Node{
+				{
+					Id:      "foo-123",
+					Address: "localhost:9999",
+				},
+				{
+					Id:      "foo-321",
+					Address: "localhost:6666",
+				},
+			},
+		},
+		{
+			Name:    "foo",
+			Version: "1.0.0",
+			Nodes: []*registry.Node{
+				{
+					Id:      "foo-123",
+					Address: "localhost:6666",
+				},
+			},
+		},
+	}
+
+	nodes := delNodes(services[0].Nodes, services[1].Nodes)
+	if i := len(nodes); i != 1 {
+		t.Errorf("Expected only 1 node, got %d: %+v", i, nodes)
+	}
+	if len(os.Getenv("IN_TRAVIS_CI")) == 0 {
+		t.Logf("Nodes %+v", nodes)
+	}
+}