wip

Signed-off-by: Eddy Babetto <eddy.babetto@secomind.com>

.tool-versions

@@ -1,2 +1,2 @@
-erlang 23.0.2
-elixir 1.11.4-otp-23
+elixir 1.15.7-otp-26
+erlang 26.1

lib/astarte_flow/auth/astarte_public_key_provider.ex

@@ -22,6 +22,8 @@ defmodule Astarte.Flow.Auth.AstartePublicKeyProvider do
   require Logger
 
   alias Astarte.Core.Realm
+  alias Astarte.Core.CQLUtils
+  alias Astarte.AppEngine.API.Config
 
   @impl true
   @spec fetch_public_key(realm :: String.t()) ::
@@ -31,6 +33,8 @@ defmodule Astarte.Flow.Auth.AstartePublicKeyProvider do
   end
 
   defp fetch_realm_public_key(conn, realm_name) do
+    realm_name = CQLUtils.realm_name_to_keyspace_name(realm_name, Config.astarte_instance_id!())
+
     statement = """
     SELECT blobAsVarchar(value)
     FROM :realm_name.kv_store

lib/astarte_flow/config.ex

@@ -130,6 +130,12 @@ defmodule Astarte.Flow.Config do
     os_env: "CASSANDRA_NODES",
     type: XandraNodes
 
+  @envdoc "The astarte instance id to generate keyspaces with"
+  app_env :astarte_instance_id, :astarte_flow, :astarte_instance_id,
+    os_env: "ASTARTE_INSTANCE_ID",
+    default: "",
+    type: :binary
+
   @doc "Returns the default amqp connection parameters"
   @type ssl_option ::
           {:cacertfile, String.t()}

lib/astarte_flow/flows/flow.ex

@@ -206,9 +206,7 @@ defmodule Astarte.Flow.Flows.Flow do
       error ->
         _ =
           Logger.error(
-            "Could not start block #{inspect(block_module)} with opts #{inspect(block_opts)}: #{
-              inspect(error)
-            }"
+            "Could not start block #{inspect(block_module)} with opts #{inspect(block_opts)}: #{inspect(error)}"
           )
 
         {:error, :block_start_failed}

mix.exs

@@ -27,7 +27,7 @@ defmodule Astarte.Flow.MixProject do
     [
       app: :astarte_flow,
       version: "0.1.0",
-      elixir: "~> 1.7",
+      elixir: "~> 1.15",
       start_permanent: Mix.env() == :prod,
       deps: deps(),
       elixirc_paths: elixirc_paths(Mix.env()),
@@ -67,14 +67,14 @@ defmodule Astarte.Flow.MixProject do
   defp deps do
     [
       {:astarte_device, github: "astarte-platform/astarte-device-sdk-elixir"},
-      {:astarte_core, github: "astarte-platform/astarte_core"},
+      {:astarte_core, github: "eddbbt/astarte_core", branch: "keyspace_feature", override: true},
       {:cors_plug, "~> 2.0"},
-      {:cyanide, "~> 1.0"},
+      {:cyanide, "~> 2.0"},
       {:certifi, "~> 2.5"},
       {:tortoise, "~> 0.9"},
       {:elixir_uuid, "~> 1.2"},
       {:excoveralls, "~> 0.10", only: :test},
-      {:exjsonpath, "~> 0.9.0"},
+      {:exjsonpath, [env: :prod, git: "https://github.com/ispirata/exjsonpath.git"]},
       {:exjsontemplate, github: "ispirata/exjsontemplate"},
       {:ex_json_schema, "~> 0.7"},
       {:gen_stage, "~> 0.14"},