Use net.JoinHostPort instead of concatenation (knative#4788)

This handles ipv6 addresses correctly.
duglin · Jul 17, 2019 · 936b4b0 · 936b4b0
1 parent bc20336
commit 936b4b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/activator/handler/handler.go b/pkg/activator/handler/handler.go
@@ -19,6 +19,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"net"
 	"net/http"
 	"net/http/httputil"
 	"net/url"
@@ -317,7 +318,7 @@ func (a *activationHandler) serviceHostName(rev *v1alpha1.Revision, serviceName
 
 	// Use the ClusterIP directly to elide DNS lookup, which both adds latency
 	// and hurts reliability when routing through the activator.
-	return svc.Spec.ClusterIP + ":" + strconv.Itoa(port), nil
+	return net.JoinHostPort(svc.Spec.ClusterIP, strconv.Itoa(port)), nil
 }
 
 func sendError(err error, w http.ResponseWriter) {

diff --git a/pkg/queue/health/probe.go b/pkg/queue/health/probe.go
@@ -67,7 +67,7 @@ func HTTPProbe(config HTTPProbeConfigOptions) error {
 	}
 	url := url.URL{
 		Scheme: string(config.Scheme),
-		Host:   config.Host + ":" + config.Port.String(),
+		Host:   net.JoinHostPort(config.Host, config.Port.String()),
 		Path:   config.Path,
 	}
 	req, err := http.NewRequest(http.MethodGet, url.String(), nil)