fix(scorch): prepend component stream path with base path

sandialabs · Oct 25, 2023 · f86bc00 · f86bc00
1 parent f65afaa
commit f86bc00
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/go/web/rbac/known_policy.go b/src/go/web/rbac/known_policy.go
diff --git a/src/go/web/scorch/handlers.go b/src/go/web/scorch/handlers.go
@@ -390,7 +390,7 @@ func GetComponentOutput(w http.ResponseWriter, r *http.Request) error {
 			return nil
 		}
 
-		body, _ := json.Marshal(util.WithRoot("stream", fmt.Sprintf("/api/v1/experiments/%s/scorch/components/%d/%d/%s/%s/ws", exp, run, loop, stage, cmp)))
+		body, _ := json.Marshal(util.WithRoot("stream", fmt.Sprintf("%sapi/v1/experiments/%s/scorch/components/%d/%d/%s/%s/ws", basePath, exp, run, loop, stage, cmp)))
 
 		w.Header().Set("Content-Type", "application/json")
 		w.Write(body)

diff --git a/src/go/web/scorch/terminal.go b/src/go/web/scorch/terminal.go
@@ -70,7 +70,7 @@ func CreateWebTerminal(ctx context.Context, exp string, run, loop int, stage, na
 	term.Pty = tty
 	term.Pid = c.Process.Pid
 
-	plog.Info("spawned newterminal", "cmd", cmd, "pid", term.Pid)
+	plog.Info("spawned new terminal", "cmd", cmd, "pid", term.Pid)
 
 	webTermMu.Lock()
 	webTermsPid[term.Pid] = term