[release-1.5] fix: use JoinHostPort (#4646)

* fix: use JoinHostPort (#4636)

Signed-off-by: zirain <zirain2009@gmail.com>

* Update conformance/tests/gateway-invalid-default-frontend-client-certificate-validation.go

Co-authored-by: Mike Morris <mikemorris@users.noreply.github.com>

---------

Signed-off-by: zirain <zirain2009@gmail.com>
Co-authored-by: Mike Morris <mikemorris@users.noreply.github.com>

Author: zirain

conformance/tests/gateway-invalid-default-frontend-client-certificate-validation.go

@@ -85,7 +85,7 @@ var GatewayFrontendInvalidDefaultClientCertificateValidation = suite.Conformance
 			}
 			kubernetes.GatewayListenerMustHaveConditions(t, suite.Client, suite.TimeoutConfig, gwNN, "http", expectedConditions)
 
-			httpAddr := gwAddr + ":80"
+			httpAddr := net.JoinHostPort(gwAddr, "80")
 			expectedSuccess := http.ExpectedResponse{
 				Request:   http.Request{Host: "example.org", Path: "/"},
 				Response:  http.Response{StatusCode: 200},
@@ -116,7 +116,7 @@ var GatewayFrontendInvalidDefaultClientCertificateValidation = suite.Conformance
 			}
 			kubernetes.GatewayListenerMustHaveConditions(t, suite.Client, suite.TimeoutConfig, gwNN, "https", expectedConditions)
 
-			httpsAddr := gwAddr + ":443"
+			httpsAddr := net.JoinHostPort(gwAddr, "443")
 			expectedFailure := http.ExpectedResponse{
 				Request:   http.Request{Host: "example.org", Path: "/"},
 				Namespace: "gateway-conformance-infra",

conformance/tests/gateway-with-clientcertificate-validation-insecure-fallback.go

@@ -17,6 +17,7 @@ limitations under the License.
 package tests
 
 import (
+	"net"
 	"testing"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -89,7 +90,7 @@ var GatewayFrontendClientCertificateValidationInsecureFallback = suite.Conforman
 		}
 
 		t.Run("Validate default TLS configuration", func(t *testing.T) {
-			defaultAddr := gwAddr + ":443"
+			defaultAddr := net.JoinHostPort(gwAddr, "443")
 
 			expectedSuccess := http.ExpectedResponse{
 				Request:   http.Request{Host: "example.org", Path: "/"},
@@ -110,7 +111,7 @@ var GatewayFrontendClientCertificateValidationInsecureFallback = suite.Conforman
 		})
 
 		t.Run("Validate per port TLS configuration", func(t *testing.T) {
-			perPortAddr := gwAddr + ":8443"
+			perPortAddr := net.JoinHostPort(gwAddr, "8443")
 
 			expectedSucces := http.ExpectedResponse{
 				Request:   http.Request{Host: "second-example.org", Path: "/"},

conformance/tests/gateway-with-clientcertificate-validation.go

@@ -17,6 +17,7 @@ limitations under the License.
 package tests
 
 import (
+	"net"
 	"testing"
 
 	"k8s.io/apimachinery/pkg/types"
@@ -79,7 +80,7 @@ var GatewayFrontendClientCertificateValidation = suite.ConformanceTest{
 		}
 
 		t.Run("Validate default configuration", func(t *testing.T) {
-			defaultAddr := gwAddr + ":443"
+			defaultAddr := net.JoinHostPort(gwAddr, "443")
 
 			// Send request to the first listener and validate that it is passing
 			expectedSuccess := http.ExpectedResponse{
@@ -99,7 +100,7 @@ var GatewayFrontendClientCertificateValidation = suite.ConformanceTest{
 		})
 
 		t.Run("Validate per port configuration", func(t *testing.T) {
-			perPortAddr := gwAddr + ":8443"
+			perPortAddr := net.JoinHostPort(gwAddr, "8443")
 
 			// Send request to the second listener and validate that it is passing
 			expectedSucces := http.ExpectedResponse{