Remove Port from registry

client/selector/common_test.go

@@ -14,13 +14,11 @@ var (
 				Nodes: []*registry.Node{
 					{
 						Id:      "foo-1.0.0-123",
-						Address: "localhost",
-						Port:    9999,
+						Address: "localhost:9999",
 					},
 					{
 						Id:      "foo-1.0.0-321",
-						Address: "localhost",
-						Port:    9999,
+						Address: "localhost:9999",
 					},
 				},
 			},
@@ -30,8 +28,7 @@ var (
 				Nodes: []*registry.Node{
 					{
 						Id:      "foo-1.0.1-321",
-						Address: "localhost",
-						Port:    6666,
+						Address: "localhost:6666",
 					},
 				},
 			},
@@ -41,8 +38,7 @@ var (
 				Nodes: []*registry.Node{
 					{
 						Id:      "foo-1.0.3-345",
-						Address: "localhost",
-						Port:    8888,
+						Address: "localhost:8888",
 					},
 				},
 			},

client/selector/dns/dns.go

@@ -2,6 +2,7 @@
 package dns
 
 import (
+	"fmt"
 	"net"
 	"strconv"
 
@@ -66,8 +67,7 @@ func (d *dnsSelector) Select(service string, opts ...selector.SelectOption) (sel
 	for _, node := range srv {
 		nodes = append(nodes, &registry.Node{
 			Id:      node.Target,
-			Address: node.Target,
-			Port:    int(node.Port),
+			Address: fmt.Sprintf("%s:%d", node.Target, node.Port),
 		})
 	}
 

client/selector/router/router.go

@@ -3,11 +3,8 @@ package router
 
 import (
 	"context"
-	"fmt"
-	"net"
 	"os"
 	"sort"
-	"strconv"
 	"sync"
 
 	"github.com/micro/go-micro/client"
@@ -67,11 +64,7 @@ func (r *routerSelector) getRoutes(service string) ([]router.Route, error) {
 
 		for _, service := range services {
 			for _, node := range service.Nodes {
-				addr := node.Address
-				if node.Port > 0 {
-					addr = fmt.Sprintf("%s:%d", node.Address, node.Port)
-				}
-				addrs = append(addrs, addr)
+				addrs = append(addrs, node.Address)
 			}
 		}
 	}
@@ -168,23 +161,11 @@ func (r *routerSelector) Select(service string, opts ...selector.SelectOption) (
 
 		// defaults to gateway and no port
 		address := route.Gateway
-		port := 0
-
-		// check if its host:port
-		host, pr, err := net.SplitHostPort(address)
-		if err == nil {
-			pp, _ := strconv.Atoi(pr)
-			// set port
-			port = pp
-			// set address
-			address = host
-		}
 
 		// return as a node
 		return &registry.Node{
 			// TODO: add id and metadata if we can
 			Address: address,
-			Port:    port,
 		}, nil
 	}, nil
 }

client/selector/static/static.go

@@ -2,9 +2,6 @@
 package static
 
 import (
-	"net"
-	"strconv"
-
 	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/registry"
 )
@@ -26,20 +23,10 @@ func (s *staticSelector) Options() selector.Options {
 }
 
 func (s *staticSelector) Select(service string, opts ...selector.SelectOption) (selector.Next, error) {
-	var port int
-	addr, pt, err := net.SplitHostPort(service)
-	if err != nil {
-		addr = service
-		port = 0
-	} else {
-		port, _ = strconv.Atoi(pt)
-	}
-
 	return func() (*registry.Node, error) {
 		return &registry.Node{
 			Id:      service,
-			Address: addr,
-			Port:    port,
+			Address: service,
 		}, nil
 	}, nil
 }

client/selector/strategy_test.go

@@ -14,13 +14,11 @@ func TestStrategies(t *testing.T) {
 			Nodes: []*registry.Node{
 				&registry.Node{
 					Id:      "test1-1",
-					Address: "10.0.0.1",
-					Port:    1001,
+					Address: "10.0.0.1:1001",
 				},
 				&registry.Node{
 					Id:      "test1-2",
-					Address: "10.0.0.2",
-					Port:    1002,
+					Address: "10.0.0.2:1002",
 				},
 			},
 		},
@@ -30,13 +28,11 @@ func TestStrategies(t *testing.T) {
 			Nodes: []*registry.Node{
 				&registry.Node{
 					Id:      "test1-3",
-					Address: "10.0.0.3",
-					Port:    1003,
+					Address: "10.0.0.3:1003",
 				},
 				&registry.Node{
 					Id:      "test1-4",
-					Address: "10.0.0.4",
-					Port:    1004,
+					Address: "10.0.0.4:1004",
 				},
 			},
 		},