chore: fix merge conflicts and remove old code

  - remove unused variable

  - remove ow table creation from astarte_export

  - fix comments in readme

  - remove duplicates from dup db helper

  - remove old rendezvous config

  - disable port 8080 from docker compose

  - fix e2e workflow

  - removed duplicated create table

  - remove @create_ownership_vouchers_table from services

Signed-off-by: Riccardo Nalgi <riccardo.nalgi@secomind.com>

Author: mizzet1

.github/workflows/astarte-end-to-end-test-workflow.yaml

@@ -32,46 +32,22 @@ env:
 jobs:
   e2e-build:
     uses: ./.github/workflows/astarte-e2e-build-workflow.yaml
-
   astarte-build:
     uses: ./.github/workflows/astarte-build-workflow.yaml
-
   end-to-end-test:
     needs: [e2e-build, astarte-build]
     name: End-to-end Test
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - name: Initialize docker compose files
-        run: docker run -v $(pwd)/compose:/compose astarte/docker-compose-initializer
-      - name: Restore astarte images
-        uses: actions/download-artifact@v4
-        with:
-          # Download all app images; merge them into the same directory for loading
-          pattern: astarte-images-*
-          merge-multiple: true
-          path: ${{ runner.temp }}
-      - name: Restore astarte e2e image
-        uses: actions/download-artifact@v4
-        with:
-          name: astarte-e2e-image
-          path: ${{ runner.temp }}
-      - name: Load astarte images
-        run: ls ${{ runner.temp }}/*.tar | xargs --max-args 1 docker load --input
-      - name: Start all Astarte services
-        run: docker compose up --no-build --pull missing -d
-      - name: Wait for Astarte to come up
-        run: |
-          wget https://github.com/astarte-platform/wait-for-astarte-docker-compose/releases/download/v1.1.0/wait-for-astarte-docker-compose_1.1.0_linux_amd64.tar.gz
-          tar xf wait-for-astarte-docker-compose_1.1.0_linux_amd64.tar.gz
-          ./wait-for-astarte-docker-compose
     - uses: actions/checkout@v2
     - name: Initialize docker compose files
       run: docker run -v $(pwd)/compose:/compose astarte/docker-compose-initializer
     - name: Restore astarte images
       uses: actions/download-artifact@v4
       with:
-        name: astarte-images
+        # Download all app images; merge them into the same directory for loading
+        pattern: astarte-images-*
+        merge-multiple: true
         path: ${{ runner.temp }}
     - name: Restore astarte e2e image
       uses: actions/download-artifact@v4
@@ -81,16 +57,16 @@ jobs:
     - name: Load astarte images
       run: ls ${{ runner.temp }}/*.tar | xargs --max-args 1 docker load --input
     - name: Start all Astarte services
-      run: docker compose up -d
+      run: docker compose up --no-build --pull missing -d
     - name: Wait for Astarte to come up
       run: |
         wget https://github.com/astarte-platform/wait-for-astarte-docker-compose/releases/download/v1.1.0/wait-for-astarte-docker-compose_1.1.0_linux_amd64.tar.gz
         tar xf wait-for-astarte-docker-compose_1.1.0_linux_amd64.tar.gz
         ./wait-for-astarte-docker-compose
     - name: Install astartectl
       run: |
-        wget https://github.com/astarte-platform/astartectl/releases/download/v22.11.02/astartectl_22.11.02_linux_x86_64.tar.gz
-        tar xf astartectl_22.11.02_linux_x86_64.tar.gz
+        wget https://github.com/astarte-platform/astartectl/releases/download/v24.5.3/astartectl_24.5.3_linux_x86_64.tar.gz
+        tar xf astartectl_24.5.3_linux_x86_64.tar.gz
         chmod +x astartectl
     - name: Generate realm keypair and JWT
       run: |
@@ -116,12 +92,12 @@ jobs:
         E2E_MAILER_TO_ADDRESS: mail@example.com
         E2E_MAIL_SUBJECT: "Subj: Astarte Notification"
       run: |
-       docker run \
-        -e E2E_REALM_PUBLIC_KEY_PEM="$(cat ../../test_public.pem)" \
-        --env-file=<(env | grep '^E2E_' | grep -v '^E2E_REALM_PUBLIC_KEY_PEM=') \
-        --network astarte \
-        --hostname "$E2E_HOST" \
-        astarte-e2e
+        docker run \
+          -e E2E_REALM_PUBLIC_KEY_PEM="$(cat ../../test_public.pem)" \
+          --env-file=<(env | grep '^E2E_' | grep -v '^E2E_REALM_PUBLIC_KEY_PEM=') \
+          --network astarte \
+          --hostname "$E2E_HOST" \
+          astarte-e2e
     - name: Check Docker
       if: ${{ failure() }}
       run: docker compose logs
@@ -141,44 +117,9 @@ jobs:
       - uses: ./.github/actions/install-deps
       - name: Install astartectl
         run: |
-          wget https://github.com/astarte-platform/astartectl/releases/download/v22.11.02/astartectl_22.11.02_linux_x86_64.tar.gz
-          tar xf astartectl_22.11.02_linux_x86_64.tar.gz
+          wget https://github.com/astarte-platform/astartectl/releases/download/v24.5.3/astartectl_24.5.3_linux_x86_64.tar.gz
+          tar xf astartectl_24.5.3_linux_x86_64.tar.gz
           chmod +x astartectl
-      - name: Generate realm keypair and JWT
-        run: |
-          ./astartectl utils gen-keypair test
-          E2E_HOUSEKEEPING_API_JWT=$(./astartectl utils gen-jwt housekeeping -k compose/astarte-keys/housekeeping_private.pem)
-          echo "E2E_HOUSEKEEPING_API_JWT=$E2E_HOUSEKEEPING_API_JWT" >> $GITHUB_ENV
-      - name: Generate JWT
-        run: |
-          JWT=$(./astartectl utils gen-jwt appengine channels pairing realm-management -k test_private.pem)
-          echo "E2E_JWT=$JWT" >> $GITHUB_ENV
-      - name: Run Astarte E2E
-        working-directory: tools/astarte_e2e
-        env:
-          E2E_HOST: "astarte-e2e"
-          E2E_PAIRING_URL: http://api.astarte.localhost/pairing
-          E2E_APPENGINE_URL: http://api.astarte.localhost/appengine
-          E2E_HOUSEKEEPING_URL: http://api.astarte.localhost/housekeeping
-          E2E_REALM_MANAGEMENT_URL: http://api.astarte.localhost/realmmanagement
-          E2E_AMQP_CONSUMER_HOST: rabbitmq
-          E2E_IGNORE_SSL_ERRORS: true
-          E2E_CHECK_INTERVAL_SECONDS: 5
-          E2E_CHECK_REPETITIONS: 5
-          E2E_MAILER_TO_ADDRESS: mail@example.com
-          E2E_MAIL_SUBJECT: "Subj: Astarte Notification"
-        run: |
-          docker run \
-           -e E2E_REALM_PUBLIC_KEY_PEM="$(cat ../../test_public.pem)" \
-           --env-file=<(env | grep '^E2E_' | grep -v '^E2E_REALM_PUBLIC_KEY_PEM=') \
-           --network astarte \
-           --hostname "$E2E_HOST" \
-           astarte-e2e
-      - name: Check Docker
-        if: ${{ failure() }}
-        run: docker compose logs
-      - name: Bring down Astarte docker-compose
-        run: docker compose down
           mkdir -p ${{ runner.temp }}/bin
           mv ./astartectl ${{ runner.temp }}/bin
           echo ${{ runner.temp }}/bin >> "$GITHUB_PATH"
@@ -189,23 +130,25 @@ jobs:
         name: checkout astarte
         with:
           path: .tmp/repos/astarte
+      - name: Initialize docker compose files
+        working-directory: .tmp/repos/astarte
+        run: docker run -v $(pwd)/compose:/compose astarte/docker-compose-initializer
       - name: Restore astarte images
         uses: actions/download-artifact@v4
         with:
-          name: astarte-images
+          pattern: astarte-images-*
+          merge-multiple: true
           path: ${{ runner.temp }}
-      - name: Initialize keys
-        working-directory: .tmp/repos/astarte
-        run: |
-          docker run -v $(pwd)/compose:/compose astarte/docker-compose-initializer
-          astartectl utils gen-keypair test
       - name: Load astarte images
         run: ls ${{ runner.temp }}/*.tar | xargs --max-args 1 docker load --input
+      - name: Initialize keys
+        working-directory: .tmp/repos/astarte
+        run: astartectl utils gen-keypair test
       - name: Enable FDO
         run: echo "PAIRING_ENABLE_FDO=true" >> .tmp/repos/astarte/.env
       - name: Start all Astarte services
         working-directory: .tmp/repos/astarte
-        run: docker compose up -d
+        run: docker compose up --no-build --pull missing -d
       - uses: actions-rust-lang/setup-rust-toolchain@v1.15.2
       - uses: mozilla-actions/sccache-action@v0.0.9
       - name: Cache container build

CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
+- [astarte_pairing] FDO authentication (EXPERIMENTAL feature, disabled by default). New environment variables are needed in order to use FDO:
+  - `PAIRING_ENABLE_FDO` - whether the FDO feature is enabled or not (default: false)
+  - `PAIRING_FDO_RENDEZVOUS_URL` - URL of the rendezvous server (default: "http://rendezvous:8041")
+  - `ASTARTE_BASE_URL_DOMAIN` - domain part of the base URL of astarte, used by devices to connect in TO2 phase (required if FDO enabled)
+  - `ASTARTE_BASE_URL_PORT` - port of the base URL of astarte (required if FDO enabled)
+  - `ASTARTE_BASE_URL_PROTOCOL` - protocol of the base URL of astarte (required if FDO enabled)
+
 - [astarte_housekeeping] AMQP management configuration moved to `astarte_events` library. Environment variables changed:
   - `HOUSEKEEPING_AMQP_SSL_ENABLED` is now `ASTARTE_EVENTS_AMQP_MANAGEMENT_SSL_ENABLED`
   - `HOUSEKEEPING_AMQP_SSL_CA_FILE` is now `ASTARTE_EVENTS_AMQP_MANAGEMENT_SSL_CA_FILE`
@@ -21,15 +28,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [1.3.0-rc.1] - 2026-01-26
 
-## [1.3.0] - Unreleased
-- [astarte_pairing] FDO authentication (EXPERIMENTAL feature, disabled by default). New environment variables are needed in order to use FDO:
-  - `PAIRING_ENABLE_FDO` - whether the FDO feature is enabled or not (default: false)
-  - `PAIRING_FDO_RENDEZVOUS_URL` - URL of the rendezvous server (default: "http://rendezvous:8041")
-  - `ASTARTE_BASE_URL_DOMAIN` - domain part of the base URL of astarte, used by devices to connect in TO2 phase (required if FDO enabled)
-  - `ASTARTE_BASE_URL_PORT` - port of the base URL of astarte (required if FDO enabled)
-  - `ASTARTE_BASE_URL_PROTOCOL` - protocol of the base URL of astarte (required if FDO enabled)
-
-## [1.3.0-rc.0] - 2025-11-21
 ### Added
 
 - New environment variables for trigger notifications between realm management replicas and realm management -> pairing. These variables are currently being used only by realm management

apps/astarte_appengine_api/test/support/helpers/database.ex

@@ -109,15 +109,6 @@ defmodule Astarte.Helpers.Database do
   );
   """
 
-  @create_ownership_vouchers_table """
-  CREATE TABLE #{Realm.keyspace_name(@test_realm)}.ownership_vouchers (
-     private_key blob,
-     voucher_data blob,
-     device_id uuid,
-     PRIMARY KEY (device_id, voucher_data)
-   );
-  """
-
   @create_devices_table """
       CREATE TABLE #{Realm.keyspace_name(@test_realm)}.devices (
         device_id uuid,
@@ -444,8 +435,6 @@ 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)

apps/astarte_appengine_api/test/support/helpers/database_v2.ex

@@ -69,15 +69,6 @@ defmodule Astarte.Helpers.DatabaseV2 do
   );
   """
 
-  @create_ownership_vouchers_table """
-  CREATE TABLE :keyspace.ownership_vouchers (
-      private_key blob,
-      voucher_data blob,
-      device_id uuid,
-      PRIMARY KEY (device_id, voucher_data)
-   );
-  """
-
   @create_devices_table """
   CREATE TABLE :keyspace.devices (
     device_id uuid,
@@ -258,7 +249,6 @@ 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)

apps/astarte_data_updater_plant/test/support/database_test_helper.ex

@@ -53,15 +53,6 @@ defmodule Astarte.DataUpdaterPlant.DatabaseTestHelper do
     );
   """
 
-  @create_ownership_vouchers_table """
-  CREATE TABLE :keyspace.ownership_vouchers (
-      private_key blob,
-      voucher_data blob,
-      device_id uuid,
-     PRIMARY KEY (device_id, voucher_data)
-   );
-  """
-
   @create_devices_table """
       CREATE TABLE :keyspace.devices (
         device_id uuid,
@@ -378,7 +369,6 @@ 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)
 

apps/astarte_data_updater_plant/test/support/helpers/database.ex

@@ -75,15 +75,6 @@ defmodule Astarte.Helpers.Database do
   );
   """
 
-  @create_ownership_vouchers_table """
-  CREATE TABLE :keyspace.ownership_vouchers (
-      private_key blob,
-      voucher_data blob,
-      device_id uuid,
-     PRIMARY KEY (device_id, voucher_data)
-   );
-  """
-
   @create_devices_table """
   CREATE TABLE :keyspace.devices (
     device_id uuid,
@@ -327,19 +318,6 @@ defmodule Astarte.Helpers.Database do
     execute!(realm_keyspace, @create_individual_datastreams_table, [], timeout: 60_000)
     execute!(realm_keyspace, @create_interfaces_table, [], timeout: 60_000)
     execute!(realm_keyspace, @create_deletion_in_progress_table, [], timeout: 60_000)
-    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)
-    execute!(realm_keyspace, @create_kv_store)
-    execute!(realm_keyspace, @create_endpoints_table)
-    execute!(realm_keyspace, @create_simple_triggers_table)
-    execute!(realm_keyspace, @create_individual_properties_table)
-    execute!(realm_keyspace, @create_individual_datastreams_table)
-    execute!(realm_keyspace, @create_interfaces_table)
-    execute!(realm_keyspace, @create_deletion_in_progress_table)
 
     Enum.each(@insert_endpoints, fn query ->
       execute!(realm_keyspace, query, [], timeout: 60_000)

apps/astarte_housekeeping/test/support/helpers/database.ex

@@ -68,15 +68,6 @@ defmodule Astarte.Housekeeping.Helpers.Database do
   );
   """
 
-  @create_ownership_vouchers_table """
-  CREATE TABLE :keyspace.ownership_vouchers (
-      private_key blob,
-      voucher_data blob,
-      guid blob,
-      PRIMARY KEY (guid)
-   );
-  """
-
   @create_devices_table """
   CREATE TABLE :keyspace.devices (
     device_id uuid,
@@ -334,7 +325,6 @@ 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)

apps/astarte_pairing/README.md

@@ -50,26 +50,25 @@ CASSANDRA_NODES=localhost CFSSL_API_URL=http://localhost:8080 mix test
 
 # Test FDO
 
+> The feature is experimental and PAIRING_ENABLE_FDO must be set to true
+
 To test FDO, the manufacturer and Device CA keys are required and
 can be generated from the following tools:
 
-# Generate manufacturer keys
+## Generate manufacturer keys
 docker run --rm \
   -v $(pwd)/compose/fdo-keys:/keys \
   quay.io/fido-fdo/admin-cli:latest \
   generate-key-and-cert manufacturer \
   --destination-dir /keys
 
-# Generate device CA keys
+## Generate device CA keys
 docker run --rm \
   -v $(pwd)/compose/fdo-keys:/keys \
   quay.io/fido-fdo/admin-cli:latest \
   generate-key-and-cert device-ca \
   --destination-dir /keys
 
-# Set permissions
+## Set permissions
 chmod 644 compose/fdo-keys/*.pem
-chmod 600 compose/fdo-keys/*.der
-
-An ownership voucher and owner private key are also required.
-For testing purposes, a mock key and voucher have been stored in the priv folder of the Pairing Service.
+chmod 600 compose/fdo-keys/*.der

apps/astarte_pairing/mix.exs

@@ -96,7 +96,6 @@ defmodule Astarte.Pairing.Mixfile do
       {:telemetry_metrics_prometheus_core, "~> 1.2"},
       {:observer_cli, "~> 1.5"},
       {:cfxxl, github: "ispirata/cfxxl"},
-      {:httpoison, "~> 1.6"},
       {:astarte_data_access, path: astarte_lib("astarte_data_access")},
       {:bcrypt_elixir, "~> 2.2"},
       {:xandra, "~> 0.19"},