From e9e7491f2b9d661a9227073aebda7fde5abfda95 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 4 Sep 2022 15:35:18 +0200 Subject: [PATCH] linting: host:port in url should be constructed with net.JoinHostPort integration-cli/docker_cli_daemon_test.go:545:54: host:port in url should be constructed with net.JoinHostPort and not directly with fmt.Sprintf (nosprintfhostport) cmdArgs = append(cmdArgs, "--tls=false", "--host", fmt.Sprintf("tcp://%s:%s", l.daemon, l.port)) ^ opts/hosts_test.go:35:31: host:port in url should be constructed with net.JoinHostPort and not directly with fmt.Sprintf (nosprintfhostport) "tcp://:5555": fmt.Sprintf("tcp://%s:5555", DefaultHTTPHost), ^ opts/hosts_test.go:91:30: host:port in url should be constructed with net.JoinHostPort and not directly with fmt.Sprintf (nosprintfhostport) ":5555": fmt.Sprintf("tcp://%s:5555", DefaultHTTPHost), ^ Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 306b8c89e8186bc88105a41a5d8acf6ae92dea08) Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_cli_daemon_test.go | 2 +- opts/hosts_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index 08d826c3d2..35e4c3d468 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -542,7 +542,7 @@ func (s *DockerDaemonSuite) TestDaemonAllocatesListeningPort(c *testing.T) { cmdArgs := make([]string, 0, len(listeningPorts)*2) for _, l := range listeningPorts { - cmdArgs = append(cmdArgs, "--tls=false", "--host", fmt.Sprintf("tcp://%s:%s", l.daemon, l.port)) + cmdArgs = append(cmdArgs, "--tls=false", "--host", "tcp://"+net.JoinHostPort(l.daemon, l.port)) } s.d.StartWithBusybox(c, cmdArgs...) diff --git a/opts/hosts_test.go b/opts/hosts_test.go index ce0cbdf93e..cb5a0842db 100644 --- a/opts/hosts_test.go +++ b/opts/hosts_test.go @@ -32,7 +32,7 @@ func TestParseHost(t *testing.T) { "tcp://host:": fmt.Sprintf("tcp://host:%d", DefaultHTTPPort), "tcp://": DefaultTCPHost, "tcp://:": DefaultTCPHost, - "tcp://:5555": fmt.Sprintf("tcp://%s:5555", DefaultHTTPHost), + "tcp://:5555": fmt.Sprintf("tcp://%s:5555", DefaultHTTPHost), //nolint:nosprintfhostport // sprintf is more readable for this case. "tcp://[::1]": fmt.Sprintf(`tcp://[::1]:%d`, DefaultHTTPPort), "tcp://[::1]:": fmt.Sprintf(`tcp://[::1]:%d`, DefaultHTTPPort), "tcp://[::1]:5555": `tcp://[::1]:5555`, @@ -88,7 +88,7 @@ func TestParseDockerDaemonHost(t *testing.T) { } valids := map[string]string{ ":": DefaultTCPHost, - ":5555": fmt.Sprintf("tcp://%s:5555", DefaultHTTPHost), + ":5555": fmt.Sprintf("tcp://%s:5555", DefaultHTTPHost), //nolint:nosprintfhostport // sprintf is more readable for this case. "0.0.0.1:": fmt.Sprintf("tcp://0.0.0.1:%d", DefaultHTTPPort), "0.0.0.1:5555": "tcp://0.0.0.1:5555", "[::1]": fmt.Sprintf("tcp://[::1]:%d", DefaultHTTPPort),