Implement account users tool (#1412)

Author: michaeljguarino

Diff for: apps/core/lib/core/mcp/serialization/schema.ex

@@ -56,7 +56,7 @@ defimpl Core.Mcp.Serialization.Proto, for: Core.Schema.ConsoleInstance do
   def serialize(console) do
     console
     |> Map.from_struct()
-    |> Map.drop(~w(__meta__ configuration)a)
+    |> Map.take(~w(id first_notif_at second_notif_at type name status subdomain url cloud size region cluster owner)a)
     |> Core.Mcp.Serialization.Proto.serialize()
   end
 end

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

@@ -2,12 +2,14 @@ defmodule Core.MCP.Server do
   use MCPServer
   alias Core.MCP.Tools.{
     Account,
+    AccountUsers,
     Enterprise,
     CloudConsole,
+    CloudReap,
     RemoveEnterprise
   }
 
-  @tools [Account, Enterprise, CloudConsole, RemoveEnterprise]
+  @tools [Account, AccountUsers, Enterprise, CloudConsole, CloudReap, 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,13 @@ 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]]])
       |> 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/lib/core/mcp/tools/cloud_reap.ex

@@ -0,0 +1,44 @@
+defmodule Core.MCP.Tools.CloudReap do
+  @behaviour Core.MCP.Tool
+  alias Core.Repo
+  alias Core.Services.Cloud
+  alias Core.Mcp.Serialization.Proto
+  alias Core.Services.Cloud
+  alias Core.Schema.{ConsoleInstance}
+
+  def name(), do: "reap_cloud_cluster"
+
+  def description(), do: "Initiates the reaping process for a cloud cluster, which involves sending two warning emails until ultimately deleting it"
+
+  def schema() do
+    %{
+      type: "object",
+      required: ["name"],
+      properties: %{
+        name: %{
+          type: "string",
+          description: "The name of the console instance to reap"
+        }
+      }
+    }
+  end
+
+  def invoke(%{"name" => name}) do
+    with %ConsoleInstance{} = console <- Cloud.get_instance_by_name(name),
+         {:ok, inst} <- Cloud.reap(console) do
+      res = Repo.preload(console, [:cluster, owner: [account: [subscription: :plan]]])
+            |> Proto.serialize()
+            |> Jason.encode!()
+      {:ok, """
+        Initiated reaping of cloud console.  Attributes are:
+
+        ```json
+        #{res}
+        ```
+      """}
+    else
+      _ -> {:ok, "no instance with name #{name}"}
+    end
+  end
+  def invoke(_), do: {:error, "email is required"}
+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/core/test/mcp/tools/cloud_reap.exs

@@ -0,0 +1,17 @@
+defmodule Core.MCP.Tools.CloudReapTest do
+  use Core.SchemaCase, async: true
+  alias Core.MCP.Tools.CloudReap
+
+  describe "invoke/1" do
+    test "it will initiate the reaping process for a cloud cluster" do
+      inst = insert(:console_instance)
+
+      {:ok, res} = CloudReap.invoke(%{"name" => inst.name})
+
+      assert is_binary(res)
+
+      assert refetch(inst).first_notif_at
+      refute refetch(inst).second_notif_at
+    end
+  end
+end

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

@@ -12,6 +12,15 @@ defmodule Cron.Prune.Cloud do
     |> 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: apps/cron/lib/cron/prune/trial.ex

@@ -5,7 +5,6 @@ defmodule Cron.Prune.Trials do
   use Cron
   alias Core.Services.Payments
   alias Core.Schema.PlatformSubscription
-  require Logger
 
   def run() do
     PlatformSubscription

Diff for: apps/cron/lib/cron/runner.ex

@@ -2,13 +2,17 @@ defmodule Cron.Runner do
   use Task, restart: :transient
   require Logger
 
+  @sleep :timer.seconds(10)
+
   def start_link(_) do
     Task.start_link(&run_cron/0)
   end
 
   def run_cron() do
     module = resolve_module()
-    Logger.info "Starting cron #{module}"
+    Logger.info "Sleeping to initialize dependencies for #{@sleep} seconds first..."
+    :timer.sleep(@sleep)
+    Logger.info "Starting cron #{module}..."
     module.execute()
   after
     :init.stop()

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/configurationoverlays.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: