From caec4d66249328ac76f380ca07892038f522de46 Mon Sep 17 00:00:00 2001 From: yuancjun Date: Wed, 24 Nov 2021 16:16:10 +0800 Subject: [PATCH] Allow address argument to dashboard binary. --- cmd/dashboard.go | 2 +- pkg/standalone/dashboard.go | 4 ++-- pkg/standalone/dashboard_test.go | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cmd/dashboard.go b/cmd/dashboard.go index 9768ff16b..4a8db12a3 100644 --- a/cmd/dashboard.go +++ b/cmd/dashboard.go @@ -167,7 +167,7 @@ dapr dashboard -k -p 9999 <-portForward.GetStop() } else { // Standalone mode - err := standalone.NewDashboardCmd(dashboardLocalPort).Run() + err := standalone.NewDashboardCmd(dashboardHost, dashboardLocalPort).Run() if err != nil { print.FailureStatusEvent(os.Stderr, "Dapr dashboard not found. Is Dapr installed?") } diff --git a/pkg/standalone/dashboard.go b/pkg/standalone/dashboard.go index 9dfa2ace3..ad656228c 100644 --- a/pkg/standalone/dashboard.go +++ b/pkg/standalone/dashboard.go @@ -14,7 +14,7 @@ import ( ) // NewDashboardCmd creates the command to run dashboard. -func NewDashboardCmd(port int) *exec.Cmd { +func NewDashboardCmd(address string, port int) *exec.Cmd { // Use the default binary install location dashboardPath := defaultDaprBinPath() binaryName := "dashboard" @@ -25,7 +25,7 @@ func NewDashboardCmd(port int) *exec.Cmd { // Construct command to run dashboard return &exec.Cmd{ Path: filepath.Join(dashboardPath, binaryName), - Args: []string{binaryName, "--port", strconv.Itoa(port)}, + Args: []string{binaryName, "--address", address, "--port", strconv.Itoa(port)}, Dir: dashboardPath, Stdout: os.Stdout, } diff --git a/pkg/standalone/dashboard_test.go b/pkg/standalone/dashboard_test.go index 0cc4d7a1b..0ea529f46 100644 --- a/pkg/standalone/dashboard_test.go +++ b/pkg/standalone/dashboard_test.go @@ -13,10 +13,12 @@ import ( func TestDashboardRun(t *testing.T) { t.Run("build Cmd", func(t *testing.T) { - cmd := NewDashboardCmd(9090) + cmd := NewDashboardCmd("localhost", 9090) assert.Contains(t, cmd.Args[0], "dashboard") - assert.Equal(t, cmd.Args[1], "--port") - assert.Equal(t, cmd.Args[2], "9090") + assert.Equal(t, cmd.Args[1], "--address") + assert.Equal(t, cmd.Args[2], "localhost") + assert.Equal(t, cmd.Args[3], "--port") + assert.Equal(t, cmd.Args[4], "9090") }) }