netutil: consistently format ipv6 addresses

This formats ipv6 addresses to ensure they can be compared safely

Signed-off-by: kidsan <8798449+Kidsan@users.noreply.github.com>

pkg/netutil/netutil.go

@@ -21,6 +21,7 @@ import (
 	"net/url"
 	"reflect"
 	"sort"
+	"strconv"
 	"time"
 
 	"go.etcd.io/etcd/client/pkg/v3/types"
@@ -103,7 +104,26 @@ func resolveURL(ctx context.Context, lg *zap.Logger, u url.URL) (string, error)
 		)
 		return "", err
 	}
-	if host == "localhost" || net.ParseIP(host) != nil {
+	if net.ParseIP(host) != nil {
+		p, err := strconv.Atoi(u.Port())
+		if err != nil {
+			lg.Warn(
+				"failed to parse URL Port while resolving URL",
+				zap.String("url", u.String()),
+				zap.String("host", u.Host),
+				zap.String("port", u.Port()),
+				zap.Error(err),
+			)
+			return "", err
+
+		}
+		addr := &net.TCPAddr{
+			IP:   net.ParseIP(host),
+			Port: p,
+		}
+		return addr.String(), nil
+	}
+	if host == "localhost" {
 		return "", nil
 	}
 	for ctx.Err() == nil {

pkg/netutil/netutil_test.go

@@ -330,6 +330,11 @@ func TestURLStringsEqual(t *testing.T) {
 			"http://host1:8080",
 			"http://host2:8080",
 		}, errOnResolve},
+		{
+			urlsA:    []string{"https://[2a0c:eb00:0:f7:0e5f:7a4b:72e8:fa3a]:2380"},
+			urlsB:    []string{"https://[2a0c:eb00:0:f7:e5f:7a4b:72e8:fa3a]:2380"},
+			resolver: resolveTCPAddrDefault,
+		},
 	}
 	for idx, c := range cases {
 		t.Logf("TestURLStringsEqual, case #%d", idx)