Use net.JoinHostPort

Author: ycombinator

heartbeat/hbtest/hbtestutil.go

@@ -213,7 +213,7 @@ func ResolveChecks(ip string) validator.Validator {
 func SimpleURLChecks(t *testing.T, scheme string, host string, port uint16) validator.Validator {
 	hostPort := host
 	if port != 0 {
-		hostPort = fmt.Sprintf("%s:%d", host, port)
+		hostPort = net.JoinHostPort(host, strconv.Itoa(int(port)))
 	}
 
 	u, err := url.Parse(fmt.Sprintf("%s://%s", scheme, hostPort))

heartbeat/monitors/active/http/http_test.go

@@ -32,6 +32,7 @@ import (
 	"os"
 	"path"
 	"reflect"
+	"strconv"
 	"sync"
 	"testing"
 	"time"
@@ -620,7 +621,7 @@ func TestConnRefusedJob(t *testing.T) {
 		lookslike.Strict(lookslike.Compose(
 			hbtest.BaseChecks(ip, "down", "http"),
 			hbtest.SummaryStateChecks(0, 1),
-			hbtest.ECSErrCodeChecks(ecserr.CODE_NET_COULD_NOT_CONNECT, fmt.Sprintf("%s:%d", ip, port)),
+			hbtest.ECSErrCodeChecks(ecserr.CODE_NET_COULD_NOT_CONNECT, net.JoinHostPort(ip, strconv.Itoa(int(port)))),
 			urlChecks(url),
 		)),
 		event.Fields,
@@ -642,7 +643,7 @@ func TestUnreachableJob(t *testing.T) {
 		lookslike.Strict(lookslike.Compose(
 			hbtest.BaseChecks(ip, "down", "http"),
 			hbtest.SummaryStateChecks(0, 1),
-			hbtest.ECSErrCodeChecks(ecserr.CODE_NET_COULD_NOT_CONNECT, fmt.Sprintf("%s:%d", ip, port)),
+			hbtest.ECSErrCodeChecks(ecserr.CODE_NET_COULD_NOT_CONNECT, net.JoinHostPort(ip, strconv.Itoa(int(port)))),
 			urlChecks(url),
 		)),
 		event.Fields,

libbeat/processors/add_kubernetes_metadata/indexers.go

@@ -19,6 +19,8 @@ package add_kubernetes_metadata
 
 import (
 	"fmt"
+	"net"
+	"strconv"
 
 	"github.com/elastic/elastic-agent-autodiscover/kubernetes"
 	"github.com/elastic/elastic-agent-autodiscover/kubernetes/metadata"
@@ -255,7 +257,7 @@ func (h *IPPortIndexer) GetMetadata(pod *kubernetes.Pod) []MetadataIndex {
 			if port.ContainerPort != 0 {
 
 				m = append(m, MetadataIndex{
-					Index: fmt.Sprintf("%s:%d", pod.Status.PodIP, port.ContainerPort),
+					Index: net.JoinHostPort(pod.Status.PodIP, strconv.Itoa(int(port.ContainerPort))),
 					Data: h.metaGen.Generate(
 						pod,
 						metadata.WithFields("container.name", container.Name),
@@ -287,7 +289,7 @@ func (h *IPPortIndexer) GetIndexes(pod *kubernetes.Pod) []string {
 
 		for _, port := range ports {
 			if port.ContainerPort != 0 {
-				hostPorts = append(hostPorts, fmt.Sprintf("%s:%d", pod.Status.PodIP, port.ContainerPort))
+				hostPorts = append(hostPorts, net.JoinHostPort(pod.Status.PodIP, strconv.Itoa(int(port.ContainerPort))))
 			}
 		}
 	}

libbeat/processors/add_kubernetes_metadata/indexers_test.go

@@ -19,6 +19,8 @@ package add_kubernetes_metadata
 
 import (
 	"fmt"
+	"net"
+	"strconv"
 	"testing"
 
 	"github.com/elastic/elastic-agent-autodiscover/kubernetes"
@@ -468,12 +470,12 @@ func TestIpPortIndexer(t *testing.T) {
 	indexers = ipIndexer.GetMetadata(&pod)
 	assert.Equal(t, 2, len(indexers))
 	assert.Equal(t, ip, indexers[0].Index)
-	assert.Equal(t, fmt.Sprintf("%s:%d", ip, port), indexers[1].Index)
+	assert.Equal(t, net.JoinHostPort(ip, strconv.Itoa(int(port))), indexers[1].Index)
 
 	indices = ipIndexer.GetIndexes(&pod)
 	assert.Equal(t, 2, len(indices))
 	assert.Equal(t, ip, indices[0])
-	assert.Equal(t, fmt.Sprintf("%s:%d", ip, port), indices[1])
+	assert.Equal(t, net.JoinHostPort(ip, strconv.Itoa(int(port))), indices[1])
 
 	assert.Equal(t, expected.String(), indexers[0].Data.String())
 	expected.Put("kubernetes.container",

metricbeat/helper/server/tcp/tcp_test.go

@@ -20,8 +20,8 @@
 package tcp
 
 import (
-	"fmt"
 	"net"
+	"strconv"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -31,7 +31,7 @@ import (
 )
 
 func GetTestTcpServer(host string, port int) (server.Server, error) {
-	addr, err := net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", host, port))
+	addr, err := net.ResolveTCPAddr("tcp", net.JoinHostPort(host, strconv.Itoa(int(port))))
 
 	if err != nil {
 		return nil, err
@@ -80,7 +80,7 @@ func TestTcpServer(t *testing.T) {
 }
 
 func writeToServer(t *testing.T, message, host string, port int) {
-	servAddr := fmt.Sprintf("%s:%d", host, port)
+	servAddr := net.JoinHostPort(host, strconv.Itoa(int(port)))
 	tcpAddr, err := net.ResolveTCPAddr("tcp", servAddr)
 	if err != nil {
 		t.Error(err)

metricbeat/helper/server/udp/udp_test.go

@@ -20,8 +20,8 @@
 package udp
 
 import (
-	"fmt"
 	"net"
+	"strconv"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -31,7 +31,7 @@ import (
 )
 
 func GetTestUdpServer(host string, port int) (server.Server, error) {
-	addr, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", host, port))
+	addr, err := net.ResolveUDPAddr("udp", net.JoinHostPort(host, strconv.Itoa(int(port))))
 
 	if err != nil {
 		return nil, err
@@ -78,7 +78,7 @@ func TestUdpServer(t *testing.T) {
 }
 
 func writeToServer(t *testing.T, message, host string, port int) {
-	servAddr := fmt.Sprintf("%s:%d", host, port)
+	servAddr := net.JoinHostPort(host, strconv.Itoa(int(port)))
 	conn, err := net.Dial("udp", servAddr)
 	if err != nil {
 		t.Error(err)

x-pack/metricbeat/module/airflow/statsd/data_test.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"net"
 	"runtime"
+	"strconv"
 	"sync"
 	"testing"
 
@@ -43,7 +44,7 @@ func getConfig() map[string]interface{} {
 }
 
 func createEvent(data string, t *testing.T) {
-	udpAddr, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", STATSD_HOST, STATSD_PORT))
+	udpAddr, err := net.ResolveUDPAddr("udp", net.JoinHostPort(STATSD_HOST, strconv.Itoa(int(STATSD_PORT))))
 	require.NoError(t, err)
 
 	conn, err := net.DialUDP("udp", nil, udpAddr)