Update scalafmt-core to 3.8.5

.git-blame-ignore-revs

@@ -6,3 +6,6 @@
 
 # Scala Steward: Reformat with scalafmt 3.8.3
 1b46d1df04b53c9969027c1b4da33c0d47d11bd6
+
+# Scala Steward: Reformat with scalafmt 3.8.5
+893da8af99210d857f138f93529f6380a7293816

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.8.3
+version = 3.8.5
 runner.dialect = Scala213Source3
 maxColumn = 100
 indent.defnSite = 2

cli/src/main/scala/com/advancedtelematic/tuf/cli/Cli.scala

@@ -215,9 +215,8 @@ object Cli extends App with VersionInfo {
         "The directory that you want to work with. By default, it is your current working directory."
       )
 
-    opt[Unit]("verbose").text("Prints the verbose information for the execution.").action {
-      (_, c) =>
-        c.copy(verbose = true)
+    opt[Unit]("verbose").text("Prints the verbose information for the execution.").action { (_, c) =>
+      c.copy(verbose = true)
     }
 
     version("version").text("Prints the current binary version.")

keyserver/src/test/scala/com/advancedtelematic/tuf/keyserver/http/RootRoleResourceSpec.scala

@@ -185,10 +185,7 @@ class RootRoleResourceSpec
       .futureValue
       .map(_.status) should contain only KeyGenRequestStatus.ERROR
 
-    Put(
-      apiUri(s"root/${repoId.show}"),
-      ClientRootGenRequest(keyType = keyType)
-    ) ~> routes ~> check {
+    Put(apiUri(s"root/${repoId.show}"), ClientRootGenRequest(keyType = keyType)) ~> routes ~> check {
       status shouldBe StatusCodes.OK
     }
 

reposerver/src/main/scala/com/advancedtelematic/tuf/reposerver/delegations/RemoteDelegationClient.scala

@@ -55,9 +55,8 @@ class HttpRemoteDelegationClient()(implicit val ec: ExecutionContext, system: Ac
     um.apply(entity)
       .recoverWith { case err =>
         if (log.isDebugEnabled) {
-          unmarshallStringOrError(entity).recover { case err => err.getMessage }.foreach {
-            payload =>
-              log.warn("Could not unmarshall remote response. Response was: " + payload)
+          unmarshallStringOrError(entity).recover { case err => err.getMessage }.foreach { payload =>
+            log.warn("Could not unmarshall remote response. Response was: " + payload)
           }
         }
 

reposerver/src/main/scala/com/advancedtelematic/tuf/reposerver/http/PackageSearch.scala

@@ -260,7 +260,7 @@ class PackageSearch()(implicit db: Database) {
 
   }
 
-   def hardwareIdsWithPackages(repoId: RepoId): Future[Seq[HardwareIdentifier]] = {
+  def hardwareIdsWithPackages(repoId: RepoId): Future[Seq[HardwareIdentifier]] = {
     implicit val getResult: GetResult[HardwareIdentifier] = GetResult.GetString.andThen { str =>
       refineV[ValidHardwareIdentifier](str)
         .valueOr(msg =>

reposerver/src/main/scala/com/advancedtelematic/tuf/reposerver/http/RepoResource.scala

@@ -476,9 +476,7 @@ class RepoResource(keyserverClient: KeyserverClient,
             } ~
             (patch & path(DelegatedRoleNamePath / "info") & entity(as[DelegationInfo])) {
               (delegatedRoleName, delegationInfo) =>
-                onSuccess(
-                  delegations.setDelegationInfo(repoId, delegatedRoleName, delegationInfo)
-                ) {
+                onSuccess(delegations.setDelegationInfo(repoId, delegatedRoleName, delegationInfo)) {
                   complete(StatusCodes.OK)
                 }
             } ~
@@ -671,7 +669,10 @@ class RepoResource(keyserverClient: KeyserverClient,
                   complete(editTargetItem(namespace, repoId, filename, item))
                 }
             } ~
-            withRequestTimeout(userRepoUploadRequestTimeout, timeoutResponseHandler) { // For when SignedPayload[TargetsRole] is too big and takes a long time to upload
+            withRequestTimeout(
+              userRepoUploadRequestTimeout,
+              timeoutResponseHandler
+            ) { // For when SignedPayload[TargetsRole] is too big and takes a long time to upload
               decodeRequest {
                 (pathEnd & put & entity(as[SignedPayload[TargetsRole]])) { signedPayload =>
                   extractRoleChecksumHeader { checksum =>

reposerver/src/test/scala/com/advancedtelematic/tuf/reposerver/http/RepoResourceDelegationsSpec.scala

@@ -73,10 +73,7 @@ class RepoResourceDelegationsSpec
     }
 
   private def addNewTrustedDelegationKeysOK(tufKeys: TufKey*)(implicit repoId: RepoId): Unit =
-    Put(
-      apiUri(s"repo/${repoId.show}/trusted-delegations/keys"),
-      tufKeys.asJson
-    ) ~> routes ~> check {
+    Put(apiUri(s"repo/${repoId.show}/trusted-delegations/keys"), tufKeys.asJson) ~> routes ~> check {
       status shouldBe StatusCodes.NoContent
     }
 

reposerver/src/test/scala/com/advancedtelematic/tuf/reposerver/http/RepoTargetsResourceSpec.scala

@@ -8,7 +8,11 @@ import org.scalatest.OptionValues.*
 import akka.http.scaladsl.model.{HttpEntity, StatusCodes}
 import akka.util.ByteString
 import com.advancedtelematic.libats.data.PaginationResult
-import com.advancedtelematic.tuf.reposerver.util.{RepoResourceDelegationsSpecUtil, ResourceSpec, TufReposerverSpec}
+import com.advancedtelematic.tuf.reposerver.util.{
+  RepoResourceDelegationsSpecUtil,
+  ResourceSpec,
+  TufReposerverSpec
+}
 import com.advancedtelematic.tuf.reposerver.util.NamespaceSpecOps.*
 import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport.*
 import com.advancedtelematic.tuf.reposerver.data.RepoDataType.*
@@ -593,31 +597,40 @@ class RepoTargetsResourceSpec
     }
   }
 
-  testWithRepo("GET hardwareids-packages returns hwids for which there are packages") { implicit ns => implicit repoId =>
-    addTargetToRepo(repoId)
+  testWithRepo("GET hardwareids-packages returns hwids for which there are packages") {
+    implicit ns => implicit repoId =>
+      addTargetToRepo(repoId)
 
-    Put(
-      apiUri("user_repo/targets/mypkg_file?name=library&version=0.0.1&hardwareIds=myid001,myid002"),
-      testEntity
-    ).namespaced ~> routes ~> check {
-      status shouldBe StatusCodes.NoContent
-    }
+      Put(
+        apiUri(
+          "user_repo/targets/mypkg_file?name=library&version=0.0.1&hardwareIds=myid001,myid002"
+        ),
+        testEntity
+      ).namespaced ~> routes ~> check {
+        status shouldBe StatusCodes.NoContent
+      }
 
-    Put(
-      apiUri("user_repo/targets/mypkg_file2?name=library&version=0.0.2&hardwareIds=myid002,myid003"),
-      testEntity2
-    ).namespaced ~> routes ~> check {
-      status shouldBe StatusCodes.NoContent
-    }
+      Put(
+        apiUri(
+          "user_repo/targets/mypkg_file2?name=library&version=0.0.2&hardwareIds=myid002,myid003"
+        ),
+        testEntity2
+      ).namespaced ~> routes ~> check {
+        status shouldBe StatusCodes.NoContent
+      }
 
-    Get(apiUriV2(s"user_repo/hardwareids-packages")).namespaced ~> routes ~> check {
-      status shouldBe StatusCodes.OK
-      val result = responseAs[PaginationResult[HardwareIdentifier]]
-      result.total shouldBe 3
-      result.offset shouldBe 0
-      result.limit shouldBe 3
-      result.values.map(_.value) should contain theSameElementsAs List("myid001", "myid002", "myid003")
-    }
+      Get(apiUriV2(s"user_repo/hardwareids-packages")).namespaced ~> routes ~> check {
+        status shouldBe StatusCodes.OK
+        val result = responseAs[PaginationResult[HardwareIdentifier]]
+        result.total shouldBe 3
+        result.offset shouldBe 0
+        result.limit shouldBe 3
+        result.values.map(_.value) should contain theSameElementsAs List(
+          "myid001",
+          "myid002",
+          "myid003"
+        )
+      }
   }
 
 }