feat!: update to ash v3

zoonect-oss · May 31, 2024 · 375d51b · 375d51b
1 parent 50c0c97
commit 375d51b
Show file tree

Hide file tree

Showing 25 changed files with 30 additions and 96 deletions.
diff --git a/.envrc b/.envrc
diff --git a/mix.exs b/mix.exs
@@ -10,7 +10,7 @@ defmodule AshUUID.MixProject do
     [
       app: @name,
       version: @version,
-      elixir: "~> 1.16",
+      elixir: "~> 1.14",
       start_permanent: Mix.env() == :prod,
       elixirc_paths: elixirc_paths(Mix.env()),
       preferred_cli_env: preferred_cli_env(),
@@ -43,8 +43,8 @@ defmodule AshUUID.MixProject do
   defp deps do
     [
       {:uniq, "~> 0.6"},
-      {:ash, "~> 3.0.0-rc.0"},
-      {:ash_postgres, "~> 2.0.0-rc.0"},
+      {:ash, "~> 3.0.0"},
+      {:ash_postgres, "~> 2.0.0"},
       # Testing, documentation, and release tools
       {:mix_test_interactive, ">= 0.0.0", only: :test, runtime: false},
       {:mix_audit, ">= 0.0.0", only: [:dev, :test], runtime: false},

diff --git a/mix.lock b/mix.lock
diff --git a/test/ash_uuid_test.exs b/test/ash_uuid_test.exs
@@ -331,7 +331,7 @@ defmodule AshUUIDTest do
     test "testing embedded things" do
       embedded_thing =
         AshUUID.Test.EmbeddedThing
-        |> Ash.Changeset.for_create(:create, %{})
+        |> Ash.Changeset.for_create(:create, %{}, domain: AshUUID.Test)
         |> Ash.create!()
 
       assert %AshUUID.Test.EmbeddedThing{} = embedded_thing
@@ -376,29 +376,29 @@ defmodule AshUUIDTest do
 
       default_standard_result =
         AshUUID.Test.EmbeddedThing
-        |> Ash.ActionInput.for_action(:default_standard_argument_test, %{id: raw_uuid}, api: AshUUID.Test)
+        |> Ash.ActionInput.for_action(:default_standard_argument_test, %{id: raw_uuid}, domain: AshUUID.Test)
         |> Ash.run_action()
 
       expected_uuid = "embedded_#{encoded_uuid}"
       assert {:ok, ^expected_uuid} = default_standard_result
 
       override_standard_result =
         AshUUID.Test.EmbeddedThing
-        |> Ash.ActionInput.for_action(:override_standard_argument_test, %{id: raw_uuid}, api: AshUUID.Test)
+        |> Ash.ActionInput.for_action(:override_standard_argument_test, %{id: raw_uuid}, domain: AshUUID.Test)
         |> Ash.run_action()
 
       assert {:ok, ^encoded_uuid} = override_standard_result
 
       default_uuid_result =
         AshUUID.Test.EmbeddedThing
-        |> Ash.ActionInput.for_action(:default_uuid_argument_test, %{id: raw_uuid}, api: AshUUID.Test)
+        |> Ash.ActionInput.for_action(:default_uuid_argument_test, %{id: raw_uuid}, domain: AshUUID.Test)
         |> Ash.run_action()
 
       assert {:ok, ^prefixed_uuid} = default_uuid_result
 
       override_uuid_result =
         AshUUID.Test.EmbeddedThing
-        |> Ash.ActionInput.for_action(:override_uuid_argument_test, %{id: raw_uuid}, api: AshUUID.Test)
+        |> Ash.ActionInput.for_action(:override_uuid_argument_test, %{id: raw_uuid}, domain: AshUUID.Test)
         |> Ash.run_action()
 
       assert {:ok, ^encoded_uuid} = override_uuid_result
@@ -407,7 +407,7 @@ defmodule AshUUIDTest do
     test "testing malformed inputs" do
       result =
         AshUUID.Test.EmbeddedThing
-        |> Ash.ActionInput.for_action(:default_standard_argument_test, %{id: "malformed"}, api: AshUUID.Test)
+        |> Ash.ActionInput.for_action(:default_standard_argument_test, %{id: "malformed"}, domain: AshUUID.Test)
         |> Ash.run_action()
 
       assert {:error, %Ash.Error.Invalid{}} = result
@@ -419,7 +419,7 @@ defmodule AshUUIDTest do
       result =
         AshUUID.Test.EmbeddedThing
         |> Ash.ActionInput.for_action(:default_uuid_argument_test, %{id: "wrong-prefix_#{encoded_uuid}"},
-          api: AshUUID.Test
+          domain: AshUUID.Test
         )
         |> Ash.run_action()
 
@@ -428,7 +428,7 @@ defmodule AshUUIDTest do
       result =
         AshUUID.Test.EmbeddedThing
         |> Ash.ActionInput.for_action(:not_strict_uuid_argument_test, %{id: "wrong-prefix_#{encoded_uuid}"},
-          api: AshUUID.Test
+          domain: AshUUID.Test
         )
         |> Ash.run_action()
 

diff --git a/test/support/repo.ex b/test/support/repo.ex
@@ -6,6 +6,6 @@ defmodule AshUUID.Test.Repo do
   @doc false
   @impl AshPostgres.Repo
   def installed_extensions do
-    ["uuid-ossp", "citext", AshUUID.PostgresExtension]
+    ["ash-functions", "uuid-ossp", "citext", AshUUID.PostgresExtension]
   end
 end
diff --git a/test/support/resources/avocado.ex b/test/support/resources/avocado.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.Avocado do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "avocados"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/avocado_smoothie.ex b/test/support/resources/avocado_smoothie.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.AvocadoSmoothie do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "avocado_smoothies"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/banana.ex b/test/support/resources/banana.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.Banana do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "bananas"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/banana_smoothie.ex b/test/support/resources/banana_smoothie.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.BananaSmoothie do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "banana_smoothies"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/blib.ex b/test/support/resources/blib.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.Blib do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "blibs"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/blib_blob.ex b/test/support/resources/blib_blob.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.BlibBlob do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "blibs_blobs"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/blob.ex b/test/support/resources/blob.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.Blob do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "blobs"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/embedded_thing.ex b/test/support/resources/embedded_thing.ex
@@ -1,10 +1,7 @@
 defmodule AshUUID.Test.EmbeddedThing do
   @moduledoc false
 
-  use Ash.Resource, domain: AshUUID.Test, data_layer: :embedded, extensions: [AshUUID]
-
-  code_interface do
-  end
+  use Ash.Resource, data_layer: :embedded, extensions: [AshUUID]
 
   attributes do
     uuid_attribute :id

diff --git a/test/support/resources/lime.ex b/test/support/resources/lime.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.Lime do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "limes"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/lime_smoothie.ex b/test/support/resources/lime_smoothie.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.LimeSmoothie do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "lime_smoothies"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/mango.ex b/test/support/resources/mango.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.Mango do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "mangos"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/mango_smoothie.ex b/test/support/resources/mango_smoothie.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.MangoSmoothie do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "mango_smoothies"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/orange.ex b/test/support/resources/orange.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.Orange do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "oranges"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/orange_smoothie.ex b/test/support/resources/orange_smoothie.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.OrangeSmoothie do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "orange_smoothies"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/pineapple.ex b/test/support/resources/pineapple.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.Pineapple do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "pineapples"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/pineapple_smoothie.ex b/test/support/resources/pineapple_smoothie.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.PineappleSmoothie do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "pineapple_smoothies"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/template.ex b/test/support/resources/template.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.Template do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "templates"
     repo AshUUID.Test.Repo

diff --git a/test/support/resources/volatile_thing.ex b/test/support/resources/volatile_thing.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.VolatileThing do
 
   use Ash.Resource, domain: AshUUID.Test, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   attributes do
     uuid_attribute :id
   end

diff --git a/test/support/resources/wrapper_thing.ex b/test/support/resources/wrapper_thing.ex
@@ -3,9 +3,6 @@ defmodule AshUUID.Test.WrapperThing do
 
   use Ash.Resource, domain: AshUUID.Test, data_layer: AshPostgres.DataLayer, extensions: [AshUUID]
 
-  code_interface do
-  end
-
   postgres do
     table "wrapper_things"
     repo AshUUID.Test.Repo

diff --git a/vsc.code-workspace b/vsc.code-workspace
@@ -5,24 +5,18 @@
     }
   ],
   "settings": {
-    "[elixir]": { "editor.defaultFormatter": "elixir-tools.elixir-tools" },
-    "[phoenix-heex]": {
-      "editor.defaultFormatter": "animus-coop.vscode-elixir-mix-formatter"
-    },
+    "[elixir]": { "editor.defaultFormatter": "JakeBecker.elixir-ls" },
     "editor.acceptSuggestionOnEnter": "off",
     "editor.bracketPairColorization.enabled": true,
     "editor.formatOnSave": true,
     "editor.formatOnType": true,
     "editor.guides.bracketPairs": "active",
     "editor.insertSpaces": true,
-    "editor.quickSuggestions": {
-      "strings": true
-    },
+    "editor.quickSuggestions": { "strings": true },
     "editor.tabSize": 2,
     "editor.trimAutoWhitespace": false,
     "editor.wordBasedSuggestions": "off",
     "elixir-tools.credo.enable": true,
-    "elixir-tools.nextls.enable": true,
     "elixirLS.dialyzerEnabled": true,
     "elixirLS.enableTestLenses": true,
     "elixirLS.fetchDeps": true,
@@ -45,7 +39,6 @@
       ".direnv": true,
       ".elixir_ls": true,
       ".elixir-tools": true,
-      ".nix": true,
       "deps": true,
       "legacy": true,
       "priv/plts": true,