Add a String() method to vcl.Address.

pkg/varnish/varnish.go

@@ -40,7 +40,6 @@ import (
 	"os"
 	"reflect"
 	"regexp"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -451,7 +450,7 @@ func (vc *Controller) updateVarnishSvcAddrs(key string, addrs []vcl.Address,
 	updateAddrs := make(map[string]struct{})
 	prevAddrs := make(map[string]*varnishInst)
 	for _, addr := range addrs {
-		key := addr.IP + ":" + strconv.Itoa(int(addr.Port))
+		key := addr.String()
 		updateAddrs[key] = struct{}{}
 	}
 	for _, inst := range svc.instances {
@@ -532,7 +531,7 @@ func (vc *Controller) AddOrUpdateVarnishSvc(key string, addrs []vcl.Address,
 		var instances []*varnishInst
 		svc = &varnishSvc{}
 		for _, addr := range addrs {
-			admAddr := addr.IP + ":" + strconv.Itoa(int(addr.Port))
+			admAddr := addr.String()
 			instance := &varnishInst{
 				addr:   admAddr,
 				admMtx: &sync.Mutex{},
@@ -717,7 +716,7 @@ func (vc *Controller) HasConfig(svcKey string, addrs []vcl.Address,
 	}
 	newAddrs := make(map[string]struct{})
 	for _, addr := range addrs {
-		a := addr.IP + ":" + strconv.Itoa(int(addr.Port))
+		a := addr.String()
 		newAddrs[a] = struct{}{}
 	}
 	curAddrs := make(map[string]struct{})

pkg/varnish/varnish_test.go

@@ -30,7 +30,6 @@ package varnish
 
 import (
 	"fmt"
-	"strconv"
 	"strings"
 	"testing"
 
@@ -220,9 +219,7 @@ func TestHasConfig(t *testing.T) {
 	}
 	instances := make([]*varnishInst, len(svcAddrs))
 	for i, addr := range svcAddrs {
-		instances[i] = &varnishInst{
-			addr: addr.IP + ":" + strconv.Itoa(int(addr.Port)),
-		}
+		instances[i] = &varnishInst{addr: addr.String()}
 	}
 	vSvc := varnishSvc{
 		spec:      &spec,

pkg/varnish/vcl/spec.go

@@ -35,6 +35,7 @@ import (
 	"math"
 	"math/big"
 	"sort"
+	"strconv"
 )
 
 func hashUint16(u16 uint16, hash hash.Hash) {
@@ -51,6 +52,10 @@ type Address struct {
 	Port int32
 }
 
+func (addr Address) String() string {
+	return addr.IP + ":" + strconv.Itoa(int(addr.Port))
+}
+
 func (addr Address) hash(hash hash.Hash) {
 	portBytes := make([]byte, 4)
 	binary.BigEndian.PutUint32(portBytes, uint32(addr.Port))