Module.Callback Refactor

.github/workflows/ash-ci.yml

@@ -110,8 +110,8 @@ jobs:
   report_mix_deps:
     name: "Report Mix Dependencies"
     runs-on: ubuntu-latest
-    # Only run this job when we're on the main branch, not for PRs
-    if: github.ref == 'refs/heads/main'
+    # Only run this job for ash-project org main branches
+    if: github.ref == 'refs/heads/main' && github.repository_owner == 'ash-project'
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: erlef/mix-dependency-submission@fa3e8f349d00a32bf14eec1c7577d6564abe08d2 # v1.3.1
@@ -340,7 +340,7 @@ jobs:
     needs:
       - build-test
       - build-docs
-    if: ${{inputs.publish-docs && github.ref == 'refs/heads/main'}}
+    if: ${{inputs.publish-docs && github.ref == 'refs/heads/main' && github.repository_owner == 'ash-project'}}
     permissions:
       pages: write
       id-token: write

.github/workflows/test-subprojects.yml

@@ -14,6 +14,7 @@ jobs:
   test-subprojects:
     runs-on: ubuntu-latest
     name: Subproject ${{matrix.project.org}}/${{matrix.project.name}} - OTP ${{matrix.otp}} / Elixir ${{matrix.elixir}}
+    if: ${{ github.repository == 'ash-project/ash' || matrix.project.name != 'ash_oban' }}
     strategy:
       fail-fast: false
       matrix:

REUSE.toml

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2019 ash contributors <https://github.com/ash-project/ash/graphs/contributors>
+#
+# SPDX-License-Identifier: MIT
+
+version = 1
+
+# AALang-Gab assets are JSON-LD and other formats that cannot carry SPDX tags inline;
+# annotate the tree for REUSE compliance (see https://reuse.software/spec/).
+[[annotations]]
+path = "lib/AALang-Gab/.gitignore"
+SPDX-FileCopyrightText = "2019 ash contributors <https://github.com/ash-project/ash/graphs/contributors>"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "lib/AALang-Gab/**/*.jsonld"
+SPDX-FileCopyrightText = "2019 ash contributors <https://github.com/ash-project/ash/graphs/contributors>"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "lib/AALang-Gab/**/*.md"
+SPDX-FileCopyrightText = "2019 ash contributors <https://github.com/ash-project/ash/graphs/contributors>"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "lib/AALang-Gab/**/*.py"
+SPDX-FileCopyrightText = "2019 ash contributors <https://github.com/ash-project/ash/graphs/contributors>"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "lib/AALang-Gab/**/*.aacomp"
+SPDX-FileCopyrightText = "2019 ash contributors <https://github.com/ash-project/ash/graphs/contributors>"
+SPDX-License-Identifier = "MIT"

lib/ash/action_input.ex

@@ -1345,7 +1345,7 @@ defmodule Ash.ActionInput do
              context: input.context
            )
 
-         case module.init(opts) do
+         case Ash.Resource.Validation.init(module, opts) do
            {:ok, opts} ->
              Ash.Resource.Validation.validate(
                module,
@@ -1377,7 +1377,7 @@ defmodule Ash.ActionInput do
               context: input.context
             )
 
-          with {:ok, opts} <- validation.module.init(opts),
+          with {:ok, opts} <- Ash.Resource.Validation.init(validation.module, opts),
                :ok <-
                  Ash.Resource.Validation.validate(
                    validation.module,
@@ -1424,7 +1424,10 @@ defmodule Ash.ActionInput do
               add_error(input, validation.message)
 
             :error ->
-              add_error(input, validation.module.describe(validation.opts))
+              add_error(
+                input,
+                Ash.Resource.Validation.describe(validation.module, validation.opts)
+              )
           end
         end
       end
@@ -1463,7 +1466,7 @@ defmodule Ash.ActionInput do
              context: input.context
            )
 
-         case module.init(opts) do
+         case Ash.Resource.Validation.init(module, opts) do
            {:ok, opts} ->
              Ash.Resource.Validation.validate(
                module,
@@ -1486,7 +1489,7 @@ defmodule Ash.ActionInput do
         end do
           Ash.Tracer.set_metadata(tracer, :preparation, metadata)
 
-          {:ok, opts} = module.init(opts)
+          {:ok, opts} = Ash.Resource.Preparation.init(module, opts)
 
           opts =
             Ash.Expr.fill_template(

lib/ash/actions/action.ex

@@ -338,7 +338,8 @@ defmodule Ash.Actions.Action do
       :ok,
       fn authorizer, :ok ->
         authorizer_state =
-          authorizer.initial_state(
+          Ash.Authorizer.initial_state(
+            authorizer,
             actor,
             input.resource,
             input.action,
@@ -352,7 +353,7 @@ defmodule Ash.Actions.Action do
           changeset: nil
         }
 
-        case authorizer.strict_check(authorizer_state, context) do
+        case Ash.Authorizer.strict_check(authorizer, authorizer_state, context) do
           {:error, %{class: :forbidden} = e} when is_exception(e) ->
             {:halt, {:error, e}}
 
@@ -389,9 +390,6 @@ defmodule Ash.Actions.Action do
 
             Received #{inspect(filter)} when authorizing #{inspect(input.resource)}.#{input.action.name}
             """
-
-          :forbidden ->
-            {:halt, {:error, Ash.Authorizer.exception(authorizer, :forbidden, authorizer_state)}}
         end
       end
     )