From d07980b147134aff9c21bfa72df3bba2c5ba1443 Mon Sep 17 00:00:00 2001 From: nomyfan Date: Sat, 8 Aug 2020 22:01:57 +0800 Subject: [PATCH] refactor: rename hostnameFromURI to hostFromURI since host=hostname+port reuse the url variable --- cmd/cloudflared/tunnel/cmd.go | 4 ++-- cmd/cloudflared/tunnel/cmd_test.go | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/cloudflared/tunnel/cmd.go b/cmd/cloudflared/tunnel/cmd.go index dbb949b2..55d9a561 100644 --- a/cmd/cloudflared/tunnel/cmd.go +++ b/cmd/cloudflared/tunnel/cmd.go @@ -422,7 +422,7 @@ func StartServer(c *cli.Context, version string, shutdownC, graceShutdownC chan return fmt.Errorf(errText) } - if staticHost := hostnameFromURI(c.String("url")); isProxyDestinationConfigured(staticHost, c) { + if staticHost := hostFromURI(url); isProxyDestinationConfigured(staticHost, c) { listener, err := net.Listen("tcp", "127.0.0.1:") if err != nil { logger.Errorf("Cannot start Websocket Proxy Server: %s", err) @@ -570,7 +570,7 @@ func writePidFile(waitForSignal *signal.Signal, pidFile string, logger logger.Se fmt.Fprintf(file, "%d", os.Getpid()) } -func hostnameFromURI(uri string) string { +func hostFromURI(uri string) string { u, err := url.Parse(uri) if err != nil { return "" diff --git a/cmd/cloudflared/tunnel/cmd_test.go b/cmd/cloudflared/tunnel/cmd_test.go index b29b3966..2d870af2 100644 --- a/cmd/cloudflared/tunnel/cmd_test.go +++ b/cmd/cloudflared/tunnel/cmd_test.go @@ -6,12 +6,12 @@ import ( "github.com/stretchr/testify/assert" ) -func TestHostnameFromURI(t *testing.T) { - assert.Equal(t, "awesome.warptunnels.horse:22", hostnameFromURI("ssh://awesome.warptunnels.horse:22")) - assert.Equal(t, "awesome.warptunnels.horse:22", hostnameFromURI("ssh://awesome.warptunnels.horse")) - assert.Equal(t, "awesome.warptunnels.horse:2222", hostnameFromURI("ssh://awesome.warptunnels.horse:2222")) - assert.Equal(t, "localhost:3389", hostnameFromURI("rdp://localhost")) - assert.Equal(t, "localhost:3390", hostnameFromURI("rdp://localhost:3390")) - assert.Equal(t, "", hostnameFromURI("trash")) - assert.Equal(t, "", hostnameFromURI("https://awesomesauce.com")) +func TestHostFromURI(t *testing.T) { + assert.Equal(t, "awesome.warptunnels.horse:22", hostFromURI("ssh://awesome.warptunnels.horse:22")) + assert.Equal(t, "awesome.warptunnels.horse:22", hostFromURI("ssh://awesome.warptunnels.horse")) + assert.Equal(t, "awesome.warptunnels.horse:2222", hostFromURI("ssh://awesome.warptunnels.horse:2222")) + assert.Equal(t, "localhost:3389", hostFromURI("rdp://localhost")) + assert.Equal(t, "localhost:3390", hostFromURI("rdp://localhost:3390")) + assert.Equal(t, "", hostFromURI("trash")) + assert.Equal(t, "", hostFromURI("https://awesomesauce.com")) }