properly handle exec failures

Author: michaeljguarino

assets/src/components/cluster/containers/ContainerShell.tsx

@@ -56,8 +56,9 @@ export function Shell({
 }) {
   const { command, setCommand, defaultCommand, isDefault } = useCommand(null)
 
-  const cluster = clusterId ?? ''
-  const room = `pod:${cluster}:${namespace}:${name}:${container}`
+  const room = clusterId
+    ? `pod:${clusterId}:${namespace}:${name}:${container}`
+    : `pod:${namespace}:${name}:${container}`
 
   return (
     <Flex

assets/src/components/workbenches/workbench/WorkbenchJobsSearch.tsx

@@ -181,7 +181,10 @@ function WorkbenchJobSearchResultRow({
         }}
         onClick={(e) => e.stopPropagation()}
       >
-        <PRsModalIcon prs={prs} />
+        <PRsModalIcon
+          prs={prs}
+          type="tertiary"
+        />
         <JobConclusionIcon result={job.result} />
         <RunStatusIcon
           fullColor

assets/src/components/workbenches/workbench/WorkbenchJobsTable.tsx

@@ -323,7 +323,10 @@ export function WorkbenchJobActionsRow({
         job={job}
         fillLevel={chipFillLevel}
       />
-      <PRsModalIcon prs={prs} />
+      <PRsModalIcon
+        prs={prs}
+        type="tertiary"
+      />
       <JobEvalBadge job={job} />
       <JobConclusionIcon result={job.result} />
       <WorkbenchQueuedPromptChip

lib/console/ai/tools/workbench/infrastructure/kube_shell.ex

@@ -139,19 +139,10 @@ defmodule Console.AI.Tools.Workbench.KubeShell do
 
   defp wait_for_result() do
     receive do
-      {:exec_status, status} -> parse_exec_status(status)
+      {:exec_status, status} -> PodExec.parse_exec_status(status)
       :exec_stream_closed -> :ok
     after
       @timeout -> {:error, "shell command timed out after 30 minutes"}
     end
   end
-
-  defp parse_exec_status(status) do
-    case Jason.decode(status) do
-      {:ok, %{"status" => "Success"}} -> :ok
-      {:ok, %{"message" => message}} when is_binary(message) -> {:error, message}
-      {:ok, response} -> {:error, "unexpected Kubernetes exec status: #{inspect(response)}"}
-      {:error, _} -> {:error, "invalid Kubernetes exec status: #{status}"}
-    end
-  end
 end

lib/console/kubernetes/pod_exec.ex

@@ -57,6 +57,15 @@ defmodule Console.Kubernetes.PodExec do
     WebSockex.send_frame(client, {:binary, <<4>> <> resize})
   end
 
+  def parse_exec_status(status) do
+    case Jason.decode(status) do
+      {:ok, %{"status" => "Success"}} -> :ok
+      {:ok, %{"message" => message}} when is_binary(message) -> {:error, message}
+      {:ok, response} -> {:error, "unexpected Kubernetes exec status: #{inspect(response)}"}
+      {:error, _} -> {:error, "invalid Kubernetes exec status: #{status}"}
+    end
+  end
+
   defp deliver_frame(<<1, frame::binary>>, pid),
     do: send_frame(pid, frame)
   defp deliver_frame(<<2, frame::binary>>, pid),

lib/console_web/channels/shell_channel.ex

@@ -40,6 +40,15 @@ defmodule ConsoleWeb.ShellChannel do
     {:noreply, socket}
   end
 
+  def handle_info({:exec_status, status}, socket) do
+    case PodExec.parse_exec_status(status) do
+      :ok -> :ok
+      {:error, message} -> push(socket, "stdo", %{message: "\r\nError: #{message}\r\n"})
+    end
+
+    {:noreply, socket}
+  end
+
   def handle_in("command", %{"cmd" => cmd}, socket) do
     PodExec.command(socket.assigns.wss_pid, fmt_cmd(cmd))
     {:reply, :ok, socket}

test/console/kubernetes/pod_exec_test.exs

@@ -76,6 +76,21 @@ defmodule Console.Kubernetes.PodExecTest do
     end
   end
 
+  describe "parse_exec_status/1" do
+    test "returns successful Kubernetes exec statuses" do
+      assert PodExec.parse_exec_status(~s({"status":"Success"})) == :ok
+    end
+
+    test "returns Kubernetes exec error messages" do
+      assert PodExec.parse_exec_status(~s({"status":"Failure","message":"shell not found"})) ==
+               {:error, "shell not found"}
+    end
+
+    test "returns an error for invalid Kubernetes exec statuses" do
+      assert PodExec.parse_exec_status("not json") == {:error, "invalid Kubernetes exec status: not json"}
+    end
+  end
+
   defp command_args(url) do
     query_pairs(url)
     |> Enum.flat_map(fn

test/console_web/channels/shell_channel_test.exs

@@ -56,6 +56,23 @@ defmodule ConsoleWeb.ShellChannelTest do
       assert_push "stdo", %{message: "echo 'hello world'"}
     end
 
+    test "displays Kubernetes exec failures in the terminal" do
+      user = insert(:user)
+      role = insert(:role, repositories: ["*"], permissions: %{operate: true})
+      insert(:role_binding, role: role, user: user)
+
+      url = PodExec.exec_url("ns", "n", "c")
+      expect(PodExec, :start_link, fn ^url, _ -> {:ok, :pid} end)
+
+      {:ok, socket} = mk_socket(user)
+      {:ok, _, socket} = subscribe_and_join(socket, "pod:ns:n:c", %{})
+
+      status = ~s({"status":"Failure","message":"shell not found"})
+      send(socket.channel_pid, {:exec_status, status})
+
+      assert_push "stdo", %{message: "\r\nError: shell not found\r\n"}
+    end
+
     @tag :skip
     test "those without access cannot shell into pods" do
       user = insert(:user)