Switch from akka to pekko (#1)

* migrate from Akka 2.5.31 and Akka HTTP 10.1.12 to Pekko 1.0.1 and Pekko HTTP 1.0.0 * drop Scala 2.11 support
marko-asplund · Dec 16, 2023 · 994bbd2 · 994bbd2
1 parent c51b21d
commit 994bbd2
Show file tree

Hide file tree

Showing 41 changed files with 155 additions and 147 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 
+0.5.0
+=======
+* migrate from Akka 2.5.31 and Akka HTTP 10.1.12 to Pekko 1.0.1 and Pekko HTTP 1.0.0
+* drop Scala 2.11 support
+
 0.2.7
 =======
 * fork project and update publish info

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Not supported features (these might be implemented later):
 
 ## Installation
 
-s3mock package is available for Scala 2.11/2.12/2.13 (on Java 8/11). To install using SBT, add these
+s3mock package is available for Scala 2.12/2.13 (on Java 8/11). To install using SBT, add these
  statements to your `build.sbt`:
 
     libraryDependencies += "io.github.marko-asplund" %% "s3mock" % "0.2.6" % "test",
@@ -133,25 +133,25 @@ Scala with AWS S3 SDK:
     api.shutdown() // this one terminates the actor system. Use api.stop() to just unbind the service without messing with the ActorSystem
 ```
 
-Scala with Alpakka 1.0.0:
+Scala with Pekko Connectors 1.0:
 ```scala
-    import akka.actor.ActorSystem
-    import akka.stream.ActorMaterializer
-    import akka.stream.alpakka.s3.scaladsl.S3Client
-    import akka.stream.scaladsl.Sink
+    import org.apache.pekko.actor.ActorSystem
+    import org.apache.pekko.stream.ActorMaterializer
+    import org.apache.pekko.stream.connectors.s3.scaladsl.S3
+    import org.apache.pekko.stream.scaladsl.Sink
     import com.typesafe.config.ConfigFactory
     import scala.collection.JavaConverters._
 
     val config = ConfigFactory.parseMap(Map(
-      "alpakka.s3.proxy.host" -> "localhost",
-      "alpakka.s3.proxy.port" -> 8001,
-      "alpakka.s3.proxy.secure" -> false,
-      "alpakka.s3.path-style-access" -> true,
-      "alpakka.s3.aws.credentials.provider" -> "static",
-      "alpakka.s3.aws.credentials.access-key-id" -> "foo",
-      "alpakka.s3.aws.credentials.secret-access-key" -> "bar",
-      "alpakka.s3.aws.region.provider" -> "static",
-      "alpakka.s3.aws.region.default-region" -> "us-east-1"      
+      "pekko.connectors.s3.proxy.host" -> "localhost",
+      "pekko.connectors.s3.proxy.port" -> 8001,
+      "pekko.connectors.s3.proxy.secure" -> false,
+      "pekko.connectors.s3.path-style-access" -> true,
+      "pekko.connectors.s3.aws.credentials.provider" -> "static",
+      "pekko.connectors.s3.aws.credentials.access-key-id" -> "foo",
+      "pekko.connectors.s3.aws.credentials.secret-access-key" -> "bar",
+      "pekko.connectors.s3.aws.region.provider" -> "static",
+      "pekko.connectors.s3.aws.region.default-region" -> "us-east-1"      
     ).asJava)
     implicit val system = ActorSystem.create("test", config)
     implicit val mat = ActorMaterializer()

diff --git a/build.sbt b/build.sbt
@@ -1,17 +1,18 @@
 name := "s3mock"
 
-version := "0.2.7-SNAPSHOT"
+version := "0.3.0-SNAPSHOT"
 
 scalaVersion in ThisBuild := "2.13.2"
 
-crossScalaVersions in ThisBuild := Seq("2.11.12", "2.12.10","2.13.2")
+crossScalaVersions in ThisBuild := Seq("2.12.10", "2.13.2")
 
-val akkaVersion = "2.5.31"
+val pekkoVersion = "1.0.1"
+val pekkoHttpVersion = "1.0.0"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-stream" % akkaVersion,
-  "com.typesafe.akka" %% "akka-http" % "10.1.12",
-  "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion % "test",
+  "org.apache.pekko" %% "pekko-stream" % pekkoVersion,
+  "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion,
+  "org.apache.pekko" %% "pekko-stream-testkit" % pekkoVersion % Test,
   "org.scala-lang.modules" %% "scala-xml" % "1.3.0",
   "org.scala-lang.modules" %% "scala-collection-compat" % "2.1.6",
   "com.github.pathikrit" %% "better-files" % "3.9.1",
@@ -20,7 +21,7 @@ libraryDependencies ++= Seq(
   "org.scalatest" %% "scalatest" % "3.0.8" % "test",
   "ch.qos.logback" % "logback-classic" % "1.2.3" % "test",
   "org.iq80.leveldb" % "leveldb" % "0.12",
-  "com.lightbend.akka" %% "akka-stream-alpakka-s3" % "1.1.2" % "test",
+  "org.apache.pekko" %% "pekko-connectors-s3" % pekkoVersion % "test",
   "javax.xml.bind" % "jaxb-api" % "2.3.0",
   "com.sun.xml.bind" % "jaxb-core" % "2.3.0",
   "com.sun.xml.bind" % "jaxb-impl" % "2.3.0"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -7,4 +7,3 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
 addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.5.0")
-
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -1,4 +1,7 @@
-akka.http.parsing.illegal-header-warnings = off
+pekko.http.parsing.illegal-header-warnings = off
 
-akka.http.server.parsing.max-content-length = 512 M
-akka.http.client.parsing.max-content-length = 512 M
+pekko.http.server.parsing.max-content-length = 512 M
+pekko.http.client.parsing.max-content-length = 512 M
+
+# see https://github.com/akka/akka-http/issues/2088
+pekko.http.server.transparent-head-requests = true
diff --git a/src/main/scala/io/findify/s3mock/S3ChunkedProtocolStage.scala b/src/main/scala/io/findify/s3mock/S3ChunkedProtocolStage.scala
@@ -1,8 +1,8 @@
 package io.findify.s3mock
 
-import akka.stream._
-import akka.stream.stage.{GraphStage, GraphStageLogic, InHandler, OutHandler}
-import akka.util.ByteString
+import org.apache.pekko.stream._
+import org.apache.pekko.stream.stage.{GraphStage, GraphStageLogic, InHandler, OutHandler}
+import org.apache.pekko.util.ByteString
 import com.typesafe.scalalogging.LazyLogging
 
 /**

diff --git a/src/main/scala/io/findify/s3mock/S3Mock.scala b/src/main/scala/io/findify/s3mock/S3Mock.scala
@@ -1,10 +1,10 @@
 package io.findify.s3mock
 
-import akka.actor.ActorSystem
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.{HttpResponse, StatusCodes}
-import akka.http.scaladsl.server.Directives._
-import akka.stream.ActorMaterializer
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model.{HttpResponse, StatusCodes}
+import org.apache.pekko.http.scaladsl.server.Directives._
+import org.apache.pekko.stream.ActorMaterializer
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.provider.{FileProvider, InMemoryProvider, Provider}
 import io.findify.s3mock.route._

diff --git a/src/main/scala/io/findify/s3mock/provider/FileProvider.scala b/src/main/scala/io/findify/s3mock/provider/FileProvider.scala
@@ -2,7 +2,7 @@ package io.findify.s3mock.provider
 import java.util.UUID
 import java.io.{FileInputStream, File => JFile}
 
-import akka.http.scaladsl.model.DateTime
+import org.apache.pekko.http.scaladsl.model.DateTime
 import better.files.File
 import better.files.File.OpenOptions
 import com.amazonaws.services.s3.model.ObjectMetadata

diff --git a/src/main/scala/io/findify/s3mock/provider/InMemoryProvider.scala b/src/main/scala/io/findify/s3mock/provider/InMemoryProvider.scala
@@ -3,7 +3,7 @@ package io.findify.s3mock.provider
 import java.time.Instant
 import java.util.{Date, UUID}
 
-import akka.http.scaladsl.model.DateTime
+import org.apache.pekko.http.scaladsl.model.DateTime
 import com.amazonaws.services.s3.model.ObjectMetadata
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.error.{NoSuchBucketException, NoSuchKeyException}

diff --git a/src/main/scala/io/findify/s3mock/response/CopyObjectResult.scala b/src/main/scala/io/findify/s3mock/response/CopyObjectResult.scala
@@ -1,6 +1,6 @@
 package io.findify.s3mock.response
 
-import akka.http.scaladsl.model.DateTime
+import org.apache.pekko.http.scaladsl.model.DateTime
 
 
 /**

diff --git a/src/main/scala/io/findify/s3mock/response/ListAllMyBuckets.scala b/src/main/scala/io/findify/s3mock/response/ListAllMyBuckets.scala
@@ -1,6 +1,6 @@
 package io.findify.s3mock.response
 
-import akka.http.scaladsl.model.DateTime
+import org.apache.pekko.http.scaladsl.model.DateTime
 
 
 /**

diff --git a/src/main/scala/io/findify/s3mock/response/ListBucket.scala b/src/main/scala/io/findify/s3mock/response/ListBucket.scala
@@ -1,6 +1,6 @@
 package io.findify.s3mock.response
 
-import akka.http.scaladsl.model.DateTime
+import org.apache.pekko.http.scaladsl.model.DateTime
 
 
 /**

diff --git a/src/main/scala/io/findify/s3mock/route/CopyObject.scala b/src/main/scala/io/findify/s3mock/route/CopyObject.scala
@@ -3,8 +3,8 @@ package io.findify.s3mock.route
 import java.net.URLDecoder
 import java.util
 
-import akka.http.scaladsl.model.{HttpRequest, HttpResponse, StatusCodes}
-import akka.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.model.{HttpRequest, HttpResponse, StatusCodes}
+import org.apache.pekko.http.scaladsl.server.Directives._
 import com.amazonaws.services.s3.model.ObjectMetadata
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.error.{InternalErrorException, NoSuchBucketException, NoSuchKeyException}

diff --git a/src/main/scala/io/findify/s3mock/route/CopyObjectMultipart.scala b/src/main/scala/io/findify/s3mock/route/CopyObjectMultipart.scala
@@ -2,8 +2,8 @@ package io.findify.s3mock.route
 
 import java.util
 
-import akka.http.scaladsl.model.{HttpRequest, HttpResponse, StatusCodes}
-import akka.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.model.{HttpRequest, HttpResponse, StatusCodes}
+import org.apache.pekko.http.scaladsl.server.Directives._
 import com.amazonaws.services.s3.model.ObjectMetadata
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.error.{InternalErrorException, NoSuchBucketException, NoSuchKeyException}

diff --git a/src/main/scala/io/findify/s3mock/route/CreateBucket.scala b/src/main/scala/io/findify/s3mock/route/CreateBucket.scala
@@ -1,8 +1,8 @@
 package io.findify.s3mock.route
 
-import akka.http.scaladsl.model.headers.Location
-import akka.http.scaladsl.model.{HttpResponse, StatusCodes}
-import akka.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.model.headers.Location
+import org.apache.pekko.http.scaladsl.model.{HttpResponse, StatusCodes}
+import org.apache.pekko.http.scaladsl.server.Directives._
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.provider.Provider
 import io.findify.s3mock.request.CreateBucketConfiguration

diff --git a/src/main/scala/io/findify/s3mock/route/DeleteBucket.scala b/src/main/scala/io/findify/s3mock/route/DeleteBucket.scala
@@ -1,7 +1,7 @@
 package io.findify.s3mock.route
 
-import akka.http.scaladsl.model.{HttpResponse, StatusCodes}
-import akka.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.model.{HttpResponse, StatusCodes}
+import org.apache.pekko.http.scaladsl.server.Directives._
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.error.{InternalErrorException, NoSuchBucketException}
 import io.findify.s3mock.provider.Provider

diff --git a/src/main/scala/io/findify/s3mock/route/DeleteObject.scala b/src/main/scala/io/findify/s3mock/route/DeleteObject.scala
@@ -1,7 +1,7 @@
 package io.findify.s3mock.route
 
-import akka.http.scaladsl.model.{HttpResponse, StatusCodes}
-import akka.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.model.{HttpResponse, StatusCodes}
+import org.apache.pekko.http.scaladsl.server.Directives._
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.error.NoSuchKeyException
 import io.findify.s3mock.provider.Provider

diff --git a/src/main/scala/io/findify/s3mock/route/DeleteObjects.scala b/src/main/scala/io/findify/s3mock/route/DeleteObjects.scala
@@ -1,7 +1,7 @@
 package io.findify.s3mock.route
 
-import akka.http.scaladsl.model.{HttpResponse, StatusCodes, Uri}
-import akka.http.scaladsl.server.Directives.{path, _}
+import org.apache.pekko.http.scaladsl.model.{HttpResponse, StatusCodes, Uri}
+import org.apache.pekko.http.scaladsl.server.Directives.{path, _}
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.error.NoSuchKeyException
 import io.findify.s3mock.provider.Provider

diff --git a/src/main/scala/io/findify/s3mock/route/GetObject.scala b/src/main/scala/io/findify/s3mock/route/GetObject.scala
@@ -4,10 +4,10 @@ import java.io.StringWriter
 import java.net.URLDecoder
 import java.util.Date
 
-import akka.http.scaladsl.model.HttpEntity.Strict
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.model.headers.{RawHeader, `Last-Modified`}
-import akka.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.model.HttpEntity.Strict
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.model.headers.{RawHeader, `Last-Modified`}
+import org.apache.pekko.http.scaladsl.server.Directives._
 import com.amazonaws.services.s3.Headers
 import com.amazonaws.services.s3.model.ObjectMetadata
 import com.amazonaws.util.DateUtils

diff --git a/src/main/scala/io/findify/s3mock/route/ListBucket.scala b/src/main/scala/io/findify/s3mock/route/ListBucket.scala
@@ -1,7 +1,7 @@
 package io.findify.s3mock.route
 
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.server.Directives._
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.error.{InternalErrorException, NoSuchBucketException}
 import io.findify.s3mock.provider.Provider

diff --git a/src/main/scala/io/findify/s3mock/route/ListBuckets.scala b/src/main/scala/io/findify/s3mock/route/ListBuckets.scala
@@ -1,7 +1,7 @@
 package io.findify.s3mock.route
 
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.server.Directives._
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.provider.Provider
 

diff --git a/src/main/scala/io/findify/s3mock/route/MetadataUtil.scala b/src/main/scala/io/findify/s3mock/route/MetadataUtil.scala
@@ -3,8 +3,8 @@ package io.findify.s3mock.route
 import java.lang.Iterable
 import java.util
 
-import akka.http.javadsl.model.HttpHeader
-import akka.http.scaladsl.model.HttpRequest
+import org.apache.pekko.http.javadsl.model.HttpHeader
+import org.apache.pekko.http.scaladsl.model.HttpRequest
 import com.amazonaws.AmazonClientException
 import com.amazonaws.services.s3.Headers
 import com.amazonaws.services.s3.internal.ServiceUtils

diff --git a/src/main/scala/io/findify/s3mock/route/PutObject.scala b/src/main/scala/io/findify/s3mock/route/PutObject.scala
@@ -1,10 +1,10 @@
 package io.findify.s3mock.route
 
-import akka.http.scaladsl.model.{HttpRequest, HttpResponse, StatusCodes}
-import akka.http.scaladsl.server.Directives._
-import akka.stream.Materializer
-import akka.stream.scaladsl.Sink
-import akka.util.ByteString
+import org.apache.pekko.http.scaladsl.model.{HttpRequest, HttpResponse, StatusCodes}
+import org.apache.pekko.http.scaladsl.server.Directives._
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.util.ByteString
 import com.amazonaws.services.s3.model.ObjectMetadata
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.S3ChunkedProtocolStage

diff --git a/src/main/scala/io/findify/s3mock/route/PutObjectMultipart.scala b/src/main/scala/io/findify/s3mock/route/PutObjectMultipart.scala
@@ -1,12 +1,12 @@
 package io.findify.s3mock.route
 
-import akka.NotUsed
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.model.headers.ETag
-import akka.http.scaladsl.server.Directives._
-import akka.stream.scaladsl.{Flow, Sink}
-import akka.stream.{FlowShape, Graph, Materializer}
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.model.headers.ETag
+import org.apache.pekko.http.scaladsl.server.Directives._
+import org.apache.pekko.stream.scaladsl.{Flow, Sink}
+import org.apache.pekko.stream.{FlowShape, Graph, Materializer}
+import org.apache.pekko.util.ByteString
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.S3ChunkedProtocolStage
 import io.findify.s3mock.error.{InternalErrorException, NoSuchBucketException}

diff --git a/src/main/scala/io/findify/s3mock/route/PutObjectMultipartComplete.scala b/src/main/scala/io/findify/s3mock/route/PutObjectMultipartComplete.scala
@@ -1,7 +1,7 @@
 package io.findify.s3mock.route
 
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.server.Directives._
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.error.{InternalErrorException, NoSuchBucketException}
 import io.findify.s3mock.provider.Provider

diff --git a/src/main/scala/io/findify/s3mock/route/PutObjectMultipartStart.scala b/src/main/scala/io/findify/s3mock/route/PutObjectMultipartStart.scala
@@ -2,8 +2,8 @@ package io.findify.s3mock.route
 
 import java.nio.charset.StandardCharsets
 
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.server.Directives._
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.error.{InternalErrorException, NoSuchBucketException}
 import io.findify.s3mock.provider.Provider

diff --git a/src/test/scala/io/findify/s3mock/ChunkBufferTest.scala b/src/test/scala/io/findify/s3mock/ChunkBufferTest.scala
@@ -1,6 +1,6 @@
 package io.findify.s3mock
 
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import org.scalatest.{FlatSpec, Matchers}
 
 /**

diff --git a/src/test/scala/io/findify/s3mock/DeleteTest.scala b/src/test/scala/io/findify/s3mock/DeleteTest.scala
@@ -1,7 +1,7 @@
 package io.findify.s3mock
 
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model._
 import com.amazonaws.services.s3.model.{AmazonS3Exception, DeleteObjectsRequest}
 
 import scala.collection.JavaConverters._

diff --git a/src/test/scala/io/findify/s3mock/GetPutObjectTest.scala b/src/test/scala/io/findify/s3mock/GetPutObjectTest.scala
@@ -3,10 +3,10 @@ package io.findify.s3mock
 import java.io.ByteArrayInputStream
 import java.util
 
-import akka.actor.ActorSystem
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.{HttpMethods, HttpRequest}
-import akka.stream.ActorMaterializer
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model.{HttpMethods, HttpRequest}
+import org.apache.pekko.stream.ActorMaterializer
 import com.amazonaws.services.s3.model._
 import com.amazonaws.util.IOUtils
 

diff --git a/src/test/scala/io/findify/s3mock/ListBucketsTest.scala b/src/test/scala/io/findify/s3mock/ListBucketsTest.scala
@@ -2,8 +2,8 @@ package io.findify.s3mock
 /**
   * Created by shutty on 8/9/16.
   */
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model._
 
 import scala.collection.JavaConverters._
 import scala.concurrent.Await
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
		addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
		addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
		addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.5.0")