fix: don't globally set tenant from record metadata when its not present

fixes #2662

Author: zachdaniel

lib/ash.ex

@@ -2889,7 +2889,13 @@ defmodule Ash do
     Ash.Helpers.expect_options!(opts)
     %resource{} = record
     id = record |> Map.take(Ash.Resource.Info.primary_key(resource)) |> Enum.to_list()
-    opts = Keyword.put_new(opts, :tenant, Map.get(record.__metadata__, :tenant))
+
+    opts =
+      case Map.fetch(record.__metadata__, :tenant) do
+        {:ok, tenant} when not is_nil(tenant) -> Keyword.put_new(opts, :tenant, tenant)
+        _ -> opts
+      end
+
     get(resource, id, opts)
   end
 
@@ -3704,7 +3710,11 @@ defmodule Ash do
     Ash.Helpers.expect_options!(opts)
     Ash.Helpers.expect_map_or_nil!(opts[:input])
 
-    opts = Keyword.put_new(opts, :tenant, Map.get(record.__metadata__, :tenant))
+    opts =
+      case Map.fetch(record.__metadata__, :tenant) do
+        {:ok, tenant} when not is_nil(tenant) -> Keyword.put_new(opts, :tenant, tenant)
+        _ -> opts
+      end
 
     changeset_opts = Keyword.take(opts, Keyword.keys(Ash.Changeset.for_update_opts()))
     update_opts = Keyword.take(opts, Keyword.keys(@update_opts_schema))
@@ -3810,7 +3820,12 @@ defmodule Ash do
         record -> record
       end
 
-    opts = Keyword.put_new(opts, :tenant, Map.get(data.__metadata__, :tenant))
+    opts =
+      case Map.fetch(data.__metadata__, :tenant) do
+        {:ok, tenant} when not is_nil(tenant) -> Keyword.put_new(opts, :tenant, tenant)
+        _ -> opts
+      end
+
     Ash.Helpers.expect_options!(opts)
 
     changeset =

test/scope_test.exs

@@ -5,6 +5,44 @@
 defmodule Ash.ScopeTest do
   use ExUnit.Case, async: true
 
+  alias Ash.Test.Domain, as: Domain
+
+  defmodule MyScope do
+    defstruct [:actor, :tenant]
+
+    defimpl Ash.Scope.ToOpts do
+      def get_actor(%{actor: actor}), do: {:ok, actor}
+      def get_tenant(%{tenant: tenant}), do: {:ok, tenant}
+      def get_context(_), do: :error
+      def get_tracer(_), do: :error
+      def get_authorize?(_), do: {:ok, false}
+    end
+  end
+
+  defmodule MultiTenantResource do
+    use Ash.Resource, domain: Domain, data_layer: Ash.DataLayer.Ets
+
+    multitenancy do
+      strategy :attribute
+      attribute :tenant_id
+    end
+
+    ets do
+      private?(true)
+    end
+
+    attributes do
+      uuid_primary_key :id
+      attribute :name, :string, public?: true
+      attribute :tenant_id, :string, allow_nil?: false, public?: true
+    end
+
+    actions do
+      default_accept :*
+      defaults [:read, :destroy, create: :*, update: :*]
+    end
+  end
+
   describe "Ash.Scope.to_opts/1 with Map" do
     test "handles nested shared context pattern" do
       context = %{
@@ -98,6 +136,62 @@ defmodule Ash.ScopeTest do
     end
   end
 
+  describe "scope with update (issue #2662)" do
+    test "scope tenant is used when record metadata has no tenant" do
+      record =
+        MultiTenantResource
+        |> Ash.Changeset.for_create(:create, %{name: "original", tenant_id: "tenant_1"},
+          tenant: "tenant_1"
+        )
+        |> Ash.create!()
+
+      # Simulate a record whose metadata does not have a tenant set
+      # (e.g. loaded from a context where tenant wasn't propagated)
+      record = put_in(record.__metadata__[:tenant], nil)
+
+      scope = %MyScope{actor: nil, tenant: "tenant_1"}
+
+      assert {:ok, updated} =
+               Ash.update(record, %{name: "updated"}, scope: scope)
+
+      assert updated.name == "updated"
+    end
+
+    test "scope tenant is used via Ash.Scope.to_opts workaround" do
+      record =
+        MultiTenantResource
+        |> Ash.Changeset.for_create(:create, %{name: "original", tenant_id: "tenant_1"},
+          tenant: "tenant_1"
+        )
+        |> Ash.create!()
+
+      record = put_in(record.__metadata__[:tenant], nil)
+
+      scope = %MyScope{actor: nil, tenant: "tenant_1"}
+      opts = Ash.Scope.to_opts(scope, action: :update)
+
+      assert {:ok, updated} = Ash.update(record, %{name: "updated"}, opts)
+      assert updated.name == "updated"
+    end
+  end
+
+  describe "scope with destroy (issue #2662)" do
+    test "scope tenant is used when record metadata has no tenant" do
+      record =
+        MultiTenantResource
+        |> Ash.Changeset.for_create(:create, %{name: "to_delete", tenant_id: "tenant_1"},
+          tenant: "tenant_1"
+        )
+        |> Ash.create!()
+
+      record = put_in(record.__metadata__[:tenant], nil)
+
+      scope = %MyScope{actor: nil, tenant: "tenant_1"}
+
+      assert :ok = Ash.destroy(record, scope: scope)
+    end
+  end
+
   describe "Ash.Context.to_opts/1 (deprecated)" do
     test "delegates to Ash.Scope.to_opts/1" do
       context = %{