AstarteImport: Add support for db_host_port argument

Updated Astarte.Import to accept db_host_and_port as the argument

Updated CLI.main/3 to receive and handle db_host_and_port

Improved flexibility in database configuration by allowing direct host and port specification

Add test for Cassandra import with db_host_and_port

Signed-off-by: Jusuf <jusuf.avdic@secomind.com>

Author: Jusuf95

tools/astarte_import/README.md

@@ -11,7 +11,7 @@ docker run -e CASSANDRA_DB_HOST=127.0.0.1 -e CASSANDRA_DB_PORT=9042 \
 Command to run data import:
 
 ```bash
-mix astarte.import <realm> <xml file>
+mix astarte.import <realm> <xml file> <db_host_and_port>
 ```
 
 ```xml

tools/astarte_import/lib/astarte/import/cli.ex

@@ -22,7 +22,7 @@ defmodule Astarte.Import.CLI do
 
   @chunk_size 4096
 
-  def main([realm, file_name]) do
+  def main(realm, file_name, opts \\ []) do
     with {:started, {:ok, _}} <- {:started, Application.ensure_all_started(:astarte_import)},
          true <- String.valid?(realm),
          true <- String.valid?(file_name),
@@ -38,7 +38,7 @@ defmodule Astarte.Import.CLI do
       end
 
       # Call the populate function with the necessary arguments
-      PopulateDB.populate(realm, data, more_data)
+      PopulateDB.populate(realm, data, more_data, opts)
     else
       error ->
         Logger.error("Failed to start import: #{inspect(error)}")

tools/astarte_import/lib/astarte/import/populatedb.ex

@@ -41,11 +41,21 @@ defmodule Astarte.Import.PopulateDB do
     ]
   end
 
-  def populate(realm, xml, continuation_fun \\ :undefined) do
+  def populate(realm, xml, continuation_fun \\ :undefined, opts \\ []) do
     Logger.info("Import started.", realm: realm)
 
-    nodes = Application.get_env(:cqerl, :cassandra_nodes)
-    {host, port} = Enum.random(nodes)
+    db_host_and_port = opts[:db_host_and_port]
+
+    [host, port] =
+      case db_host_and_port do
+        nil ->
+          nodes = Application.get_env(:cqerl, :cassandra_nodes)
+          Enum.random(nodes) |> Tuple.to_list()
+
+        _ ->
+          String.split(db_host_and_port, ":")
+      end
+
     Logger.info("Connecting to #{host}:#{port} cassandra database.", realm: realm)
 
     {:ok, xandra_conn} = Xandra.start_link(nodes: ["#{host}:#{port}"])

tools/astarte_import/lib/mix/tasks/astarte_import.ex

@@ -28,7 +28,33 @@ defmodule Mix.Tasks.Astarte.Import do
         opts = [strategy: :one_for_one, name: AstarteImport.Supervisor]
         Supervisor.start_link(children, opts)
 
-        CLI.main([realm, file_name])
+        CLI.main(realm, file_name)
+
+      [realm, file_name, db_host_and_port] ->
+        Config.validate!()
+
+        xandra_options = Config.xandra_options!()
+
+        xandra_options =
+          if Keyword.has_key?(xandra_options, :nodes),
+            do: Keyword.put(xandra_options, :nodes, [db_host_and_port]),
+            else: xandra_options
+
+        data_access_opts = [xandra_options: xandra_options]
+
+        ae_xandra_opts = Keyword.put(xandra_options, :name, :xandra)
+
+        children = [
+          # Ensure the :astarte_data_access process is started
+          {Xandra.Cluster, ae_xandra_opts},
+          {Astarte.DataAccess, data_access_opts}
+        ]
+
+        opts = [strategy: :one_for_one, name: AstarteImport.Supervisor]
+        Supervisor.start_link(children, opts)
+
+        opts_host_and_port = [db_host_and_port: db_host_and_port]
+        CLI.main(realm, file_name, opts_host_and_port)
 
       _ ->
         Logger.info("Usage: mix astarte.import <realm> <file_name>")

tools/astarte_import/test/astarte/populatedb_test.exs

@@ -21,6 +21,7 @@ defmodule Astarte.PopulateDBTest do
   alias Astarte.Import.PopulateDB
 
   @realm "test"
+  @db_host_and_port "localhost:9042"
 
   @xml """
   <?xml version="1.0" encoding="UTF-8"?>
@@ -79,4 +80,8 @@ defmodule Astarte.PopulateDBTest do
   test "Test import into Cassandra database" do
     PopulateDB.populate(@realm, @xml)
   end
+
+  test "Test import into Cassandra database using db_host_and_port" do
+    PopulateDB.populate(@realm, @xml, @db_host_and_port)
+  end
 end