Merge pull request #939 from eddbbt/keyspace_fix

Revert keyspace translation for interface delete and update

apps/astarte_realm_management/lib/astarte_realm_management/engine.ex

@@ -134,9 +134,6 @@ defmodule Astarte.RealmManagement.Engine do
   def update_interface(realm_name, interface_json, opts \\ []) do
     _ = Logger.info("Going to perform interface update.", tag: "update_interface")
 
-    keyspace_name =
-      CQLUtils.realm_name_to_keyspace_name(realm_name, Config.astarte_instance_id!())
-
     with {:ok, client} <- Database.connect(realm: realm_name),
          {:ok, json_obj} <- Jason.decode(interface_json),
          interface_changeset <- InterfaceDocument.changeset(%InterfaceDocument{}, json_obj),
@@ -150,7 +147,7 @@ defmodule Astarte.RealmManagement.Engine do
            Interface.fetch_interface_descriptor(realm_name, name, major),
          :ok <- error_on_incompatible_descriptor(installed_interface, interface_descriptor),
          :ok <- error_on_downgrade(installed_interface, interface_descriptor),
-         {:ok, mapping_updates} <- extract_mapping_updates(keyspace_name, interface_doc),
+         {:ok, mapping_updates} <- extract_mapping_updates(realm_name, interface_doc),
          {:ok, automaton} <- EndpointsAutomaton.build(interface_doc.mappings) do
       interface_update =
         Map.merge(installed_interface, interface_descriptor, fn _k, old, new ->
@@ -379,9 +376,6 @@ defmodule Astarte.RealmManagement.Engine do
         interface_major: major
       )
 
-    keyspace_name =
-      CQLUtils.realm_name_to_keyspace_name(realm_name, Config.astarte_instance_id!())
-
     with {:major, 0} <- {:major, major},
          {:ok, client} <- Database.connect(realm: realm_name),
          {:major_is_avail, {:ok, true}} <-
@@ -393,11 +387,11 @@ defmodule Astarte.RealmManagement.Engine do
            {:triggers, Queries.has_interface_simple_triggers?(client, interface_id)} do
       if opts[:async] do
         # TODO: add _ = Logger.metadata(realm: realm_name)
-        Task.start_link(Engine, :execute_interface_deletion, [client, keyspace_name, name, major])
+        Task.start_link(Engine, :execute_interface_deletion, [client, realm_name, name, major])
 
         {:ok, :started}
       else
-        Engine.execute_interface_deletion(client, keyspace_name, name, major)
+        Engine.execute_interface_deletion(client, realm_name, name, major)
       end
     else
       {:major, _} ->