Parses consul address, if address is ipv6 adds []

consul/cache.go

@@ -2,6 +2,7 @@ package consul
 
 import (
 	"fmt"
+	"net"
 	"strings"
 
 	"github.com/CiscoCloud/mesos-consul/registry"
@@ -17,8 +18,22 @@ type cacheEntry struct {
 }
 
 func newCacheEntry(service *consulapi.AgentServiceRegistration, agent string) *cacheEntry {
+
+	// test if address is an ip
+	agentAddress := agent
+	ip := net.ParseIP(agentAddress)
+	if ip != nil {
+		ipv4 := ip.To4()
+		log.Debugf("agentAddress is an ip address %s", agentAddress)
+		// if not an ipv4 address assume ipv6 and add [ ] to address
+		if ipv4 == nil {
+			agentAddress = fmt.Sprintf("[%s]", agentAddress)
+			log.Debugf("agentAddress is ipv6 address %s", agentAddress)
+		}
+	}
+
 	return &cacheEntry{
-		agent:           agent,
+		agent:           agentAddress,
 		service:         service,
 		validityCounter: 0,
 	}

consul/consul.go

@@ -4,11 +4,11 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
+	"net"
 	"net/http"
 	"time"
 
-	"github.com/CiscoCloud/mesos-consul/registry"
+	"github.com/mantl/mesos-consul/registry"
 
 	consulapi "github.com/hashicorp/consul/api"
 	log "github.com/sirupsen/logrus"
@@ -53,8 +53,21 @@ func (c *Consul) newAgent(address string) *consulapi.Client {
 	}
 
 	config := consulapi.DefaultConfig()
+	agentAddress := address
+
+	// test if address is an ip
+	ip := net.ParseIP(agentAddress)
+	if ip != nil {
+		ipv4 := ip.To4()
+		log.Debugf("agentAddress is an ip address %s", agentAddress)
+		// if not an ipv4 address assume ipv6 and add [ ] to address
+		if ipv4 == nil {
+			agentAddress = fmt.Sprintf("[%s]", agentAddress)
+			log.Debugf("agentAddress is ipv6 address %s", agentAddress)
+		}
+	}
 
-	config.Address = fmt.Sprintf("%s:%s", address, c.config.port)
+	config.Address = fmt.Sprintf("%s:%s", agentAddress, c.config.port)
 	log.Debugf("consul address: %s", config.Address)
 
 	config.HttpClient.Timeout = time.Duration(c.config.timeout) * time.Second