WIP

backend/config/test.exs

@@ -31,7 +31,7 @@ config :edgehog, Edgehog.Repo,
   database: "edgehog_test#{System.get_env("MIX_TEST_PARTITION")}",
   hostname: "localhost",
   pool: Ecto.Adapters.SQL.Sandbox,
-  pool_size: 10
+  pool_size: 40
 
 # We don't run a server during test. If one is required,
 # you can enable the server option below.

backend/lib/edgehog/astarte.ex

@@ -601,10 +601,16 @@ defmodule Edgehog.Astarte do
   end
 
   def fetch_interface(%RealmManagement{} = client, interface_name, interface_major) do
-    with {:error, %APIError{status: 404}} <-
-           @interfaces_module.get(client, interface_name, interface_major) do
-      # We just convert a 404 status to :not_found, and return everything else as-is
-      {:error, :not_found}
+    case @interfaces_module.get(client, interface_name, interface_major) do
+      {:ok, %{"data" => interface_map}} ->
+        {:ok, interface_map}
+
+      {:error, %APIError{status: 404}} ->
+        # We just convert a 404 status to :not_found, and return all other errors as-is
+        {:error, :not_found}
+
+      {:error, other} ->
+        {:error, other}
     end
   end
 
@@ -622,9 +628,21 @@ defmodule Edgehog.Astarte do
   end
 
   def fetch_trigger(%RealmManagement{} = client, trigger_name) do
-    with {:error, %APIError{status: 404}} <- @triggers_module.get(client, trigger_name) do
-      # We just convert a 404 status to :not_found, and return everything else as-is
-      {:error, :not_found}
+    case @triggers_module.get(client, trigger_name) do
+      {:ok, %{"data" => trigger_map}} ->
+        {:ok, trigger_map}
+
+      {:error, %APIError{status: 404}} ->
+        # We just convert a 404 status to :not_found, and return all other errors as-is
+        {:error, :not_found}
+
+      # TODO: workaround due to the fact that currently Astarte RM API returns 500 for a
+      # non-existing trigger
+      {:error, %APIError{status: 500}} ->
+        {:error, :not_found}
+
+      {:error, other} ->
+        {:error, other}
     end
   end
 

backend/lib/edgehog/astarte/realm/interfaces/behaviour.ex

@@ -25,7 +25,7 @@ defmodule Edgehog.Astarte.Realm.Interfaces.Behaviour do
               client :: RealmManagement.t(),
               interface_name :: String.t(),
               interface_major :: non_neg_integer
-            ) :: {:ok, term()} | {:error, term()}
+            ) :: {:ok, map()} | {:error, term()}
 
   @callback create(client :: RealmManagement.t(), interface_json :: map()) ::
               :ok | {:error, term()}

backend/lib/edgehog/astarte/realm/triggers/behaviour.ex

@@ -22,7 +22,7 @@ defmodule Edgehog.Astarte.Realm.Triggers.Behaviour do
   alias Astarte.Client.RealmManagement
 
   @callback get(client :: RealmManagement.t(), trigger_name :: String.t()) ::
-              {:ok, term()} | {:error, term()}
+              {:ok, map()} | {:error, term()}
 
   @callback create(client :: RealmManagement.t(), trigger_json :: map()) ::
               :ok | {:error, term()}

backend/lib/edgehog/tenants/reconciler.ex

@@ -30,7 +30,7 @@ defmodule Edgehog.Tenants.Reconciler do
   @reconcile_interval :timer.minutes(10)
 
   def start_link(opts) do
-    GenServer.start_link(__MODULE__, opts)
+    GenServer.start_link(__MODULE__, opts, name: __MODULE__)
   end
 
   def reconcile_tenant(%Tenant{} = tenant) do

backend/test/edgehog/tenants/reconciler/core_test.exs

@@ -127,7 +127,7 @@ defmodule Edgehog.Tenants.Reconciler.CoreTest do
 
       Edgehog.Astarte.Realm.InterfacesMock
       |> expect(:get, fn ^client, ^interface_name, ^major ->
-        {:ok, interface_map}
+        {:ok, %{"data" => interface_map}}
       end)
       |> expect(:create, 0, fn _client, _interface_map -> :ok end)
       |> expect(:update, 0, fn _client, _interface_name, _major, _interface_map -> :ok end)
@@ -146,7 +146,7 @@ defmodule Edgehog.Tenants.Reconciler.CoreTest do
 
       Edgehog.Astarte.Realm.InterfacesMock
       |> expect(:get, fn ^client, ^interface_name, ^major ->
-        {:ok, put_minor_version(interface_map, minor + 1)}
+        {:ok, %{"data" => put_minor_version(interface_map, minor + 1)}}
       end)
       |> expect(:create, 0, fn _client, _interface_map -> :ok end)
       |> expect(:update, 0, fn _client, _interface_name, _major, _interface_map -> :ok end)
@@ -165,7 +165,7 @@ defmodule Edgehog.Tenants.Reconciler.CoreTest do
 
       Edgehog.Astarte.Realm.InterfacesMock
       |> expect(:get, fn ^client, ^interface_name, ^major ->
-        {:ok, put_minor_version(interface_map, minor - 1)}
+        {:ok, %{"data" => put_minor_version(interface_map, minor - 1)}}
       end)
       |> expect(:update, fn ^client, ^interface_name, ^major, ^interface_map ->
         :ok
@@ -274,7 +274,7 @@ defmodule Edgehog.Tenants.Reconciler.CoreTest do
 
       Edgehog.Astarte.Realm.TriggersMock
       |> expect(:get, fn _client, _trigger_name ->
-        {:error, api_error(status: 500)}
+        {:error, api_error(status: 502)}
       end)
 
       assert_raise CaseClauseError, fn ->

backend/test/support/mocks/astarte/realm/interfaces.ex

@@ -26,7 +26,7 @@ defmodule Edgehog.Mocks.Astarte.Realm.Interfaces do
 
   @impl true
   def get(%RealmManagement{} = _client, interface_name, interface_major) do
-    {:ok, interface_map_fixture(name: interface_name, major: interface_major)}
+    {:ok, %{"data" => interface_map_fixture(name: interface_name, major: interface_major)}}
   end
 
   @impl true