cli: move addrWithDefaultHost to package addr

Release note: None

Author: knz

pkg/cli/rpc_client.go

@@ -12,13 +12,13 @@ package cli
 
 import (
 	"context"
-	"net"
 
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/rpc"
 	"github.com/cockroachdb/cockroach/pkg/server"
 	"github.com/cockroachdb/cockroach/pkg/server/serverpb"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
+	"github.com/cockroachdb/cockroach/pkg/util/netutil/addr"
 	"github.com/cockroachdb/cockroach/pkg/util/stop"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/cockroach/pkg/util/tracing"
@@ -56,7 +56,7 @@ func getClientGRPCConn(
 	if cfg.TestingKnobs.Server != nil {
 		rpcContext.Knobs = cfg.TestingKnobs.Server.(*server.TestingKnobs).ContextTestingKnobs
 	}
-	addr, err := addrWithDefaultHost(cfg.AdvertiseAddr)
+	addr, err := addr.AddrWithDefaultLocalhost(cfg.AdvertiseAddr)
 	if err != nil {
 		stopper.Stop(ctx)
 		return nil, nil, nil, err
@@ -79,17 +79,6 @@ func getClientGRPCConn(
 	return conn, clock, closer, nil
 }
 
-func addrWithDefaultHost(addr string) (string, error) {
-	host, port, err := net.SplitHostPort(addr)
-	if err != nil {
-		return "", err
-	}
-	if host == "" {
-		host = "localhost"
-	}
-	return net.JoinHostPort(host, port), nil
-}
-
 // getAdminClient returns an AdminClient and a closure that must be invoked
 // to free associated resources.
 func getAdminClient(ctx context.Context, cfg server.Config) (serverpb.AdminClient, func(), error) {

pkg/cli/start_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
+	"github.com/cockroachdb/cockroach/pkg/util/netutil/addr"
 	"github.com/cockroachdb/pebble/vfs"
 	"github.com/stretchr/testify/require"
 )
@@ -206,7 +207,7 @@ func TestAddrWithDefaultHost(t *testing.T) {
 	}
 
 	for _, test := range testData {
-		addr, err := addrWithDefaultHost(test.inAddr)
+		addr, err := addr.AddrWithDefaultLocalhost(test.inAddr)
 		if err != nil {
 			t.Error(err)
 		} else if addr != test.outAddr {

pkg/util/netutil/addr/addr.go

@@ -18,6 +18,19 @@ import (
 	"github.com/spf13/pflag"
 )
 
+// AddrWithDefaultLocalhost returns addr with the host set
+// to localhost if it is empty.
+func AddrWithDefaultLocalhost(addr string) (string, error) {
+	host, port, err := net.SplitHostPort(addr)
+	if err != nil {
+		return "", err
+	}
+	if host == "" {
+		host = "localhost"
+	}
+	return net.JoinHostPort(host, port), nil
+}
+
 // SplitHostPort is like net.SplitHostPort however it supports
 // addresses without a port number. In that case, the provided port
 // number is used.