carry --server-url over to the printed --view command on simulate exit

Author: u9g

cmd/lk/simulate.go

@@ -559,6 +559,17 @@ func dashboardBaseURL() string {
 	return dashboardURL
 }
 
+// viewCommandHint returns the command to re-open a simulation run, carrying
+// over --server-url when the run lives somewhere other than the default cloud
+// API (e.g. staging), so the printed command targets the same environment.
+func viewCommandHint(runID string) string {
+	hint := "lk agent simulate --view " + runID
+	if serverURL != cloudAPIServerURL {
+		hint += " --server-url " + serverURL
+	}
+	return hint
+}
+
 func simulationDashboardURL(projectID, runID string) string {
 	if projectID == "" || runID == "" {
 		return ""

cmd/lk/simulate_test.go

@@ -0,0 +1,28 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+// A user finishing a simulation is told how to re-open it with --view. If they
+// pointed the original command at a non-default API server (e.g. staging), the
+// suggested command must carry the same --server-url or it would look up the
+// run in the wrong environment.
+func TestViewCommandHint(t *testing.T) {
+	origServerURL := serverURL
+	t.Cleanup(func() { serverURL = origServerURL })
+
+	t.Run("omits server-url when using the default cloud API", func(t *testing.T) {
+		serverURL = cloudAPIServerURL
+		assert.Equal(t, "lk agent simulate --view SR_abc123", viewCommandHint("SR_abc123"))
+	})
+
+	t.Run("carries over a custom server-url", func(t *testing.T) {
+		serverURL = "https://cloud-api.staging.livekit.io"
+		assert.Equal(t,
+			"lk agent simulate --view SR_abc123 --server-url https://cloud-api.staging.livekit.io",
+			viewCommandHint("SR_abc123"))
+	})
+}

cmd/lk/simulate_tui.go

@@ -80,11 +80,11 @@ func runSimulateTUI(config *simulateConfig) error {
 	}
 
 	if m.config.mode == modeView {
-		fmt.Fprintf(os.Stderr, "To re-open this simulation, run: lk agent simulate --view %s\n", m.config.viewModeRunID)
+		fmt.Fprintf(os.Stderr, "To re-open this simulation, run: %s\n", viewCommandHint(m.config.viewModeRunID))
 	} else if m.runID != "" && !m.runFinished {
 		cancelSimulationRun(config.client, m.runID)
 	} else if m.runID != "" {
-		fmt.Fprintf(os.Stderr, "To re-open this simulation, run: lk agent simulate --view %s\n", m.runID)
+		fmt.Fprintf(os.Stderr, "To re-open this simulation, run: %s\n", viewCommandHint(m.runID))
 	}
 
 	if runErr != nil {