Merge branch 'master' into create-resource-with-tag

BlueBrain · Oct 13, 2023 · e568b42 · e568b42
2 parents 9698177 + 9b96b5e
commit e568b42
Show file tree

Hide file tree

Showing 18 changed files with 176 additions and 136 deletions.
diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/OrganizationsRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/OrganizationsRoutes.scala
@@ -3,21 +3,21 @@ package ch.epfl.bluebrain.nexus.delta.routes
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.{Directive1, Route}
+import cats.effect.IO
 import cats.implicits._
 import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution
 import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder
 import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering
 import ch.epfl.bluebrain.nexus.delta.routes.OrganizationsRoutes.OrganizationInput
 import ch.epfl.bluebrain.nexus.delta.sdk.OrganizationResource
 import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclCheck
-import ch.epfl.bluebrain.nexus.delta.sdk.ce.DeltaDirectives.{emit => emitCE}
+import ch.epfl.bluebrain.nexus.delta.sdk.ce.DeltaDirectives._
 import ch.epfl.bluebrain.nexus.delta.sdk.circe.CirceUnmarshalling
-import ch.epfl.bluebrain.nexus.delta.sdk.directives.DeltaDirectives._
 import ch.epfl.bluebrain.nexus.delta.sdk.directives.{AuthDirectives, DeltaSchemeDirectives}
 import ch.epfl.bluebrain.nexus.delta.sdk.identities.Identities
 import ch.epfl.bluebrain.nexus.delta.sdk.identities.model.Caller
 import ch.epfl.bluebrain.nexus.delta.sdk.implicits._
-import ch.epfl.bluebrain.nexus.delta.sdk.model.BaseUri
+import ch.epfl.bluebrain.nexus.delta.sdk.model.{BaseUri, ResourceF}
 import ch.epfl.bluebrain.nexus.delta.sdk.model.search.SearchParams.OrganizationSearchParams
 import ch.epfl.bluebrain.nexus.delta.sdk.model.search.SearchResults._
 import ch.epfl.bluebrain.nexus.delta.sdk.model.search.{PaginationConfig, SearchResults}
@@ -29,7 +29,6 @@ import io.circe.Decoder
 import io.circe.generic.extras.Configuration
 import io.circe.generic.extras.semiauto.deriveConfiguredDecoder
 import kamon.instrumentation.akka.http.TracingDirectives.operationName
-import monix.execution.Scheduler
 
 import scala.annotation.nowarn
 
@@ -54,7 +53,6 @@ final class OrganizationsRoutes(
 )(implicit
     baseUri: BaseUri,
     paginationConfig: PaginationConfig,
-    s: Scheduler,
     cr: RemoteContextResolution,
     ordering: JsonKeyOrdering
 ) extends AuthDirectives(identities, aclCheck)
@@ -76,6 +74,14 @@ final class OrganizationsRoutes(
       )
     }
 
+  private def emitMetadata(value: IO[OrganizationResource]) = {
+    emit(
+      value
+        .mapValue(_.metadata)
+        .attemptNarrow[OrganizationRejection]
+    )
+  }
+
   def routes: Route =
     baseUriPrefix(baseUri.prefix) {
       pathPrefix("orgs") {
@@ -88,7 +94,12 @@ final class OrganizationsRoutes(
                   implicit val searchJsonLdEncoder: JsonLdEncoder[SearchResults[OrganizationResource]] =
                     searchResultsJsonLdEncoder(Organization.context, pagination, uri)
 
-                  emit(organizations.list(pagination, params, order).widen[SearchResults[OrganizationResource]])
+                  emit(
+                    organizations
+                      .list(pagination, params, order)
+                      .widen[SearchResults[OrganizationResource]]
+                      .attemptNarrow[OrganizationRejection]
+                  )
                 }
             },
             (resolveOrg & pathEndOrSingleSlash) { id =>
@@ -99,7 +110,10 @@ final class OrganizationsRoutes(
                       authorizeFor(id, orgs.write).apply {
                         // Update organization
                         entity(as[OrganizationInput]) { case OrganizationInput(description) =>
-                          emit(organizations.update(id, description, rev).mapValue(_.metadata))
+                          emitMetadata(
+                            organizations
+                              .update(id, description, rev)
+                          )
                         }
                       }
                     }
@@ -108,9 +122,9 @@ final class OrganizationsRoutes(
                     authorizeFor(id, orgs.read).apply {
                       parameter("rev".as[Int].?) {
                         case Some(rev) => // Fetch organization at specific revision
-                          emit(organizations.fetchAt(id, rev).leftWiden[OrganizationRejection])
+                          emit(organizations.fetchAt(id, rev).attemptNarrow[OrganizationRejection])
                         case None      => // Fetch organization
-                          emit(organizations.fetch(id).leftWiden[OrganizationRejection])
+                          emit(organizations.fetch(id).attemptNarrow[OrganizationRejection])
 
                       }
                     }
@@ -120,12 +134,14 @@ final class OrganizationsRoutes(
                     concat(
                       parameter("rev".as[Int]) { rev =>
                         authorizeFor(id, orgs.write).apply {
-                          emit(organizations.deprecate(id, rev).mapValue(_.metadata))
+                          emitMetadata(
+                            organizations.deprecate(id, rev)
+                          )
                         }
                       },
                       parameter("prune".requiredValue(true)) { _ =>
                         authorizeFor(id, orgs.delete).apply {
-                          emitCE(orgDeleter.delete(id).attemptNarrow[OrganizationRejection])
+                          emit(orgDeleter.delete(id).attemptNarrow[OrganizationRejection])
                         }
                       }
                     )
@@ -138,7 +154,12 @@ final class OrganizationsRoutes(
                 (put & authorizeFor(label, orgs.create)) {
                   // Create organization
                   entity(as[OrganizationInput]) { case OrganizationInput(description) =>
-                    emit(StatusCodes.Created, organizations.create(label, description).mapValue(_.metadata))
+                    val response: IO[Either[OrganizationRejection, ResourceF[Organization.Metadata]]] =
+                      organizations.create(label, description).mapValue(_.metadata).attemptNarrow[OrganizationRejection]
+                    emit(
+                      StatusCodes.Created,
+                      response
+                    )
                   }
                 }
               }
@@ -171,7 +192,6 @@ object OrganizationsRoutes {
   )(implicit
       baseUri: BaseUri,
       paginationConfig: PaginationConfig,
-      s: Scheduler,
       cr: RemoteContextResolution,
       ordering: JsonKeyOrdering
   ): Route =

diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/PermissionsRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/PermissionsRoutes.scala
@@ -2,6 +2,7 @@ package ch.epfl.bluebrain.nexus.delta.routes
 
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.{MalformedRequestContentRejection, Route}
+import cats.effect.IO
 import cats.implicits._
 import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts
 import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.JsonLdContext.keywords
@@ -10,6 +11,7 @@ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder
 import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering
 import ch.epfl.bluebrain.nexus.delta.routes.PermissionsRoutes.PatchPermissions._
 import ch.epfl.bluebrain.nexus.delta.routes.PermissionsRoutes._
+import ch.epfl.bluebrain.nexus.delta.sdk.PermissionsResource
 import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclCheck
 import ch.epfl.bluebrain.nexus.delta.sdk.acls.model.AclAddress
 import ch.epfl.bluebrain.nexus.delta.sdk.ce.DeltaDirectives._
@@ -20,7 +22,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.implicits._
 import ch.epfl.bluebrain.nexus.delta.sdk.model.{BaseUri, ResourceF}
 import ch.epfl.bluebrain.nexus.delta.sdk.permissions.Permissions
 import ch.epfl.bluebrain.nexus.delta.sdk.permissions.Permissions.{permissions => permissionsPerms}
-import ch.epfl.bluebrain.nexus.delta.sdk.permissions.model.Permission
+import ch.epfl.bluebrain.nexus.delta.sdk.permissions.model.{Permission, PermissionsRejection}
 import io.circe.generic.extras.Configuration
 import io.circe.generic.extras.semiauto.deriveConfiguredDecoder
 import io.circe.syntax._
@@ -63,16 +65,16 @@ final class PermissionsRoutes(identities: Identities, permissions: Permissions,
                   get {
                     authorizeFor(AclAddress.Root, permissionsPerms.read).apply {
                       parameter("rev".as[Int].?) {
-                        case Some(rev) => emit(permissions.fetchAt(rev))
-                        case None      => emit(permissions.fetch)
+                        case Some(rev) => emitPermissions(permissions.fetchAt(rev))
+                        case None      => emitPermissions(permissions.fetch)
                       }
                     }
                   },
                   // Replace permissions
                   (put & parameter("rev" ? 0)) { rev =>
                     authorizeFor(AclAddress.Root, permissionsPerms.write).apply {
                       entity(as[PatchPermissions]) {
-                        case Replace(set) => emit(permissions.replace(set, rev).map(_.void))
+                        case Replace(set) => emitVoid(permissions.replace(set, rev))
                         case _            =>
                           reject(
                             malformedContent(s"Value for field '${keywords.tpe}' must be 'Replace' when using 'PUT'.")
@@ -84,8 +86,8 @@ final class PermissionsRoutes(identities: Identities, permissions: Permissions,
                   (patch & parameter("rev" ? 0)) { rev =>
                     authorizeFor(AclAddress.Root, permissionsPerms.write).apply {
                       entity(as[PatchPermissions]) {
-                        case Append(set)   => emit(permissions.append(set, rev).map(_.void))
-                        case Subtract(set) => emit(permissions.subtract(set, rev).map(_.void))
+                        case Append(set)   => emitVoid(permissions.append(set, rev))
+                        case Subtract(set) => emitVoid(permissions.subtract(set, rev))
                         case _             =>
                           reject(
                             malformedContent(
@@ -99,7 +101,7 @@ final class PermissionsRoutes(identities: Identities, permissions: Permissions,
                   delete {
                     authorizeFor(AclAddress.Root, permissionsPerms.write).apply {
                       parameter("rev".as[Int]) { rev =>
-                        emit(permissions.delete(rev).map(_.void))
+                        emitVoid(permissions.delete(rev))
                       }
                     }
                   }
@@ -111,6 +113,14 @@ final class PermissionsRoutes(identities: Identities, permissions: Permissions,
       }
     }
 
+  private def emitVoid(value: IO[PermissionsResource]) = {
+    emit(value.map(_.void).attemptNarrow[PermissionsRejection])
+  }
+
+  private def emitPermissions(value: IO[PermissionsResource]) = {
+    emit(value.attemptNarrow[PermissionsRejection])
+  }
+
   private def malformedContent(field: String) =
     MalformedRequestContentRejection(field, new IllegalArgumentException())
 }

diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/EventsModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/EventsModule.scala
@@ -2,16 +2,17 @@ package ch.epfl.bluebrain.nexus.delta.wiring
 
 import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority
 import ch.epfl.bluebrain.nexus.delta.config.AppConfig
+import ch.epfl.bluebrain.nexus.delta.kernel.effect.migration._
 import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution
 import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering
 import ch.epfl.bluebrain.nexus.delta.routes.{ElemRoutes, EventsRoutes}
-import ch.epfl.bluebrain.nexus.delta.kernel.effect.migration._
 import ch.epfl.bluebrain.nexus.delta.sdk._
 import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclCheck
 import ch.epfl.bluebrain.nexus.delta.sdk.directives.DeltaSchemeDirectives
 import ch.epfl.bluebrain.nexus.delta.sdk.identities.Identities
 import ch.epfl.bluebrain.nexus.delta.sdk.model.BaseUri
 import ch.epfl.bluebrain.nexus.delta.sdk.organizations.Organizations
+import ch.epfl.bluebrain.nexus.delta.sdk.organizations.model.OrganizationRejection
 import ch.epfl.bluebrain.nexus.delta.sdk.projects.Projects
 import ch.epfl.bluebrain.nexus.delta.sdk.sse.{SseElemStream, SseEncoder, SseEventLog}
 import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors
@@ -36,7 +37,7 @@ object EventsModule extends ModuleDef {
       toCatsIO(
         SseEventLog(
           sseEncoders,
-          organizations.fetch(_).void,
+          organizations.fetch(_).void.toBIO[OrganizationRejection],
           projects.fetch(_).map { p => (p.value.organizationUuid, p.value.uuid) },
           config.sse,
           xas

diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/OrganizationsModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/OrganizationsModule.scala
@@ -1,6 +1,6 @@
 package ch.epfl.bluebrain.nexus.delta.wiring
 
-import cats.effect.Clock
+import cats.effect.{Clock, ContextShift, IO}
 import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority
 import ch.epfl.bluebrain.nexus.delta.config.AppConfig
 import ch.epfl.bluebrain.nexus.delta.kernel.utils.UUIDF
@@ -14,13 +14,10 @@ import ch.epfl.bluebrain.nexus.delta.sdk.directives.DeltaSchemeDirectives
 import ch.epfl.bluebrain.nexus.delta.sdk.identities.Identities
 import ch.epfl.bluebrain.nexus.delta.sdk.model.{BaseUri, MetadataContextValue}
 import ch.epfl.bluebrain.nexus.delta.sdk.organizations.model.OrganizationEvent
-import ch.epfl.bluebrain.nexus.delta.sdk.organizations.{Organizations, OrganizationsImpl}
+import ch.epfl.bluebrain.nexus.delta.sdk.organizations.{OrganizationDeleter, Organizations, OrganizationsImpl}
 import ch.epfl.bluebrain.nexus.delta.sdk.sse.SseEncoder
 import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors
 import izumi.distage.model.definition.{Id, ModuleDef}
-import monix.bio.UIO
-import monix.execution.Scheduler
-import ch.epfl.bluebrain.nexus.delta.sdk.organizations.OrganizationDeleter
 
 /**
   * Organizations module wiring config.
@@ -33,15 +30,16 @@ object OrganizationsModule extends ModuleDef {
     (
         config: AppConfig,
         scopeInitializations: Set[ScopeInitialization],
-        clock: Clock[UIO],
+        clock: Clock[IO],
         uuidF: UUIDF,
-        xas: Transactors
+        xas: Transactors,
+        contextShift: ContextShift[IO]
     ) =>
       OrganizationsImpl(
         scopeInitializations,
         config.organizations,
         xas
-      )(clock, uuidF)
+      )(clock, uuidF, contextShift)
   }
 
   make[OrganizationDeleter].from { (xas: Transactors) =>
@@ -56,14 +54,12 @@ object OrganizationsModule extends ModuleDef {
         cfg: AppConfig,
         aclCheck: AclCheck,
         schemeDirectives: DeltaSchemeDirectives,
-        s: Scheduler,
         cr: RemoteContextResolution @Id("aggregate"),
         ordering: JsonKeyOrdering
     ) =>
       new OrganizationsRoutes(identities, organizations, orgDeleter, aclCheck, schemeDirectives)(
         cfg.http.baseUri,
         cfg.organizations.pagination,
-        s,
         cr,
         ordering
       )

diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ProjectsModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ProjectsModule.scala
@@ -1,8 +1,10 @@
 package ch.epfl.bluebrain.nexus.delta.wiring
 
 import cats.effect.{Clock, IO}
+import cats.implicits._
 import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority
 import ch.epfl.bluebrain.nexus.delta.config.AppConfig
+import ch.epfl.bluebrain.nexus.delta.kernel.effect.migration.toMonixBIOOps
 import ch.epfl.bluebrain.nexus.delta.kernel.utils.UUIDF
 import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts
 import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.{ContextValue, RemoteContextResolution}
@@ -19,10 +21,11 @@ import ch.epfl.bluebrain.nexus.delta.sdk.identities.model.ServiceAccount
 import ch.epfl.bluebrain.nexus.delta.sdk.model._
 import ch.epfl.bluebrain.nexus.delta.sdk.model.metrics.ScopedEventMetricEncoder
 import ch.epfl.bluebrain.nexus.delta.sdk.organizations.Organizations
+import ch.epfl.bluebrain.nexus.delta.sdk.organizations.model.OrganizationRejection
 import ch.epfl.bluebrain.nexus.delta.sdk.projects.FetchContext.ContextRejection
 import ch.epfl.bluebrain.nexus.delta.sdk.projects._
 import ch.epfl.bluebrain.nexus.delta.sdk.projects.model.ProjectRejection.WrappedOrganizationRejection
-import ch.epfl.bluebrain.nexus.delta.sdk.projects.model.{ApiMappings, Project, ProjectEvent}
+import ch.epfl.bluebrain.nexus.delta.sdk.projects.model.{ApiMappings, Project, ProjectEvent, ProjectRejection}
 import ch.epfl.bluebrain.nexus.delta.sdk.provisioning.ProjectProvisioning
 import ch.epfl.bluebrain.nexus.delta.sdk.quotas.Quotas
 import ch.epfl.bluebrain.nexus.delta.sdk.sse.SseEncoder
@@ -61,7 +64,12 @@ object ProjectsModule extends ModuleDef {
     ) =>
       IO.pure(
         ProjectsImpl(
-          organizations.fetchActiveOrganization(_).mapError(WrappedOrganizationRejection),
+          organizations
+            .fetchActiveOrganization(_)
+            .adaptError { case e: OrganizationRejection =>
+              WrappedOrganizationRejection(e)
+            }
+            .toBIO[ProjectRejection],
           ValidateProjectDeletion(xas, config.projects.deletion.enabled),
           scopeInitializations,
           mappings.merge,

diff --git a/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/routes/OrganizationsRoutesSpec.scala b/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/routes/OrganizationsRoutesSpec.scala
@@ -29,10 +29,11 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.Label
 import ch.epfl.bluebrain.nexus.testkit.bio.IOFromMap
 import io.circe.Json
 import cats.effect.IO
+import ch.epfl.bluebrain.nexus.testkit.ce.{CatsIOValues, IOFixedClock}
 
 import java.util.UUID
 
-class OrganizationsRoutesSpec extends BaseRouteSpec with IOFromMap {
+class OrganizationsRoutesSpec extends BaseRouteSpec with IOFromMap with IOFixedClock with CatsIOValues {
 
   private val fixedUuid             = UUID.randomUUID()
   implicit private val uuidF: UUIDF = UUIDF.fixed(fixedUuid)

diff --git a/delta/plugins/elasticsearch/src/main/resources/elasticsearch.conf b/delta/plugins/elasticsearch/src/main/resources/elasticsearch.conf
@@ -10,8 +10,6 @@ plugins.elasticsearch {
   #   username= "elastic_user"
   #   password= "password"
   # }
-  # configuration of the Elasticsearch client
-  client = ${app.defaults.http-client-compression}
   # the elasticsearch event log configuration
   event-log = ${app.defaults.event-log}
   # the elasticsearch pagination config
@@ -20,8 +18,6 @@ plugins.elasticsearch {
   prefix = ${app.defaults.indexing.prefix}
   # configuration of the maximum number of view references allowed on an aggregated view
   max-view-refs = 20
-  # the maximum idle duration in between events on the indexing stream after which the stream will be stopped (min. 10 minutes).
-  idle-timeout = 30 minutes
   # In order to disable this feature, set an infinite time ('Inf')
   # idle-timeout = Inf
   #the maximum duration allowed so that synchronous indexing can complete

diff --git a/...scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchPluginModule.scala b/...scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchPluginModule.scala
@@ -23,7 +23,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclCheck
 import ch.epfl.bluebrain.nexus.delta.sdk.deletion.ProjectDeletionTask
 import ch.epfl.bluebrain.nexus.delta.sdk.directives.DeltaSchemeDirectives
 import ch.epfl.bluebrain.nexus.delta.sdk.fusion.FusionConfig
-import ch.epfl.bluebrain.nexus.delta.sdk.http.HttpClient
+import ch.epfl.bluebrain.nexus.delta.sdk.http.{HttpClient, HttpClientConfig}
 import ch.epfl.bluebrain.nexus.delta.sdk.identities.Identities
 import ch.epfl.bluebrain.nexus.delta.sdk.identities.model.ServiceAccount
 import ch.epfl.bluebrain.nexus.delta.sdk.model._
@@ -53,8 +53,8 @@ class ElasticSearchPluginModule(priority: Int) extends ModuleDef {
   make[ElasticSearchViewsConfig].from { ElasticSearchViewsConfig.load(_) }
 
   make[HttpClient].named("elasticsearch-client").from {
-    (cfg: ElasticSearchViewsConfig, as: ActorSystem[Nothing], sc: Scheduler) =>
-      HttpClient()(cfg.client, as.classicSystem, sc)
+    val httpConfig = HttpClientConfig.noRetry(true)
+    (as: ActorSystem[Nothing], sc: Scheduler) => HttpClient()(httpConfig, as.classicSystem, sc)
   }
 
   make[ElasticSearchClient].from {