hanzo/pubsub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hostport lint errors

Browse Source 
Signed-off-by: Neil Twigg <neil@nats.io>
This commit is contained in:
Neil Twigg
2026-02-22 00:55:09 -08:00
committed by Zach Kelling
parent 73a4599828
commit 4a71aba1e3
13 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/auth_test.go
+2 -2
View File
@@ -369,7 +369,7 @@ func TestNoAuthUserNoConnectProto(t *testing.T) {
}
}
conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", o.Host, o.Port))
conn, err := net.Dial("tcp", net.JoinHostPort(o.Host, fmt.Sprintf("%d", o.Port)))
require_NoError(t, err)
defer conn.Close()
checkClientsCount(t, s, 1)
@@ -382,7 +382,7 @@ func TestNoAuthUserNoConnectProto(t *testing.T) {
conn.Close()
// Now make sure we still do get timed out though.
conn, err = net.Dial("tcp", fmt.Sprintf("%s:%d", o.Host, o.Port))
conn, err = net.Dial("tcp", net.JoinHostPort(o.Host, fmt.Sprintf("%d", o.Port)))
require_NoError(t, err)
defer conn.Close()
checkClientsCount(t, s, 1)
server/client_test.go
+3 -3
View File
@@ -1264,7 +1264,7 @@ func TestAuthorizationTimeout(t *testing.T) {
s := RunServer(serverOptions)
defer s.Shutdown()
conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", serverOptions.Host, serverOptions.Port))
conn, err := net.Dial("tcp", net.JoinHostPort(serverOptions.Host, fmt.Sprintf("%d", serverOptions.Port)))
if err != nil {
t.Fatalf("Error dialing server: %v\n", err)
}
@@ -1358,7 +1358,7 @@ func TestClientCloseTLSConnection(t *testing.T) {
s := RunServer(opts)
defer s.Shutdown()
endpoint := fmt.Sprintf("%s:%d", opts.Host, opts.Port)
endpoint := net.JoinHostPort(opts.Host, fmt.Sprintf("%d", opts.Port))
conn, err := net.DialTimeout("tcp", endpoint, 2*time.Second)
if err != nil {
t.Fatalf("Unexpected error on dial: %v", err)
@@ -2183,7 +2183,7 @@ func TestNoClientLeakOnSlowConsumer(t *testing.T) {
s := RunServer(opts)
defer s.Shutdown()
c, err := net.Dial("tcp", fmt.Sprintf("%s:%d", opts.Host, opts.Port))
c, err := net.Dial("tcp", net.JoinHostPort(opts.Host, fmt.Sprintf("%d", opts.Port)))
if err != nil {
t.Fatalf("Error connecting: %v", err)
}
server/closed_conns_test.go
+2 -2
View File
@@ -147,7 +147,7 @@ func TestClosedAuthorizationTimeout(t *testing.T) {
s := RunServer(serverOptions)
defer s.Shutdown()
conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", serverOptions.Host, serverOptions.Port))
conn, err := net.Dial("tcp", net.JoinHostPort(serverOptions.Host, fmt.Sprintf("%d", serverOptions.Port)))
if err != nil {
t.Fatalf("Error dialing server: %v\n", err)
}
@@ -224,7 +224,7 @@ func TestClosedMaxPayload(t *testing.T) {
defer s.Shutdown()
opts := s.getOpts()
endpoint := fmt.Sprintf("%s:%d", opts.Host, opts.Port)
endpoint := net.JoinHostPort(opts.Host, fmt.Sprintf("%d", opts.Port))
conn, err := net.DialTimeout("tcp", endpoint, time.Second)
if err != nil {
server/gateway_test.go
+3 -3
View File
@@ -518,7 +518,7 @@ func TestGatewayHeaderInfo(t *testing.T) {
s := runGatewayServer(o)
defer s.Shutdown()
gwconn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", o.Gateway.Host, o.Gateway.Port))
gwconn, err := net.Dial("tcp", net.JoinHostPort(o.Gateway.Host, fmt.Sprintf("%d", o.Gateway.Port)))
if err != nil {
t.Fatalf("Error dialing server: %v\n", err)
}
@@ -544,7 +544,7 @@ func TestGatewayHeaderInfo(t *testing.T) {
s = runGatewayServer(o)
defer s.Shutdown()
gwconn, err = net.Dial("tcp", fmt.Sprintf("%s:%d", o.Gateway.Host, o.Gateway.Port))
gwconn, err = net.Dial("tcp", net.JoinHostPort(o.Gateway.Host, fmt.Sprintf("%d", o.Gateway.Port)))
if err != nil {
t.Fatalf("Error dialing server: %v\n", err)
}
@@ -6208,7 +6208,7 @@ func TestGatewayCloseTLSConnection(t *testing.T) {
waitForOutboundGateways(t, sb1, 1, 2*time.Second)
waitForInboundGateways(t, sb1, 1, 2*time.Second)
endpoint := fmt.Sprintf("%s:%d", oa.Gateway.Host, oa.Gateway.Port)
endpoint := net.JoinHostPort(oa.Gateway.Host, fmt.Sprintf("%d", oa.Gateway.Port))
conn, err := net.DialTimeout("tcp", endpoint, 2*time.Second)
if err != nil {
t.Fatalf("Unexpected error on dial: %v", err)
server/leafnode_test.go
+1 -1
View File
@@ -986,7 +986,7 @@ func TestLeafNodeCloseTLSConnection(t *testing.T) {
s := RunServer(opts)
defer s.Shutdown()
endpoint := fmt.Sprintf("%s:%d", opts.LeafNode.Host, opts.LeafNode.Port)
endpoint := net.JoinHostPort(opts.LeafNode.Host, fmt.Sprintf("%d", opts.LeafNode.Port))
conn, err := net.DialTimeout("tcp", endpoint, 2*time.Second)
if err != nil {
t.Fatalf("Unexpected error on dial: %v", err)
server/monitor_test.go
+3 -3
View File
@@ -2008,7 +2008,7 @@ func TestMonitorConnzClosedConnsBadClient(t *testing.T) {
opts := s.getOpts()
rc, err := net.Dial("tcp", fmt.Sprintf("%s:%d", opts.Host, opts.Port))
rc, err := net.Dial("tcp", net.JoinHostPort(opts.Host, fmt.Sprintf("%d", opts.Port)))
if err != nil {
t.Fatalf("Error on dial: %v", err)
}
@@ -2057,7 +2057,7 @@ func TestMonitorConnzClosedConnsBadTLSClient(t *testing.T) {
opts = s.getOpts()
rc, err := net.Dial("tcp", fmt.Sprintf("%s:%d", opts.Host, opts.Port))
rc, err := net.Dial("tcp", net.JoinHostPort(opts.Host, fmt.Sprintf("%d", opts.Port)))
if err != nil {
t.Fatalf("Error on dial: %v", err)
}
@@ -2267,7 +2267,7 @@ func TestMonitorConnzTLSInHandshake(t *testing.T) {
defer s.Shutdown()
// Create bare TCP connection to delay client TLS handshake
c, err := net.Dial("tcp", fmt.Sprintf("%s:%d", opts.Host, opts.Port))
c, err := net.Dial("tcp", net.JoinHostPort(opts.Host, fmt.Sprintf("%d", opts.Port)))
if err != nil {
t.Fatalf("Error on dial: %v", err)
}
server/mqtt_test.go
+9 -9
View File
@@ -669,7 +669,7 @@ func TestMQTTStart(t *testing.T) {
s := testMQTTRunServer(t, o)
defer testMQTTShutdownServer(s)
nc, err := net.Dial("tcp", fmt.Sprintf("%s:%d", o.MQTT.Host, o.MQTT.Port))
nc, err := net.Dial("tcp", net.JoinHostPort(o.MQTT.Host, fmt.Sprintf("%d", o.MQTT.Port)))
if err != nil {
t.Fatalf("Unable to create tcp connection to mqtt port: %v", err)
}
@@ -749,7 +749,7 @@ func TestMQTTTLS(t *testing.T) {
s = testMQTTRunServer(t, o)
defer testMQTTShutdownServer(s)
nc, err := net.Dial("tcp", fmt.Sprintf("%s:%d", o.MQTT.Host, o.MQTT.Port))
nc, err := net.Dial("tcp", net.JoinHostPort(o.MQTT.Host, fmt.Sprintf("%d", o.MQTT.Port)))
if err != nil {
t.Fatalf("Unable to create tcp connection to mqtt port: %v", err)
}
@@ -850,7 +850,7 @@ func testMQTTConnectRetryWithError(t testing.TB, ci *mqttConnInfo, host string,
return true
}
addr := fmt.Sprintf("%s:%d", host, port)
addr := net.JoinHostPort(host, fmt.Sprintf("%d", port))
var c net.Conn
var err error
RETRY:
@@ -1009,7 +1009,7 @@ func TestMQTTRequiresJSEnabled(t *testing.T) {
s := testMQTTRunServer(t, o)
defer testMQTTShutdownServer(s)
addr := fmt.Sprintf("%s:%d", o.MQTT.Host, o.MQTT.Port)
addr := net.JoinHostPort(o.MQTT.Host, fmt.Sprintf("%d", o.MQTT.Port))
c, err := net.Dial("tcp", addr)
if err != nil {
t.Fatalf("Error creating mqtt connection: %v", err)
@@ -1265,7 +1265,7 @@ func TestMQTTAuthTimeout(t *testing.T) {
s := testMQTTRunServer(t, o)
defer testMQTTShutdownServer(s)
mc, err := net.Dial("tcp", fmt.Sprintf("%s:%d", o.MQTT.Host, o.MQTT.Port))
mc, err := net.Dial("tcp", net.JoinHostPort(o.MQTT.Host, fmt.Sprintf("%d", o.MQTT.Port)))
if err != nil {
t.Fatalf("Error connecting: %v", err)
}
@@ -1623,7 +1623,7 @@ func TestMQTTConnectNotFirstPacket(t *testing.T) {
l := &captureErrorLogger{errCh: make(chan string, 10)}
s.SetLogger(l, false, false)
c, err := net.Dial("tcp", fmt.Sprintf("%s:%d", o.MQTT.Host, o.MQTT.Port))
c, err := net.Dial("tcp", net.JoinHostPort(o.MQTT.Host, fmt.Sprintf("%d", o.MQTT.Port)))
if err != nil {
t.Fatalf("Error on dial: %v", err)
}
@@ -1707,7 +1707,7 @@ func TestMQTTConnectFailsOnParse(t *testing.T) {
s := testMQTTRunServer(t, o)
defer testMQTTShutdownServer(s)
addr := fmt.Sprintf("%s:%d", o.MQTT.Host, o.MQTT.Port)
addr := net.JoinHostPort(o.MQTT.Host, fmt.Sprintf("%d", o.MQTT.Port))
c, err := net.Dial("tcp", addr)
if err != nil {
t.Fatalf("Error creating mqtt connection: %v", err)
@@ -5166,7 +5166,7 @@ func TestMQTTFlappingSession(t *testing.T) {
// Now try to reconnect "c" and we should fail. We have to do this manually,
// since we expect it to fail.
addr := fmt.Sprintf("%s:%d", o.MQTT.Host, o.MQTT.Port)
addr := net.JoinHostPort(o.MQTT.Host, fmt.Sprintf("%d", o.MQTT.Port))
c, err := net.Dial("tcp", addr)
if err != nil {
t.Fatalf("Error creating mqtt connection: %v", err)
@@ -5254,7 +5254,7 @@ func TestMQTTLockedSession(t *testing.T) {
// Now try to connect another client that wants to use "sub".
// We can't use testMQTTConnect() because it is going to fail.
addr := fmt.Sprintf("%s:%d", o.MQTT.Host, o.MQTT.Port)
addr := net.JoinHostPort(o.MQTT.Host, fmt.Sprintf("%d", o.MQTT.Port))
c2, err := net.Dial("tcp", addr)
if err != nil {
t.Fatalf("Error creating mqtt connection: %v", err)
server/norace_1_test.go
+1 -1
View File
@@ -1038,7 +1038,7 @@ func TestNoRaceAcceptLoopsDoNotLeaveOpenedConn(t *testing.T) {
defer s.Shutdown()
host, port := test.url(o)
url := fmt.Sprintf("%s:%d", host, port)
url := net.JoinHostPort(host, fmt.Sprintf("%d", port))
var conns []net.Conn
wg := sync.WaitGroup{}
server/routes_test.go
+2 -2
View File
@@ -1309,7 +1309,7 @@ func TestRouteCloseTLSConnection(t *testing.T) {
s := RunServer(opts)
defer s.Shutdown()
endpoint := fmt.Sprintf("%s:%d", opts.Cluster.Host, opts.Cluster.Port)
endpoint := net.JoinHostPort(opts.Cluster.Host, fmt.Sprintf("%d", opts.Cluster.Port))
conn, err := net.DialTimeout("tcp", endpoint, 2*time.Second)
if err != nil {
t.Fatalf("Unexpected error on dial: %v", err)
@@ -4744,7 +4744,7 @@ func TestRouteNoLeakOnAuthTimeout(t *testing.T) {
s := RunServer(opts)
defer s.Shutdown()
c, err := net.Dial("tcp", fmt.Sprintf("%s:%d", opts.Host, opts.Cluster.Port))
c, err := net.Dial("tcp", net.JoinHostPort(opts.Host, fmt.Sprintf("%d", opts.Cluster.Port)))
if err != nil {
t.Fatalf("Error connecting: %v", err)
}
server/websocket_test.go
+5 -5
View File
@@ -1925,7 +1925,7 @@ func testNewWSClient(t testing.TB, o testWSClientOptions) (net.Conn, *bufio.Read
}
func testNewWSClientWithError(t testing.TB, o testWSClientOptions) (net.Conn, *bufio.Reader, []byte, error) {
addr := fmt.Sprintf("%s:%d", o.host, o.port)
addr := net.JoinHostPort(o.host, fmt.Sprintf("%d", o.port))
wsc, err := net.Dial("tcp", addr)
if err != nil {
return nil, nil, nil, fmt.Errorf("Error creating ws connection: %v", err)
@@ -2225,7 +2225,7 @@ func TestWSTLSConnection(t *testing.T) {
s := RunServer(o)
defer s.Shutdown()
addr := fmt.Sprintf("%s:%d", o.Websocket.Host, o.Websocket.Port)
addr := net.JoinHostPort(o.Websocket.Host, fmt.Sprintf("%d", o.Websocket.Port))
for _, test := range []struct {
name string
@@ -2285,7 +2285,7 @@ func TestWSTLSVerifyClientCert(t *testing.T) {
s := RunServer(o)
defer s.Shutdown()
addr := fmt.Sprintf("%s:%d", o.Websocket.Host, o.Websocket.Port)
addr := net.JoinHostPort(o.Websocket.Host, fmt.Sprintf("%d", o.Websocket.Port))
for _, test := range []struct {
name string
@@ -2398,7 +2398,7 @@ func TestWSTLSVerifyAndMap(t *testing.T) {
s := RunServer(o)
defer s.Shutdown()
addr := fmt.Sprintf("%s:%d", o.Websocket.Host, o.Websocket.Port)
addr := net.JoinHostPort(o.Websocket.Host, fmt.Sprintf("%d", o.Websocket.Port))
wsc, err := net.Dial("tcp", addr)
if err != nil {
t.Fatalf("Error creating ws connection: %v", err)
@@ -2499,7 +2499,7 @@ func TestWSHandshakeTimeout(t *testing.T) {
logger := &captureErrorLogger{errCh: make(chan string, 1)}
s.SetLogger(logger, false, false)
addr := fmt.Sprintf("%s:%d", o.Websocket.Host, o.Websocket.Port)
addr := net.JoinHostPort(o.Websocket.Host, fmt.Sprintf("%d", o.Websocket.Port))
wsc, err := net.Dial("tcp", addr)
if err != nil {
t.Fatalf("Error creating ws connection: %v", err)
test/maxpayload_test.go
+1 -1
View File
@@ -30,7 +30,7 @@ func TestMaxPayload(t *testing.T) {
srv, opts := RunServerWithConfig("./configs/override.conf")
defer srv.Shutdown()
endpoint := fmt.Sprintf("%s:%d", opts.Host, opts.Port)
endpoint := net.JoinHostPort(opts.Host, fmt.Sprintf("%d", opts.Port))
nc, err := nats.Connect(fmt.Sprintf("nats://%s/", endpoint))
if err != nil {
t.Fatalf("Could not connect to server: %v", err)
test/test.go
+1 -1
View File
@@ -191,7 +191,7 @@ func createRouteConn(t tLogger, host string, port int) net.Conn {
}
func createClientConn(t tLogger, host string, port int) net.Conn {
addr := fmt.Sprintf("%s:%d", host, port)
addr := net.JoinHostPort(host, fmt.Sprintf("%d", port))
c, err := net.DialTimeout("tcp", addr, 3*time.Second)
if err != nil {
stackFatalf(t, "Could not connect to server: %v\n", err)
test/tls_test.go
+1 -1
View File
@@ -866,7 +866,7 @@ func TestTLSConnectionTimeout(t *testing.T) {
defer srv.Shutdown()
// Dial with normal TCP
endpoint := fmt.Sprintf("%s:%d", opts.Host, opts.Port)
endpoint := net.JoinHostPort(opts.Host, fmt.Sprintf("%d", opts.Port))
conn, err := net.Dial("tcp", endpoint)
if err != nil {
t.Fatalf("Could not connect to %q", endpoint)