Merge pull request #804 from uptane/merge-upstream

Merge upstream
uptane · Sep 5, 2024 · a0816db · a0816db
2 parents d86837e + 888179a
commit a0816db
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...ver/src/main/scala/com/advancedtelematic/libtuf_server/repo/client/ReposerverClient.scala b/...ver/src/main/scala/com/advancedtelematic/libtuf_server/repo/client/ReposerverClient.scala
@@ -269,6 +269,8 @@ trait ReposerverClient {
 
   def fetchDelegationsInfo(namespace: Namespace): Future[Map[DelegatedRoleName, DelegationInfo]]
   def refreshDelegatedRole(namespace: Namespace, fileName: DelegatedRoleName): Future[Unit]
+
+  def hardwareIdsWithPackages(namespace: Namespace): Future[PaginationResult[HardwareIdentifier]]
 }
 
 object ReposerverHttpClient extends ServiceHttpClientSupport {
@@ -815,4 +817,10 @@ class ReposerverHttpClient(reposerverUri: Uri,
     }
   }
 
+  override def hardwareIdsWithPackages(
+    namespace: Namespace): Future[PaginationResult[HardwareIdentifier]] = {
+    val req = HttpRequest(HttpMethods.GET, uri = apiV2Uri(Path(s"user_repo/hardwareids-packages")))
+    execHttpUnmarshalledWithNamespace[PaginationResult[HardwareIdentifier]](namespace, req).ok
+  }
+
 }
diff --git a/libtuf/src/main/scala/com/advancedtelematic/libtuf/data/ClientDataType.scala b/libtuf/src/main/scala/com/advancedtelematic/libtuf/data/ClientDataType.scala
@@ -277,7 +277,7 @@ object ClientDataType {
 
   case class PubKeyInfo(pubkey: String, meta: Option[PubKeyMeta])
 
-  case class PubKeyMeta(name: String)
+  case class PubKeyMeta(name: Option[String])
 
   trait EnumeratumUnmarshaller[T <: EnumEntry] { this: Enum[T] =>