use net.JoinHostPort to support IPv6 correctly

Author: mattfenwick

pkg/connectivity/probe/job.go

@@ -5,6 +5,8 @@ import (
 	"github.com/mattfenwick/cyclonus/pkg/matcher"
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
+	"net"
+	"strconv"
 )
 
 type Jobs struct {
@@ -51,7 +53,7 @@ func (j *Job) Key() string {
 }
 
 func (j *Job) ToAddress() string {
-	return fmt.Sprintf("%s:%d", j.ToHost, j.ResolvedPort)
+	return net.JoinHostPort(j.ToHost, strconv.Itoa(j.ResolvedPort))
 }
 
 func (j *Job) ClientCommand() []string {

pkg/worker/client.go

@@ -51,7 +51,7 @@ func NewDefaultClient(host string) *Client {
 
 func NewClient(host string, port int) *Client {
 	return &Client{Resty: resty.New().
-		SetHostURL(fmt.Sprintf("%s:%d", host, port)).
+		SetHostURL(net.JoinHostPort(host, strconv.Itoa(port))).
 		//SetDebug(false).
 		SetTimeout(30 * time.Second)}
 }

pkg/worker/model.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
+	"net"
+	"strconv"
 )
 
 type Batch struct {
@@ -44,7 +46,7 @@ type Request struct {
 }
 
 func (r *Request) Address() string {
-	return fmt.Sprintf("%s:%d", r.Host, r.Port)
+	return net.JoinHostPort(r.Host, strconv.Itoa(r.Port))
 }
 
 func (r *Request) Command() []string {