chore: add ownership_vouchers table and device ref on all db helpers

eddbbt · eddbbt · commit 439704b08a1d · 2025-10-30T14:30:09.000+01:00
Signed-off-by: Eddy Babetto &lt;eddy.babetto@secomind.com&gt;
diff --git a/apps/astarte_appengine_api/test/support/helpers/database.ex b/apps/astarte_appengine_api/test/support/helpers/database.ex
@@ -107,6 +107,16 @@ defmodule Astarte.Helpers.Database do
   );
   """
 
+  @create_ownership_vouchers_table """
+  CREATE TABLE #{Realm.keyspace_name(@test_realm)}.ownership_vouchers (
+     id uuid,
+     private_key blob,
+     voucher_data blob,
+     expiry timestamp,
+     PRIMARY KEY (id)
+   );
+  """
+
   @create_devices_table """
       CREATE TABLE #{Realm.keyspace_name(@test_realm)}.devices (
         device_id uuid,
@@ -134,6 +144,7 @@ defmodule Astarte.Helpers.Database do
         attributes map<varchar, varchar>,
         groups map<text, timeuuid>,
         capabilities capabilities,
+        ownership_voucher uuid,
 
         PRIMARY KEY (device_id)
       );
@@ -433,6 +444,8 @@ defmodule Astarte.Helpers.Database do
       {:ok, _} ->
         Repo.query!(@create_capabilities_type)
 
+        Repo.query!(@create_ownership_vouchers_table)
+
         Repo.query!(@create_devices_table)
 
         Repo.query!(@create_deletion_in_progress_table)
diff --git a/apps/astarte_appengine_api/test/support/helpers/database_v2.ex b/apps/astarte_appengine_api/test/support/helpers/database_v2.ex
@@ -66,6 +66,15 @@ defmodule Astarte.Helpers.DatabaseV2 do
     purge_properties_compression_format int
   );
   """
+  @create_ownership_vouchers_table """
+  CREATE TABLE :keyspace.ownership_vouchers (
+     id uuid,
+     private_key blob,
+     voucher_data blob,
+     expiry timestamp,
+     PRIMARY KEY (id)
+   );
+  """
 
   @create_devices_table """
   CREATE TABLE :keyspace.devices (
@@ -95,6 +104,7 @@ defmodule Astarte.Helpers.DatabaseV2 do
     capabilities capabilities,
 
     groups map<text, timeuuid>,
+          ownership_voucher uuid,
 
     PRIMARY KEY (device_id)
   )
@@ -247,6 +257,7 @@ defmodule Astarte.Helpers.DatabaseV2 do
     realm_keyspace = Realm.keyspace_name(realm_name)
     execute!(realm_keyspace, @create_keyspace)
     execute!(realm_keyspace, @create_capabilities_type)
+    execute!(realm_keyspace, @create_ownership_vouchers_table)
     execute!(realm_keyspace, @create_devices_table)
     execute!(realm_keyspace, @create_groups_table)
     execute!(realm_keyspace, @create_names_table)
diff --git a/apps/astarte_data_updater_plant/test/support/database_test_helper.ex b/apps/astarte_data_updater_plant/test/support/database_test_helper.ex
@@ -50,6 +50,16 @@ defmodule Astarte.DataUpdaterPlant.DatabaseTestHelper do
     );
   """
 
+  @create_ownership_vouchers_table """
+  CREATE TABLE :keyspace.ownership_vouchers (
+     id uuid,
+     private_key blob,
+     voucher_data blob,
+     expiry timestamp,
+     PRIMARY KEY (id)
+   );
+  """
+
   @create_devices_table """
       CREATE TABLE :keyspace.devices (
         device_id uuid,
@@ -77,6 +87,7 @@ defmodule Astarte.DataUpdaterPlant.DatabaseTestHelper do
         attributes map<varchar, varchar>,
         groups map<text, timeuuid>,
         capabilities capabilities,
+  ownership_voucher uuid,
 
         PRIMARY KEY (device_id)
     );
@@ -366,6 +377,7 @@ defmodule Astarte.DataUpdaterPlant.DatabaseTestHelper do
     case execute(keyspace_name, @create_autotestrealm) do
       {:ok, _} ->
         execute!(keyspace_name, @create_capabilities_type)
+        execute!(keyspace_name, @create_ownership_vouchers_table)
         execute!(keyspace_name, @create_devices_table)
         execute!(keyspace_name, @create_endpoints_table)
 
diff --git a/apps/astarte_data_updater_plant/test/support/helpers/database.ex b/apps/astarte_data_updater_plant/test/support/helpers/database.ex
@@ -70,6 +70,15 @@ defmodule Astarte.Helpers.Database do
     purge_properties_compression_format int
   );
   """
+  @create_ownership_vouchers_table """
+  CREATE TABLE :keyspace.ownership_vouchers (
+     id uuid,
+     private_key blob,
+     voucher_data blob,
+     expiry timestamp,
+     PRIMARY KEY (id)
+   );
+  """
 
   @create_devices_table """
   CREATE TABLE :keyspace.devices (
@@ -96,7 +105,8 @@ defmodule Astarte.Helpers.Database do
     last_credentials_request_ip inet,
     last_seen_ip inet,
     attributes map<varchar, varchar>,
-    capabilities capabilities,
+    capabilities capabilities, 
+    ownership_voucher uuid,
 
     groups map<text, timeuuid>,
 
@@ -305,6 +315,7 @@ defmodule Astarte.Helpers.Database do
     realm_keyspace = Realm.keyspace_name(realm_name)
     execute!(realm_keyspace, @create_keyspace)
     execute!(realm_keyspace, @create_capabilities_type)
+    execute!(realm_keyspace, @create_ownership_vouchers_table)
     execute!(realm_keyspace, @create_devices_table)
     execute!(realm_keyspace, @create_groups_table)
     execute!(realm_keyspace, @create_names_table)
diff --git a/apps/astarte_housekeeping/test/support/helpers/database.ex b/apps/astarte_housekeeping/test/support/helpers/database.ex
@@ -67,6 +67,15 @@ defmodule Astarte.Housekeeping.Helpers.Database do
     purge_properties_compression_format int
   );
   """
+  @create_ownership_vouchers_table """
+  CREATE TABLE :keyspace.ownership_vouchers (
+     id uuid,
+     private_key blob,
+     voucher_data blob,
+     expiry timestamp,
+     PRIMARY KEY (id)
+   );
+  """
 
   @create_devices_table """
   CREATE TABLE :keyspace.devices (
@@ -95,6 +104,7 @@ defmodule Astarte.Housekeeping.Helpers.Database do
     attributes map<varchar, varchar>,
     groups map<text, timeuuid>,
     capabilities capabilities,
+  ownership_voucher uuid,
 
     PRIMARY KEY (device_id)
   )
@@ -325,6 +335,7 @@ defmodule Astarte.Housekeeping.Helpers.Database do
     realm_keyspace = Realm.keyspace_name(realm_name)
     execute(realm_keyspace, @create_keyspace)
     execute(realm_keyspace, @create_capabilities_type)
+    execute(realm_keyspace, @create_ownership_vouchers_table)
     execute(realm_keyspace, @create_devices_table)
     execute(realm_keyspace, @create_groups_table)
     execute(realm_keyspace, @create_names_table)
diff --git a/apps/astarte_pairing/lib/astarte_pairing/fdo/voucher_manager.ex b/apps/astarte_pairing/lib/astarte_pairing/fdo/voucher_manager.ex
@@ -23,7 +23,7 @@ defmodule Astarte.Pairing.FDO.VoucherManager do
   def save_voucher(realm_name, voucher_blob, pkey_blob) do
     with {:ok, inserted_voucher} <-
            Queries.create_ownership_voucher(realm_name, voucher_blob, pkey_blob),
-         {:ok, device_guuid} <- extract_device_guuid_from_voucher_data(voucher_blob),
+        {:ok, device_guuid } <- extract_device_guuid_from_voucher_data(voucher_blob),
          {:ok, _} <-
            Queries.update_device_registration_voucher(
              realm_name,
@@ -38,14 +38,14 @@ defmodule Astarte.Pairing.FDO.VoucherManager do
     with {:ok, cbor_data} <- clean_and_b64_decode_voucher_blob(voucher_blob),
          {:ok, decoded_voucher, _rest} <- cbor_data |> CBOR.decode(),
          {:ok, decoded_header, _rest} <- extract_and_decode_voucher_header(decoded_voucher) do
-      device_guid_binary = device_id_from_header(decoded_header)
+         device_guid_binary = device_id_from_header(decoded_header)
       {:ok, UUID.binary_to_string!(device_guid_binary)}
     else
       error ->
         "error extracting device guid from ownership voucher: #{inspect(error)}"
         |> Logger.error()
 
-        {:error, error}
+       {:error, error}
     end
   end
 
diff --git a/apps/astarte_pairing/test/support/helpers/database.ex b/apps/astarte_pairing/test/support/helpers/database.ex
@@ -73,7 +73,15 @@ defmodule Astarte.Helpers.Database do
     purge_properties_compression_format int
   );
   """
-
+  @create_ownership_vouchers_table """
+  CREATE TABLE :keyspace.ownership_vouchers (
+     id uuid,
+     private_key blob,
+     voucher_data blob,
+     expiry timestamp,
+     PRIMARY KEY (id)
+   );
+  """
   @create_devices_table """
   CREATE TABLE :keyspace.devices (
     device_id uuid,
@@ -102,6 +110,7 @@ defmodule Astarte.Helpers.Database do
     capabilities capabilities,
 
     groups map<text, timeuuid>,
+     ownership_voucher uuid,
 
     PRIMARY KEY (device_id)
   )
@@ -284,6 +293,7 @@ defmodule Astarte.Helpers.Database do
     realm_keyspace = Realm.keyspace_name(realm_name)
     execute!(realm_keyspace, @create_keyspace)
     execute!(realm_keyspace, @create_capabilities_type)
+    execute!(realm_keyspace, @create_ownership_vouchers_table)
     execute!(realm_keyspace, @create_devices_table)
     execute!(realm_keyspace, @create_groups_table)
     execute!(realm_keyspace, @create_names_table)
diff --git a/apps/astarte_realm_management/test/support/helpers/database.ex b/apps/astarte_realm_management/test/support/helpers/database.ex
@@ -66,7 +66,15 @@ defmodule Astarte.Helpers.Database do
     purge_properties_compression_format int
   );
   """
-
+  @create_ownership_vouchers_table """
+  CREATE TABLE IF NOT EXISTS :keyspace.ownership_vouchers (
+     id uuid,
+     private_key blob,
+     voucher_data blob,
+     expiry timestamp,
+     PRIMARY KEY (id)
+   );
+  """
   @create_devices_table """
   CREATE TABLE IF NOT EXISTS :keyspace.devices (
     device_id uuid,
@@ -93,8 +101,8 @@ defmodule Astarte.Helpers.Database do
     last_seen_ip inet,
     attributes map<varchar, varchar>,
     capabilities capabilities,
-
     groups map<text, timeuuid>,
+         ownership_voucher uuid,
 
     PRIMARY KEY (device_id)
   )
@@ -262,6 +270,7 @@ defmodule Astarte.Helpers.Database do
     realm_keyspace = Realm.keyspace_name(realm_name)
     execute!(realm_keyspace, @create_keyspace)
     execute!(realm_keyspace, @create_capabilities_type)
+    execute!(realm_keyspace, @create_ownership_vouchers_table)
     execute!(realm_keyspace, @create_devices_table)
     execute!(realm_keyspace, @create_groups_table)
     execute!(realm_keyspace, @create_names_table)
diff --git a/apps/astarte_trigger_engine/test/support/helpers/database.ex b/apps/astarte_trigger_engine/test/support/helpers/database.ex
@@ -66,6 +66,16 @@ defmodule Astarte.Helpers.Database do
   );
   """
 
+  @create_ownership_vouchers_table """
+  CREATE TABLE :keyspace.ownership_vouchers (
+     id uuid,
+     private_key blob,
+     voucher_data blob,
+     expiry timestamp,
+     PRIMARY KEY (id)
+   );
+  """
+
   @create_devices_table """
   CREATE TABLE :keyspace.devices (
     device_id uuid,
@@ -92,8 +102,8 @@ defmodule Astarte.Helpers.Database do
     last_seen_ip inet,
     attributes map<varchar, varchar>,
     capabilities capabilities,
-
     groups map<text, timeuuid>,
+         ownership_voucher uuid,
 
     PRIMARY KEY (device_id)
   )
@@ -223,6 +233,7 @@ defmodule Astarte.Helpers.Database do
     realm_keyspace = Realm.keyspace_name(realm_name)
     execute!(realm_keyspace, @create_keyspace)
     execute!(realm_keyspace, @create_capabilities_type)
+    execute!(realm_keyspace, @create_ownership_vouchers_table)
     execute!(realm_keyspace, @create_devices_table)
     execute!(realm_keyspace, @create_groups_table)
     execute!(realm_keyspace, @create_names_table)
diff --git a/libs/astarte_data_access/test/support/database_test_helper.exs b/libs/astarte_data_access/test/support/database_test_helper.exs
@@ -57,6 +57,17 @@ defmodule Astarte.DataAccess.DatabaseTestHelper do
     );
   """
 
+  @create_ownership_vouchers_table """
+  CREATE TABLE :keyspace.ownership_vouchers (
+     id uuid,
+     private_key blob,
+     voucher_data blob,
+     expiry timestamp,
+     PRIMARY KEY (id)
+   );
+  
+  """
+  
   @create_devices_table """
       CREATE TABLE autotestrealm.devices (
         device_id uuid,
@@ -83,7 +94,8 @@ defmodule Astarte.DataAccess.DatabaseTestHelper do
         last_seen_ip inet,
         attributes map<varchar, varchar>,
         groups map<text, timeuuid>,
-
+    ownership_voucher uuid,
+    
         PRIMARY KEY (device_id)
       );
   """
@@ -403,6 +415,7 @@ defmodule Astarte.DataAccess.DatabaseTestHelper do
   def create_test_keyspace(conn) do
     case Xandra.execute(conn, @create_autotestrealm) do
       {:ok, _} ->
+        Xandra.execute!(conn, @create_ownership_vouchers_table)
         Xandra.execute!(conn, @create_devices_table)
         Xandra.execute!(conn, @create_names_table)
         Xandra.execute!(conn, @create_kv_store)
diff --git a/tools/astarte_export/test/database_test.exs b/tools/astarte_export/test/database_test.exs
@@ -34,7 +34,17 @@ defmodule Astarte.DatabaseTestdata do
       PRIMARY KEY ((group_name), insertion_uuid, device_id)
     );
   """
-
+  
+  @create_ownership_vouchers_table """
+  CREATE TABLE :keyspace.ownership_vouchers (
+     id uuid,
+     private_key blob,
+     voucher_data blob,
+     expiry timestamp,
+     PRIMARY KEY (id)
+   );
+  """
+  
   @create_devices_table """
     CREATE TABLE test.devices (
     device_id uuid PRIMARY KEY,
@@ -59,7 +69,8 @@ defmodule Astarte.DatabaseTestdata do
     pending_empty_cache boolean,
     protocol_revision int,
     total_received_bytes bigint,
-    total_received_msgs bigint
+    total_received_msgs bigint,
+    ownership_voucher uuid,
   )
   """
   @create_interfaces_table """
@@ -336,6 +347,7 @@ defmodule Astarte.DatabaseTestdata do
       @create_kv_store,
       @create_names_table,
       @create_groups_table,
+      @create_ownership_vouchers_table,
       @create_devices_table,
       @create_interfaces_table,
       @create_endpoints_table,
