refactor: make list keys return the list of keys (#1866)

previously it was returning the response body as a whole

Signed-off-by: Francesco Noacco <francesco.noacco@secomind.com>
Co-authored-by: nedimtokic <64848448+nedimtokic@users.noreply.github.com>

Author: noaccOS

apps/astarte_pairing/lib/astarte_pairing/fdo/open_bao/core.ex

@@ -253,16 +253,22 @@ defmodule Astarte.Pairing.FDO.OpenBao.Core do
     end
   end
 
-  @spec list_keys(String.t()) ::
-          :error | {:error, Jason.DecodeError.t()} | {:ok, any()}
+  @spec list_keys(String.t()) :: {:ok, [String.t()]} | :error
   def list_keys(namespace) do
     headers = [{"Content-Type", "application/json"}]
 
     options = [{:namespace, namespace}]
 
     case Client.list("/transit/keys", headers, options) do
       {:ok, %HTTPoison.Response{status_code: 200, body: resp_body}} ->
-        parse_json_data(resp_body)
+        case parse_data_key(resp_body, "keys") do
+          {:ok, keys} ->
+            {:ok, keys}
+
+          {:error, reason} ->
+            Logger.error("Encountered error while getting keys list: #{inspect(reason)}")
+            :error
+        end
 
       {:ok, %HTTPoison.Response{status_code: 404}} ->
         {:ok, []}

apps/astarte_pairing/lib/astarte_pairing/fdo/open_bao/open_bao.ex

@@ -37,7 +37,7 @@ defmodule Astarte.Pairing.FDO.OpenBao do
     end
   end
 
-  @spec list_keys_names() :: {:ok, map()} | :error
+  @spec list_keys_names() :: {:ok, [String.t()]} | :error
   def list_keys_names(opts \\ []) do
     namespace = Keyword.fetch!(opts, :namespace)
 

apps/astarte_pairing/test/astarte_pairing/fdo/open_bao/open_bao_test.exs

@@ -408,7 +408,7 @@ defmodule Astarte.Pairing.FDO.OpenBaoTest do
                "allow_plaintext_backup" => ^allow_key_export_and_backup
              } = key_data2
 
-      assert {:ok, %{"keys" => [key_name, key_name1, key_name2]}} == OpenBao.list_keys_names(opts)
+      assert {:ok, [key_name, key_name1, key_name2]} == OpenBao.list_keys_names(opts)
     end
 
     @tag key_type: :es384
@@ -446,7 +446,7 @@ defmodule Astarte.Pairing.FDO.OpenBaoTest do
                "allow_plaintext_backup" => ^allow_key_export_and_backup
              } = key_data2
 
-      assert {:ok, %{"keys" => [key_name, key_name1, key_name2]}} == OpenBao.list_keys_names(opts)
+      assert {:ok, [key_name, key_name1, key_name2]} == OpenBao.list_keys_names(opts)
     end
 
     @tag key_type: :rs256
@@ -484,7 +484,7 @@ defmodule Astarte.Pairing.FDO.OpenBaoTest do
                "allow_plaintext_backup" => ^allow_key_export_and_backup
              } = key_data2
 
-      assert {:ok, %{"keys" => [key_name, key_name1, key_name2]}} == OpenBao.list_keys_names(opts)
+      assert {:ok, [key_name, key_name1, key_name2]} == OpenBao.list_keys_names(opts)
     end
 
     @tag key_type: :rs384
@@ -522,7 +522,7 @@ defmodule Astarte.Pairing.FDO.OpenBaoTest do
                "allow_plaintext_backup" => ^allow_key_export_and_backup
              } = key_data2
 
-      assert {:ok, %{"keys" => [key_name, key_name1, key_name2]}} == OpenBao.list_keys_names(opts)
+      assert {:ok, [key_name, key_name1, key_name2]} == OpenBao.list_keys_names(opts)
     end
   end