move reg util to own package (#1523)

* move reg util to own package

* fix test

* fix broken static router

registry/cache/cache.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/micro/go-micro/v2/logger"
 	"github.com/micro/go-micro/v2/registry"
+	util "github.com/micro/go-micro/v2/util/registry"
 )
 
 // Cache is the registry cache interface
@@ -119,7 +120,7 @@ func (c *cache) get(service string) ([]*registry.Service, error) {
 	// get cache ttl
 	ttl := c.ttls[service]
 	// make a copy
-	cp := registry.Copy(services)
+	cp := util.Copy(services)
 
 	// got services && within ttl so return cache
 	if c.isValid(cp, ttl) {
@@ -152,7 +153,7 @@ func (c *cache) get(service string) ([]*registry.Service, error) {
 
 		// cache results
 		c.Lock()
-		c.set(service, registry.Copy(services))
+		c.set(service, util.Copy(services))
 		c.Unlock()
 
 		return services, nil

registry/util.go

@@ -1,144 +0,0 @@
-package registry
-
-func addNodes(old, neu []*Node) []*Node {
-	nodes := make([]*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 []*Node) []*Node {
-	var nodes []*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 *Service) *Service {
-	// copy service
-	s := new(Service)
-	*s = *service
-
-	// copy nodes
-	nodes := make([]*Node, len(service.Nodes))
-	for j, node := range service.Nodes {
-		n := new(Node)
-		*n = *node
-		nodes[j] = n
-	}
-	s.Nodes = nodes
-
-	// copy endpoints
-	eps := make([]*Endpoint, len(service.Endpoints))
-	for j, ep := range service.Endpoints {
-		e := new(Endpoint)
-		*e = *ep
-		eps[j] = e
-	}
-	s.Endpoints = eps
-	return s
-}
-
-// Copy makes a copy of services
-func Copy(current []*Service) []*Service {
-	services := make([]*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 []*Service, nlist []*Service) []*Service {
-	var srv []*Service
-
-	for _, n := range nlist {
-		var seen bool
-		for _, o := range olist {
-			if o.Version == n.Version {
-				sp := new(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(Service)
-				// make copy
-				*sp = *o
-				srv = append(srv, sp)
-			}
-		}
-		if !seen {
-			srv = append(srv, Copy([]*Service{n})...)
-		}
-	}
-	return srv
-}
-
-// Remove removes services and returns a new copy
-func Remove(old, del []*Service) []*Service {
-	var services []*Service
-
-	for _, o := range old {
-		srv := new(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
-}

registry/util_test.go

@@ -1,76 +0,0 @@
-package registry
-
-import (
-	"os"
-	"testing"
-)
-
-func TestRemove(t *testing.T) {
-	services := []*Service{
-		{
-			Name:    "foo",
-			Version: "1.0.0",
-			Nodes: []*Node{
-				{
-					Id:      "foo-123",
-					Address: "localhost:9999",
-				},
-			},
-		},
-		{
-			Name:    "foo",
-			Version: "1.0.0",
-			Nodes: []*Node{
-				{
-					Id:      "foo-123",
-					Address: "localhost:6666",
-				},
-			},
-		},
-	}
-
-	servs := Remove([]*Service{services[0]}, []*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 := []*Service{
-		{
-			Name:    "foo",
-			Version: "1.0.0",
-			Nodes: []*Node{
-				{
-					Id:      "foo-123",
-					Address: "localhost:9999",
-				},
-				{
-					Id:      "foo-321",
-					Address: "localhost:6666",
-				},
-			},
-		},
-		{
-			Name:    "foo",
-			Version: "1.0.0",
-			Nodes: []*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)
-	}
-}