wip - migrate to play 3.0 & use pekko

MAIF · Nov 9, 2023 · 41c1267 · 41c1267
1 parent 1f344bc
commit 41c1267
Show file tree

Hide file tree

Showing 55 changed files with 159 additions and 175 deletions.
diff --git a/daikoku/app/actions/actions.scala b/daikoku/app/actions/actions.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.actions
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import cats.implicits.catsSyntaxOptionId
 import fr.maif.otoroshi.daikoku.domain.TeamPermission.{Administrator, ApiEditor}
 import fr.maif.otoroshi.daikoku.domain._

diff --git a/daikoku/app/audit/audit.scala b/daikoku/app/audit/audit.scala
@@ -1,12 +1,11 @@
 package fr.maif.otoroshi.daikoku.audit
 
-import akka.Done
-import akka.actor.{Actor, ActorSystem, PoisonPill, Props, Terminated}
-import akka.http.scaladsl.util.FastFuture
-import akka.http.scaladsl.util.FastFuture._
-import akka.kafka.ProducerSettings
-import akka.stream.scaladsl.{Keep, Sink, Source}
-import akka.stream.{Materializer, OverflowStrategy, QueueOfferResult}
+import org.apache.pekko.Done
+import org.apache.pekko.actor.{Actor, ActorSystem, PoisonPill, Props, Terminated}
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture._
+import org.apache.pekko.stream.scaladsl.{Keep, Sink, Source}
+import org.apache.pekko.stream.{Materializer, OverflowStrategy, QueueOfferResult}
 import cats.data.EitherT
 import controllers.AppError
 import fr.maif.otoroshi.daikoku.audit.config.{ElasticAnalyticsConfig, Webhook}
@@ -19,6 +18,7 @@ import org.apache.kafka.clients.producer.{Callback, Producer, ProducerRecord, Re
 import org.apache.kafka.common.config.SslConfigs
 import org.apache.kafka.common.config.internals.BrokerSecurityConfigs
 import org.apache.kafka.common.serialization.{ByteArraySerializer, StringSerializer}
+import org.apache.pekko.kafka.ProducerSettings
 import org.joda.time.DateTime
 import org.joda.time.format.ISODateTimeFormat
 import play.api.Logger
@@ -188,7 +188,7 @@ case class TenantAuditEvent(evt: AuditEvent,
     "_id" -> IdGenerator.token(32),
     "@type" -> theType,
     "@id" -> env.snowflakeGenerator.nextIdStr(),
-    "@timestamp" -> play.api.libs.json.JodaWrites.JodaDateTimeNumberWrites
+    "@timestamp" -> json.DateTimeFormat
       .writes(DateTime.now()),
     "@tenantId" -> tenant.id.value,
     "@userId" -> user.id.value,

diff --git a/daikoku/app/controllers/AdminApiController.scala b/daikoku/app/controllers/AdminApiController.scala
@@ -1,9 +1,9 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.Materializer
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 import cats.implicits._
 import fr.maif.otoroshi.daikoku.actions.{DaikokuAction, DaikokuActionContext}
 import fr.maif.otoroshi.daikoku.audit.AuditTrailEvent

diff --git a/daikoku/app/controllers/ApiController.scala b/daikoku/app/controllers/ApiController.scala
@@ -1,10 +1,10 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.NotUsed
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.Materializer
-import akka.stream.scaladsl.{Flow, JsonFraming, Sink, Source}
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.{Flow, JsonFraming, Sink, Source}
+import org.apache.pekko.util.ByteString
 import cats.Id
 import cats.data.EitherT
 import cats.implicits.{catsSyntaxOptionId, toTraverseOps}

diff --git a/daikoku/app/controllers/AppError.scala b/daikoku/app/controllers/AppError.scala
@@ -1,6 +1,6 @@
 package controllers
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import controllers.AppError.toJson
 import play.api.libs.json.{JsObject, Json}
 import play.api.mvc

diff --git a/daikoku/app/controllers/AssetsController.scala b/daikoku/app/controllers/AssetsController.scala
@@ -1,29 +1,20 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.alpakka.s3.ObjectMetadata
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
-import fr.maif.otoroshi.daikoku.actions.{
-  DaikokuAction,
-  DaikokuActionMaybeWithGuest,
-  DaikokuTenantAction
-}
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
+import fr.maif.otoroshi.daikoku.actions.{DaikokuAction, DaikokuActionMaybeWithGuest, DaikokuTenantAction}
 import fr.maif.otoroshi.daikoku.audit.AuditTrailEvent
 import fr.maif.otoroshi.daikoku.ctrls.authorizations.async._
 import fr.maif.otoroshi.daikoku.domain.AssetId
 import fr.maif.otoroshi.daikoku.env.Env
 import fr.maif.otoroshi.daikoku.logger.AppLogger
 import fr.maif.otoroshi.daikoku.utils.IdGenerator
+import org.apache.pekko.stream.connectors.s3.ObjectMetadata
 import play.api.http.HttpEntity
 import play.api.libs.json.{JsArray, Json}
 import play.api.libs.streams.Accumulator
-import play.api.mvc.{
-  AbstractController,
-  Action,
-  BodyParser,
-  ControllerComponents
-}
+import play.api.mvc.{AbstractController, Action, BodyParser, ControllerComponents}
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.DurationInt

diff --git a/daikoku/app/controllers/ConsumptionController.scala b/daikoku/app/controllers/ConsumptionController.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import controllers.AppError
 import fr.maif.otoroshi.daikoku.actions.DaikokuAction
 import fr.maif.otoroshi.daikoku.audit.AuditTrailEvent

diff --git a/daikoku/app/controllers/HomeController.scala b/daikoku/app/controllers/HomeController.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import com.github.blemale.scaffeine.{Cache, Scaffeine}
 import com.nimbusds.jose.util.StandardCharset
 import daikoku.BuildInfo

diff --git a/daikoku/app/controllers/JobsController.scala b/daikoku/app/controllers/JobsController.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import fr.maif.otoroshi.daikoku.env.Env
 import fr.maif.otoroshi.daikoku.utils.OtoroshiClient
 import jobs.{ApiKeyStatsJob, AuditTrailPurgeJob, OtoroshiVerifierJob}

diff --git a/daikoku/app/controllers/LoginController.scala b/daikoku/app/controllers/LoginController.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import com.eatthepath.otp.TimeBasedOneTimePasswordGenerator
 import fr.maif.otoroshi.daikoku.actions.{DaikokuAction, DaikokuActionMaybeWithGuest, DaikokuTenantAction, DaikokuTenantActionContext}
 import fr.maif.otoroshi.daikoku.audit.{AuditTrailEvent, AuthorizationLevel}

diff --git a/daikoku/app/controllers/MessageController.scala b/daikoku/app/controllers/MessageController.scala
@@ -1,11 +1,11 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.actor.{ActorRef, PoisonPill, Props}
-import akka.http.scaladsl.util.FastFuture
-import akka.pattern.ask
-import akka.stream.scaladsl.Source
-import akka.stream.{CompletionStrategy, OverflowStrategy}
-import akka.util.Timeout
+import org.apache.pekko.actor.{ActorRef, PoisonPill, Props}
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.pattern.ask
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.stream.{CompletionStrategy, OverflowStrategy}
+import org.apache.pekko.util.Timeout
 import fr.maif.otoroshi.daikoku.actions.DaikokuAction
 import fr.maif.otoroshi.daikoku.audit.AuditTrailEvent
 import fr.maif.otoroshi.daikoku.ctrls.authorizations.async.{PublicUserAccess, TenantAdminOnly}
@@ -172,12 +172,12 @@ class MessageController(DaikokuAction: DaikokuAction,
     PublicUserAccess(AuditTrailEvent("@{user.name} has received his messages"))(
       ctx) {
       val completionMatcher: PartialFunction[Any, CompletionStrategy] = {
-        case akka.actor.Status.Success(s: CompletionStrategy) => s
-        case akka.actor.Status.Success(_)                     => CompletionStrategy.draining
-        case akka.actor.Status.Success                        => CompletionStrategy.draining
+        case org.apache.pekko.actor.Status.Success(s: CompletionStrategy) => s
+        case org.apache.pekko.actor.Status.Success(_)                     => CompletionStrategy.draining
+        case org.apache.pekko.actor.Status.Success                        => CompletionStrategy.draining
       }
       val failureMatcher: PartialFunction[Any, Throwable] = {
-        case akka.actor.Status.Failure(cause) => cause
+        case org.apache.pekko.actor.Status.Failure(cause) => cause
       }
 
       val source: Source[JsValue, ActorRef] = Source

diff --git a/daikoku/app/controllers/MockController.scala b/daikoku/app/controllers/MockController.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import cats.implicits.catsSyntaxOptionId
 import fr.maif.otoroshi.daikoku.actions.DaikokuAction
 import fr.maif.otoroshi.daikoku.domain.TeamPermission._

diff --git a/daikoku/app/controllers/NotificationController.scala b/daikoku/app/controllers/NotificationController.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import cats.data.EitherT
 import controllers.AppError
 import controllers.AppError._

diff --git a/daikoku/app/controllers/OtoroshiSettingsController.scala b/daikoku/app/controllers/OtoroshiSettingsController.scala
@@ -1,9 +1,9 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.model.Uri
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.http.scaladsl.model.Uri
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 import cats.data.EitherT
 import cats.implicits.catsSyntaxOptionId
 import com.google.common.base.Charsets

diff --git a/daikoku/app/controllers/PaymentClient.scala b/daikoku/app/controllers/PaymentClient.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import cats.data.{EitherT, OptionT}
 import cats.implicits.catsSyntaxOptionId
 import controllers.AppError

diff --git a/daikoku/app/controllers/TeamController.scala b/daikoku/app/controllers/TeamController.scala
@@ -1,8 +1,8 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.Materializer
-import akka.stream.scaladsl.{Sink, Source}
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.{Sink, Source}
 import cats.data.EitherT
 import cats.implicits.catsSyntaxOptionId
 import controllers.AppError

diff --git a/daikoku/app/controllers/TenantController.scala b/daikoku/app/controllers/TenantController.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import cats.data.EitherT
 import cats.implicits.catsSyntaxOptionId
 import com.nimbusds.jose.jwk.KeyType

diff --git a/daikoku/app/controllers/TranslationController.scala b/daikoku/app/controllers/TranslationController.scala
@@ -1,7 +1,7 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.Materializer
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.Materializer
 import controllers.AppError
 import controllers.AppError.TranslationNotFound
 import fr.maif.otoroshi.daikoku.actions.{DaikokuAction, DaikokuActionMaybeWithGuest, DaikokuActionMaybeWithoutUser}

diff --git a/daikoku/app/controllers/UsersController.scala b/daikoku/app/controllers/UsersController.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import com.eatthepath.otp.TimeBasedOneTimePasswordGenerator
 import fr.maif.otoroshi.daikoku.actions.{DaikokuAction, DaikokuActionMaybeWithGuest}
 import fr.maif.otoroshi.daikoku.audit.AuditTrailEvent

diff --git a/daikoku/app/controllers/authorizations.scala b/daikoku/app/controllers/authorizations.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.ctrls
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import controllers.AppError
 import controllers.AppError.{ForbiddenAction, TeamForbidden, TeamNotFound, Unauthorized}
 import fr.maif.otoroshi.daikoku.actions.DaikokuActionContext

diff --git a/daikoku/app/daikoku.scala b/daikoku/app/daikoku.scala
@@ -1,7 +1,7 @@
 package fr.maif.otoroshi.daikoku
 
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.Materializer
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.Materializer
 import com.softwaremill.macwire._
 import controllers.{Assets, AssetsComponents}
 import fr.maif.otoroshi.daikoku.actions.{

diff --git a/daikoku/app/domain/CommonServices.scala b/daikoku/app/domain/CommonServices.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.domain
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import cats.implicits.catsSyntaxOptionId
 import controllers.AppError
 import fr.maif.otoroshi.daikoku.actions.DaikokuActionContext

diff --git a/daikoku/app/domain/SchemaDefinition.scala b/daikoku/app/domain/SchemaDefinition.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.domain
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import cats.data.EitherT
 import controllers.AppError
 import fr.maif.otoroshi.daikoku.actions.DaikokuActionContext

diff --git a/daikoku/app/domain/apiEntities.scala b/daikoku/app/domain/apiEntities.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.domain
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import cats.data.EitherT
 import cats.syntax.option._
 import controllers.AppError

diff --git a/daikoku/app/domain/json.scala b/daikoku/app/domain/json.scala
@@ -78,14 +78,12 @@ object json {
   val DateTimeFormat = new Format[DateTime] {
     override def reads(json: JsValue) =
       Try {
-        val longDate: Long =
-          ((json \ "$long").asOpt[Long]).getOrElse(json.as[Long])
-        JsSuccess(new DateTime(longDate))
+        JsSuccess(new DateTime(json.as[Long]))
       } recover {
         case e => JsError(e.getMessage)
       } get
 
-    override def writes(o: DateTime) = JsNumber(o.toDate.getTime)
+    override def writes(o: DateTime) = JsNumber(o.getMillis)
   }
 
   val OtoroshiSettingsFormat = new Format[OtoroshiSettings] {

diff --git a/daikoku/app/domain/tenantEntities.scala b/daikoku/app/domain/tenantEntities.scala
@@ -1,6 +1,6 @@
 package fr.maif.otoroshi.daikoku.domain
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import cats.implicits.catsSyntaxOptionId
 import com.github.jknack.handlebars.{Context, Handlebars, Options}
 import controllers.AppError

diff --git a/daikoku/app/env/env.scala b/daikoku/app/env/env.scala
@@ -1,9 +1,9 @@
 package fr.maif.otoroshi.daikoku.env
 
-import akka.actor.{ActorRef, ActorSystem, PoisonPill}
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.Materializer
-import akka.stream.scaladsl.{FileIO, Keep, Sink, Source}
+import org.apache.pekko.actor.{ActorRef, ActorSystem, PoisonPill}
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.{FileIO, Keep, Sink, Source}
 import cats.implicits.catsSyntaxOptionId
 import com.auth0.jwt.algorithms.Algorithm
 import com.auth0.jwt.{JWT, JWTVerifier}

diff --git a/daikoku/app/env/evolutions.scala b/daikoku/app/env/evolutions.scala
@@ -1,9 +1,9 @@
 package fr.maif.otoroshi.daikoku.env
 
-import akka.Done
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.Materializer
-import akka.stream.scaladsl.{Sink, Source}
+import org.apache.pekko.Done
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.{Sink, Source}
 import cats.data.OptionT
 import cats.implicits.catsSyntaxOptionId
 import fr.maif.otoroshi.daikoku.domain._

diff --git a/daikoku/app/jobs/ApiKeyStatsJob.scala b/daikoku/app/jobs/ApiKeyStatsJob.scala
@@ -1,10 +1,10 @@
 package jobs
 
-import akka.actor.Cancellable
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.Materializer
-import akka.stream.scaladsl.{Flow, Sink, Source}
-import akka.{Done, NotUsed}
+import org.apache.pekko.actor.Cancellable
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.{Flow, Sink, Source}
+import org.apache.pekko.{Done, NotUsed}
 import cats.data.OptionT
 import cats.implicits.catsSyntaxOptionId
 import fr.maif.otoroshi.daikoku.domain.BillingTimeUnit.{Day, Hour, Month, Year}

diff --git a/daikoku/app/jobs/AuditTrailPurgeJob.scala b/daikoku/app/jobs/AuditTrailPurgeJob.scala
@@ -1,6 +1,6 @@
 package jobs
 
-import akka.actor.Cancellable
+import org.apache.pekko.actor.Cancellable
 import fr.maif.otoroshi.daikoku.env.Env
 import org.joda.time.DateTime
 import play.api.Logger

diff --git a/daikoku/app/jobs/OtoroshiVerifierJob.scala b/daikoku/app/jobs/OtoroshiVerifierJob.scala
@@ -1,8 +1,8 @@
 package jobs
 
-import akka.Done
-import akka.actor.Cancellable
-import akka.stream.scaladsl.{Sink, Source}
+import org.apache.pekko.Done
+import org.apache.pekko.actor.Cancellable
+import org.apache.pekko.stream.scaladsl.{Sink, Source}
 import cats.data.EitherT
 import cats.syntax.option._
 import controllers.AppError