chore: prepare 2.50.0 (#1881)

SwissDataScienceCenter · Mar 26, 2024 · 7ad17a9 · 7ad17a9
2 parents f42fdd0 + 3adc1ee
commit 7ad17a9
Show file tree

Hide file tree

Showing 273 changed files with 1,026 additions and 723 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -27,3 +27,6 @@ b20f0ba57795f003fe4d90817422e14b880d6c8c
 
 # Scala Steward: Reformat with scalafmt 3.7.17
 36c18f272a4da509eb66c4202092999ea16729c9
+
+# Scala Steward: Reformat with scalafmt 3.8.0
+93723c9288ab908e5c91508441973babcd4d5e33
diff --git a/.github/workflows/acceptance-tests.yaml b/.github/workflows/acceptance-tests.yaml
@@ -29,7 +29,7 @@ jobs:
       extra-values: ${{ steps.deploy-comment.outputs.extra-values}}
     steps:
       - id: deploy-comment
-        uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.9.0
+        uses: SwissDataScienceCenter/renku-actions/check-pr-description@v1.11.0
         with:
           string: /deploy
           pr_ref: ${{ github.event.number }}
@@ -42,7 +42,7 @@ jobs:
       name: renku-ci-gr-${{ github.event.number }}
     steps:
       - name: deploy-pr
-        uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.9.0
+        uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.11.0
         env:
           DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
           DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
@@ -86,7 +86,7 @@ jobs:
     if: github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true'
     needs: [check-deploy, deploy-pr]
     steps:
-      - uses: SwissDataScienceCenter/renku-actions/test-renku@v1.9.0
+      - uses: SwissDataScienceCenter/renku-actions/test-renku@v1.11.0
         with:
           kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
           renku-release: renku-ci-gr-${{ github.event.number }}
@@ -115,7 +115,7 @@ jobs:
     steps:
       - name: Extract Renku repository reference
         run: echo "RENKU_REFERENCE=`echo '${{ needs.check-deploy.outputs.renku }}' | cut -d'@' -f2`" >> $GITHUB_ENV
-      - uses: SwissDataScienceCenter/renku-actions/test-renku-cypress@v1.9.0
+      - uses: SwissDataScienceCenter/renku-actions/test-renku-cypress@v1.11.0
         with:
           e2e-target: ${{ matrix.tests }}
           renku-reference: ${{ env.RENKU_REFERENCE }}
@@ -128,7 +128,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: renku teardown
-        uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.9.0
+        uses: SwissDataScienceCenter/renku-actions/cleanup-renku-ci-deployments@v1.11.0
         env:
           HELM_RELEASE_REGEX: "^renku-ci-gr-${{ github.event.number }}$"
           GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}

diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
@@ -101,7 +101,7 @@ jobs:
       name: renku-kg-dev
     steps:
       - name: Deploy to renku-kg-dev
-        uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.9.0
+        uses: SwissDataScienceCenter/renku-actions/deploy-renku@v1.11.0
         env:
           DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
           DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
@@ -125,7 +125,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs: deploy-to-graph
     steps:
-      - uses: SwissDataScienceCenter/renku-actions/test-renku@v1.9.0
+      - uses: SwissDataScienceCenter/renku-actions/test-renku@v1.11.0
         with:
           kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
           renku-release: renku-kg-dev

diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml
@@ -107,12 +107,12 @@ jobs:
           echo "GIT_USER=Renku Bot" >> $GITHUB_ENV
           echo "[email protected]" >> $GITHUB_ENV
       - name: Build and push images and chart
-        uses: SwissDataScienceCenter/renku-actions/publish-chartpress-images@v1.9.0
+        uses: SwissDataScienceCenter/renku-actions/publish-chartpress-images@v1.11.0
         env:
           DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
       - name: Update component version
-        uses: SwissDataScienceCenter/renku-actions/update-component-version@v1.9.0
+        uses: SwissDataScienceCenter/renku-actions/update-component-version@v1.11.0
         env:
           COMPONENT_NAME: renku-graph
           GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.17"
+version = "3.8.0"
 
 runner.dialect = scala213
 

diff --git a/acceptance-tests/src/test/scala/io/renku/graph/acceptancetests/ReProvisioningSpec.scala b/acceptance-tests/src/test/scala/io/renku/graph/acceptancetests/ReProvisioningSpec.scala
@@ -22,7 +22,8 @@ import data._
 import flows.TSProvisioning
 import io.circe.Json
 import io.renku.config.ServiceVersion
-import io.renku.generators.CommonGraphGenerators.{authUsers, serviceVersions}
+import io.renku.config.ConfigGenerators.serviceVersions
+import io.renku.generators.CommonGraphGenerators.authUsers
 import io.renku.generators.Generators.Implicits._
 import io.renku.generators.Generators.nonEmptyStrings
 import io.renku.graph.model.EventsGenerators.commitIds

diff --git a/...ts/src/test/scala/io/renku/graph/acceptancetests/knowledgegraph/DatasetsApiEncoders.scala b/...ts/src/test/scala/io/renku/graph/acceptancetests/knowledgegraph/DatasetsApiEncoders.scala
@@ -25,7 +25,8 @@ import io.circe.{Encoder, Json}
 import io.renku.graph.acceptancetests.data._
 import io.renku.graph.acceptancetests.tooling.AcceptanceSpec
 import io.renku.graph.model.testentities.{Dataset, Person}
-import io.renku.graph.model.{GitLabUrl, datasets, projects}
+import io.renku.graph.model.{datasets, projects}
+import io.renku.http.client.GitLabUrl
 import io.renku.http.rest.Links.{Href, Rel, _links}
 import io.renku.tinytypes.json.TinyTypeDecoders._
 import org.scalatest.matchers.should

diff --git a/.../src/test/scala/io/renku/graph/acceptancetests/knowledgegraph/DatasetsResourcesSpec.scala b/.../src/test/scala/io/renku/graph/acceptancetests/knowledgegraph/DatasetsResourcesSpec.scala
@@ -19,7 +19,6 @@
 package io.renku.graph.acceptancetests.knowledgegraph
 
 import cats.syntax.all._
-import eu.timepit.refined.auto._
 import io.circe.Json
 import io.renku.generators.CommonGraphGenerators.authUsers
 import io.renku.generators.Generators.Implicits._

diff --git a/...tests/src/test/scala/io/renku/graph/acceptancetests/knowledgegraph/ImageApiEncoders.scala b/...tests/src/test/scala/io/renku/graph/acceptancetests/knowledgegraph/ImageApiEncoders.scala
@@ -21,7 +21,8 @@ package io.renku.graph.acceptancetests.knowledgegraph
 import io.circe.{Encoder, Json}
 import io.circe.literal._
 import io.renku.graph.model.images.ImageUri
-import io.renku.graph.model.{GitLabUrl, projects}
+import io.renku.graph.model.projects
+import io.renku.http.client.GitLabUrl
 
 trait ImageApiEncoders {
   def gitLabUrl: GitLabUrl

diff --git a/acceptance-tests/src/test/scala/io/renku/graph/acceptancetests/knowledgegraph/package.scala b/acceptance-tests/src/test/scala/io/renku/graph/acceptancetests/knowledgegraph/package.scala
@@ -18,8 +18,8 @@
 
 package io.renku.graph.acceptancetests
 
-import io.renku.graph.model.GitLabUrl
 import io.renku.graph.model.cli.CliConverters
+import io.renku.http.client.GitLabUrl
 
 package object knowledgegraph {
 

diff --git a/...ts/src/test/scala/io/renku/graph/acceptancetests/stubs/gitlab/GitLabStateGenerators.scala b/...ts/src/test/scala/io/renku/graph/acceptancetests/stubs/gitlab/GitLabStateGenerators.scala
@@ -20,7 +20,7 @@ package io.renku.graph.acceptancetests.stubs.gitlab
 
 import com.typesafe.config.ConfigFactory
 import io.renku.config.ConfigLoader.find
-import io.renku.generators.CommonGraphGenerators.projectAccessTokens
+import io.renku.http.client.GitLabGenerators.projectAccessTokens
 import io.renku.generators.Generators
 import io.renku.generators.Generators._
 import io.renku.graph.acceptancetests.stubs.gitlab.GitLabApiStub.{CommitData, ProjectAccessTokenInfo}

diff --git a/...-tests/src/test/scala/io/renku/graph/acceptancetests/stubs/gitlab/GitLabStubSupport.scala b/...-tests/src/test/scala/io/renku/graph/acceptancetests/stubs/gitlab/GitLabStubSupport.scala
@@ -20,10 +20,10 @@ package io.renku.graph.acceptancetests.stubs.gitlab
 
 import cats.effect.IO
 import cats.effect.unsafe.IORuntime
+import com.typesafe.config.ConfigFactory
 import io.renku.graph.acceptancetests.stubs.gitlab.GitLabStubSupport.GitLabStubStarter
 import io.renku.graph.acceptancetests.tooling.AcceptanceSpec
-import io.renku.graph.config.GitLabUrlLoader
-import io.renku.graph.model.{GitLabApiUrl, GitLabUrl}
+import io.renku.http.client.{GitLabApiUrl, GitLabClientLoader, GitLabUrl}
 import org.http4s.Uri
 import org.scalatest._
 import org.typelevel.log4cats.Logger
@@ -33,7 +33,7 @@ import scala.util.Try
 /** Mixin for tests that starts a [[GitLabApiStub]] for the whole suite and clears its state before each test. */
 trait GitLabStubSupport extends BeforeAndAfterAll with BeforeAndAfter with GitLabStubIOSyntax { self: AcceptanceSpec =>
 
-  implicit val gitLabUrl:    GitLabUrl    = GitLabUrlLoader[Try]().fold(throw _, identity)
+  implicit val gitLabUrl: GitLabUrl = GitLabClientLoader.gitLabUrl[Try](ConfigFactory.load()).fold(throw _, identity)
   implicit val gitLabApiUrl: GitLabApiUrl = gitLabUrl.apiV4
 
   private lazy val gitLabStubStarter = GitLabStubStarter(gitLabUrl)

diff --git a/acceptance-tests/src/test/scala/io/renku/graph/acceptancetests/tooling/ServicesClients.scala b/acceptance-tests/src/test/scala/io/renku/graph/acceptancetests/tooling/ServicesClients.scala
@@ -26,7 +26,6 @@ import eu.timepit.refined.api.Refined
 import eu.timepit.refined.auto._
 import eu.timepit.refined.string.Url
 import io.circe.generic.semiauto.deriveDecoder
-import io.circe.literal._
 import io.circe.{Decoder, Json}
 import io.renku.control.Throttler
 import io.renku.graph.acceptancetests.tooling.ServiceClient.ClientResponse

diff --git a/build.sbt b/build.sbt
@@ -18,7 +18,7 @@
 
 organization := "io.renku"
 name := "renku-graph"
-ThisBuild / scalaVersion := "2.13.12"
+ThisBuild / scalaVersion := "2.13.13"
 
 // This project contains nothing to package, like pure POM maven project
 packagedArtifacts := Map.empty
@@ -98,7 +98,7 @@ lazy val jsonldUtils = project
       Dependencies.jsonld4s
   )
   .dependsOn(
-    tinyTypes % "compile->compile;test->test",
+    tinyTypes   % "compile->compile;test->test",
     commonUtils % "compile->compile;test->test"
   )
 
@@ -175,9 +175,11 @@ lazy val configUtils = project
         Dependencies.log4Cats
   )
   .dependsOn(
-    tinyTypes   % "compile->compile;test->test",
-    commonUtils % "compile->compile;test->test",
-    metricUtils % "compile->compile;test->test"
+    tinyTypes         % "compile->compile;test->test",
+    commonUtils       % "compile->compile;test->test",
+    metricUtils       % "compile->compile;test->test",
+    http4sClientUtils % "compile->compile;test->test",
+    gitlabUtils       % "compile->compile;test->test"
   )
 
 lazy val utils = project
@@ -228,8 +230,9 @@ lazy val triplesStoreClient = project
         Dependencies.http4sCirce
   )
   .dependsOn(
-    generators % "test->test",
-    tinyTypes  % "compile->compile; test->test",
+    generators        % "test->test",
+    tinyTypes         % "compile->compile; test->test",
+    jsonldUtils       % "compile->compile;test->test",
     http4sClientUtils % "compile->compile;test->test"
   )
   .enablePlugins(AutomateHeaderPlugin)
@@ -290,7 +293,8 @@ lazy val renkuModel = project
   .dependsOn(
     tinyTypes           % "compile->compile; test->test",
     renkuModelTinyTypes % "compile->compile; test->test",
-    renkuCliModel       % "compile->compile; test->test"
+    renkuCliModel       % "compile->compile; test->test",
+    gitlabUtils         % "compile->compile; test->test"
   )
   .enablePlugins(AutomateHeaderPlugin)
 
@@ -623,7 +627,7 @@ lazy val commonSettings = Seq(
   Compile / packageDoc / publishArtifact := false,
   Compile / packageSrc / publishArtifact := false,
   addCompilerPlugin("com.olegpy"    %% "better-monadic-for" % "0.3.1"),
-  addCompilerPlugin("org.typelevel" %% "kind-projector"     % "0.13.2" cross CrossVersion.full),
+  addCompilerPlugin("org.typelevel" %% "kind-projector"     % "0.13.3" cross CrossVersion.full),
   // format: off
   scalacOptions ++= Seq(
     "-language:postfixOps", // enabling postfixes

diff --git a/commit-event-service/src/main/scala/io/renku/commiteventservice/Microservice.scala b/commit-event-service/src/main/scala/io/renku/commiteventservice/Microservice.scala
@@ -23,7 +23,7 @@ import cats.syntax.all._
 import io.renku.config.certificates.CertificateLoader
 import io.renku.events.consumers
 import io.renku.events.consumers.EventConsumersRegistry
-import io.renku.http.client.GitLabClient
+import io.renku.http.client.{GitLabClient, GitLabClientLoader}
 import io.renku.http.server.HttpServer
 import io.renku.logging.{ApplicationLogger, ExecutionTimeRecorder, ExecutionTimeRecorderLoader}
 import io.renku.metrics.{MetricsRegistry, MetricsRegistryLoader, RoutesMetrics}
@@ -43,7 +43,7 @@ object Microservice extends IOMicroservice {
   override def run(args: List[String]): IO[ExitCode] = for {
     implicit0(mr: MetricsRegistry[IO])        <- MetricsRegistryLoader[IO]()
     implicit0(etr: ExecutionTimeRecorder[IO]) <- ExecutionTimeRecorderLoader[IO]()
-    implicit0(gc: GitLabClient[IO])           <- GitLabClient[IO]()
+    implicit0(gc: GitLabClient[IO])           <- GitLabClientLoader[IO]()
     certificateLoader                         <- CertificateLoader[IO]
     sentryInitializer                         <- SentryInitializer[IO]
     commitSyncCategory                        <- events.consumers.commitsync.SubscriptionFactory[IO]

diff --git a/commit-event-service/src/test/scala/io/renku/commiteventservice/MicroserviceRoutesSpec.scala b/commit-event-service/src/test/scala/io/renku/commiteventservice/MicroserviceRoutesSpec.scala
@@ -21,7 +21,7 @@ package io.renku.commiteventservice
 import cats.effect.IO
 import cats.syntax.all._
 import io.renku.commiteventservice.events.EventEndpoint
-import io.renku.generators.CommonGraphGenerators.httpStatuses
+import io.renku.http.client.HttpClientGenerators.httpStatuses
 import io.renku.generators.Generators.Implicits._
 import io.renku.http.server.EndpointTester._
 import io.renku.http.server.version

diff --git a/...miteventservice/events/consumers/commitsync/eventgeneration/CommitsSynchronizerSpec.scala b/...miteventservice/events/consumers/commitsync/eventgeneration/CommitsSynchronizerSpec.scala
@@ -29,7 +29,7 @@ import io.renku.commiteventservice.events.consumers.common._
 import io.renku.eventlog
 import io.renku.eventlog.api.events.GlobalCommitSyncRequest
 import io.renku.events.consumers.Project
-import io.renku.generators.CommonGraphGenerators.accessTokens
+import io.renku.http.client.GitLabGenerators.accessTokens
 import io.renku.generators.Generators.Implicits._
 import io.renku.generators.Generators._
 import io.renku.graph.model.EventsGenerators.{batchDates, commitIds}

diff --git a/...mmiteventservice/events/consumers/commitsync/eventgeneration/LatestCommitFinderSpec.scala b/...mmiteventservice/events/consumers/commitsync/eventgeneration/LatestCommitFinderSpec.scala
@@ -19,15 +19,14 @@
 package io.renku.commiteventservice.events.consumers.commitsync.eventgeneration
 
 import cats.effect.IO
-import cats.implicits.toShow
 import cats.syntax.all._
 import eu.timepit.refined.api.Refined
 import eu.timepit.refined.auto._
 import eu.timepit.refined.collection.NonEmpty
 import io.circe.literal._
 import io.renku.commiteventservice.events.consumers.common.CommitInfo
 import io.renku.commiteventservice.events.consumers.common.Generators._
-import io.renku.generators.CommonGraphGenerators.accessTokens
+import io.renku.http.client.GitLabGenerators.accessTokens
 import io.renku.generators.Generators.Implicits._
 import io.renku.graph.model.GraphModelGenerators._
 import io.renku.http.RenkuEntityCodec

diff --git a/...test/scala/io/renku/commiteventservice/events/consumers/common/CommitInfoFinderSpec.scala b/...test/scala/io/renku/commiteventservice/events/consumers/common/CommitInfoFinderSpec.scala
@@ -24,7 +24,7 @@ import eu.timepit.refined.api.Refined
 import eu.timepit.refined.auto._
 import eu.timepit.refined.collection.NonEmpty
 import io.renku.commiteventservice.events.consumers.common.Generators._
-import io.renku.generators.CommonGraphGenerators._
+import io.renku.http.client.GitLabGenerators._
 import io.renku.generators.Generators.Implicits._
 import io.renku.graph.model.EventsGenerators._
 import io.renku.graph.model.GraphModelGenerators._

diff --git a/...test/scala/io/renku/commiteventservice/events/consumers/globalcommitsync/Generators.scala b/...test/scala/io/renku/commiteventservice/events/consumers/globalcommitsync/Generators.scala
@@ -24,7 +24,7 @@ import eu.timepit.refined.numeric.Positive
 import io.renku.commiteventservice.events.consumers.globalcommitsync.GlobalCommitSyncEvent.CommitsInfo
 import io.renku.commiteventservice.events.consumers.globalcommitsync.eventgeneration.{DateCondition, PageResult, ProjectCommitStats}
 import io.renku.events.consumers.Project
-import io.renku.generators.CommonGraphGenerators.pages
+import io.renku.http.client.HttpClientGenerators.pages
 import io.renku.generators.Generators.Implicits._
 import io.renku.generators.Generators._
 import io.renku.graph.model.EventsGenerators.commitIds

diff --git a/...ntservice/events/consumers/globalcommitsync/eventgeneration/CommitsSynchronizerSpec.scala b/...ntservice/events/consumers/globalcommitsync/eventgeneration/CommitsSynchronizerSpec.scala
@@ -28,7 +28,7 @@ import eventgeneration.gitlab.{GitLabCommitFetcher, GitLabCommitStatFetcher}
 import io.renku.commiteventservice.events.consumers.common.SynchronizationSummary
 import io.renku.commiteventservice.events.consumers.common.UpdateResult._
 import io.renku.events.consumers.Project
-import io.renku.generators.CommonGraphGenerators.accessTokens
+import io.renku.http.client.GitLabGenerators.accessTokens
 import io.renku.generators.Generators.Implicits._
 import io.renku.generators.Generators._
 import io.renku.graph.model.EventsGenerators.commitIds

diff --git a/...teventservice/events/consumers/globalcommitsync/eventgeneration/ELCommitFetcherSpec.scala b/...teventservice/events/consumers/globalcommitsync/eventgeneration/ELCommitFetcherSpec.scala
@@ -26,7 +26,7 @@ import io.circe.Encoder._
 import io.circe.literal._
 import io.circe.syntax._
 import io.renku.commiteventservice.events.consumers.globalcommitsync.Generators.{dateConditions, untilDateConditions}
-import io.renku.generators.CommonGraphGenerators.{pages, pagingRequests}
+import io.renku.http.client.HttpClientGenerators.{pages, pagingRequests}
 import io.renku.generators.Generators.Implicits._
 import io.renku.generators.Generators._
 import io.renku.graph.config.EventLogUrl

diff --git a/...ice/events/consumers/globalcommitsync/eventgeneration/MissingCommitEventCreatorSpec.scala b/...ice/events/consumers/globalcommitsync/eventgeneration/MissingCommitEventCreatorSpec.scala
@@ -24,7 +24,7 @@ import io.renku.commiteventservice.events.consumers.common.UpdateResult.{Created
 import io.renku.commiteventservice.events.consumers.common._
 import io.renku.commiteventservice.events.consumers.globalcommitsync.Generators._
 import io.renku.events.consumers.Project
-import io.renku.generators.CommonGraphGenerators.personalAccessTokens
+import io.renku.http.client.GitLabGenerators.personalAccessTokens
 import io.renku.generators.Generators.Implicits._
 import io.renku.generators.Generators.exceptions
 import io.renku.graph.model.EventsGenerators.{batchDates, commitIds}

diff --git a/...ce/events/consumers/globalcommitsync/eventgeneration/gitlab/GitLabCommitFetcherSpec.scala b/...ce/events/consumers/globalcommitsync/eventgeneration/gitlab/GitLabCommitFetcherSpec.scala
@@ -29,7 +29,7 @@ import io.renku.commiteventservice.events.consumers.common.CommitInfo
 import io.renku.commiteventservice.events.consumers.common.Generators.commitInfos
 import io.renku.commiteventservice.events.consumers.globalcommitsync.Generators._
 import io.renku.commiteventservice.events.consumers.globalcommitsync.eventgeneration.{DateCondition, PageResult}
-import io.renku.generators.CommonGraphGenerators.{accessTokens, pages, pagingRequests}
+import io.renku.http.client.GitLabGenerators.{accessTokens, pages, pagingRequests}
 import io.renku.generators.Generators.Implicits._
 import io.renku.graph.model.EventsGenerators._
 import io.renku.graph.model.GraphModelGenerators.projectIds

diff --git a/...vents/consumers/globalcommitsync/eventgeneration/gitlab/GitLabCommitStatFetcherSpec.scala b/...vents/consumers/globalcommitsync/eventgeneration/gitlab/GitLabCommitStatFetcherSpec.scala
@@ -29,7 +29,7 @@ import io.circe.literal.JsonStringContext
 import io.circe.syntax._
 import io.renku.commiteventservice.events.consumers.globalcommitsync.Generators.commitsCounts
 import io.renku.commiteventservice.events.consumers.globalcommitsync.eventgeneration.ProjectCommitStats
-import io.renku.generators.CommonGraphGenerators.personalAccessTokens
+import io.renku.http.client.GitLabGenerators.personalAccessTokens
 import io.renku.generators.Generators.Implicits._
 import io.renku.graph.model.EventsGenerators.commitIds
 import io.renku.graph.model.GraphModelGenerators.projectIds

diff --git a/entities-search/src/main/scala/io/renku/entities/search/EntitiesFinder.scala b/entities-search/src/main/scala/io/renku/entities/search/EntitiesFinder.scala
@@ -81,7 +81,7 @@ private class EntitiesFinderImpl[F[_]: Async: NonEmptyParallel: Logger: SparqlQu
       case Criteria.Sort.ByMatchingScore => OrderBy.Property("?matchingScore")
     }
 
-    encoder(sorting.toOrderBy(mapPropertyName)).sparql
+    encoder(OrderBy.fromSorting[Criteria.Sort.type](mapPropertyName)(sorting)).sparql
   }
 
   private implicit def recordDecoder: Decoder[Entity] = { implicit cursor =>

diff --git a/entities-search/src/test/scala/io/renku/entities/search/EntitiesFinderSpec.scala b/entities-search/src/test/scala/io/renku/entities/search/EntitiesFinderSpec.scala
@@ -30,7 +30,8 @@ import io.renku.entities.search.Generators._
 import io.renku.entities.search.diff.SearchDiffInstances
 import io.renku.entities.search.model.Entity
 import io.renku.entities.searchgraphs.TestSearchInfoDatasets
-import io.renku.generators.CommonGraphGenerators.{authUsers, sortingDirections}
+import io.renku.http.client.HttpClientGenerators.sortingDirections
+import io.renku.generators.CommonGraphGenerators.authUsers
 import io.renku.generators.Generators.Implicits._
 import io.renku.generators.Generators._
 import io.renku.graph.model._

diff --git a/entities-search/src/test/scala/io/renku/entities/search/FinderSpec.scala b/entities-search/src/test/scala/io/renku/entities/search/FinderSpec.scala
@@ -21,7 +21,7 @@ package io.renku.entities.search
 import cats.effect.IO
 import cats.effect.testing.scalatest.AsyncIOSpec
 import io.renku.entities.search.EntityConverters._
-import io.renku.generators.CommonGraphGenerators.userAccessTokens
+import io.renku.http.client.GitLabGenerators.userAccessTokens
 import io.renku.generators.Generators.Implicits._
 import io.renku.graph.model.testentities.{Entity => _, _}
 import io.renku.http.rest.SortBy