diff --git a/src/go/web/rbac/known_policy.go b/src/go/web/rbac/known_policy.go index ed057870..769920db 100644 --- a/src/go/web/rbac/known_policy.go +++ b/src/go/web/rbac/known_policy.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// This file was generated at build time 2023-09-11 20:11:46.959909872 -0600 MDT m=+0.122203493 +// This file was generated at build time 2023-10-25 08:41:25.249681769 -0600 MDT m=+0.221636804 // This contains all known role checks used in codebase package rbac @@ -55,6 +55,8 @@ var Permissions = []Permission{ {"vms/captures", "create"}, {"vms/captures", "delete"}, {"vms/captures", "list"}, + {"vms/cdrom", "delete"}, + {"vms/cdrom", "update"}, {"vms/commit", "create"}, {"vms/forwards", "create"}, {"vms/forwards", "delete"}, diff --git a/src/go/web/scorch/handlers.go b/src/go/web/scorch/handlers.go index b4feff20..04131d6a 100644 --- 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 index 7c462323..15e43db6 100644 --- 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