Implement account users tool

will help us be able to see who's registered in a given plural account

Author: michaeljguarino

Diff for: apps/core/lib/core/mcp/server.ex

@@ -2,12 +2,13 @@ defmodule Core.MCP.Server do
   use MCPServer
   alias Core.MCP.Tools.{
     Account,
+    AccountUsers,
     Enterprise,
     CloudConsole,
     RemoveEnterprise
   }
 
-  @tools [Account, Enterprise, CloudConsole, RemoveEnterprise]
+  @tools [Account, AccountUsers, Enterprise, CloudConsole, RemoveEnterprise]
   @by_name Map.new(@tools, & {&1.name(), &1})
 
   @protocol_version "2024-11-05"

Diff for: apps/core/lib/core/mcp/tools/account_users.ex

@@ -0,0 +1,32 @@
+defmodule Core.MCP.Tools.AccountUsers do
+  @behaviour Core.MCP.Tool
+  alias Core.Services.Accounts
+  alias Core.Schema.{User, Account}
+
+  def name(), do: "account_users"
+
+  def description(), do: "Fetches the users associated with a Plural account"
+
+  def schema(), do: %{
+    type: "object",
+    required: ["account_id"],
+    properties: %{
+      account_id: %{
+        type: "string",
+        description: "The ID of the account you want to fetch users for"
+      }
+    }
+  }
+
+  def invoke(%{"account_id" => id}) do
+    with %Account{} = account <- Accounts.get_account(id) do
+      User.for_account(account.id)
+      |> Core.Repo.all()
+      |> Enum.map(&Map.take(&1, ~w(id email name)a))
+      |> Jason.encode()
+    else
+      _ -> {:ok, "no account with id #{id}"}
+    end
+  end
+  def invoke(_), do: {:error, "account_id is required"}
+end

Diff for: apps/core/lib/core/mcp/tools/cloud_console.ex

@@ -23,18 +23,14 @@ defmodule Core.MCP.Tools.CloudConsole do
   end
 
   def invoke(%{"name" => name}) do
-    with %ConsoleInstance{} = console <- Cloud.get_instance_by_name(name),
-         console = Repo.preload(console, [:cluster, owner: [account: [subscription: :plan]]]) do
-      format(console)
+    with %ConsoleInstance{} = console <- Cloud.get_instance_by_name(name) do
+      Repo.preload(console, [:cluster, owner: [account: [subscription: :plan]]])
+      |> Map.take(~w(id first_notif_at second_notif_at type name status subdomain url cloud size region cluster owner)a)
       |> Proto.serialize()
       |> Jason.encode()
     else
       _ -> {:ok, "no instance with name #{name}"}
     end
   end
   def invoke(_), do: {:error, "email is required"}
-
-  defp format(console) do
-    Map.take(console, ~w(id type name status subdomain url cloud size region cluster owner)a)
-  end
 end

Diff for: apps/core/test/mcp/tools/account_users_test.exs

@@ -0,0 +1,18 @@
+defmodule Core.MCP.Tools.AccountUsersTest do
+  use Core.SchemaCase, async: true
+  alias Core.MCP.Tools.AccountUsers
+
+  describe "invoke/1" do
+    test "it will fetch a users account info" do
+      account = insert(:account)
+      user = insert(:user, account: account)
+
+      {:ok, res} = AccountUsers.invoke(%{"account_id" => account.id})
+      {:ok, [parsed]} = Jason.decode(res)
+
+      assert parsed["id"] == user.id
+      assert parsed["email"] == user.email
+      assert parsed["name"] == user.name
+    end
+  end
+end

Diff for: apps/cron/lib/cron/prune/cloud.ex

@@ -5,13 +5,23 @@ defmodule Cron.Prune.Cloud do
   use Cron
   alias Core.Schema.{ConsoleInstance}
   alias Core.Services.Cloud
+  require Logger
 
   def run() do
     ConsoleInstance.unpaid()
     |> ConsoleInstance.reapable()
     |> ConsoleInstance.ordered(asc: :id)
     |> Core.Repo.stream(method: :keyset)
     |> Core.throttle()
-    |> Enum.each(&Cloud.reap/1)
+    |> Enum.each(fn inst ->
+      Logger.info("Reaping cloud console #{inst.id}")
+      Cloud.reap(inst)
+      |> log_error()
+    end)
+  end
+
+  defp log_error({:ok, _}), do: :ok
+  defp log_error(err) do
+    Logger.error("Error reaping cloud console: #{inspect(err)}")
   end
 end

Diff for: plural/helm/plural/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: plural
 description: A helm chart for installing plural
 appVersion: 0.11.8
-version: 0.10.104
+version: 0.10.105
 dependencies:
   - name: hydra
     version: 0.26.5

Diff for: plural/helm/plural/templates/cron.yaml

@@ -25,7 +25,7 @@ spec:
           {{- end }}
           containers:
           - name: cron
-            image: "{{ .Values.global.registry }}/{{ .Values.cron.repository }}:{{ .Values.cron.tag | default .Chart.AppVersion }}"
+            image: "{{ .Values.global.registry }}/{{ .Values.cron.repository }}:{{ include "plural.imageTag" . }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             envFrom:
             - secretRef: