Log to stdout and fixes for findify#83 and findify#80

Author: mgladdish

build.sbt

@@ -20,18 +20,27 @@ libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion % "test",
   "org.scala-lang.modules" %% "scala-xml" % "1.0.6",
   "com.github.pathikrit" %% "better-files" % "2.17.1",
-  "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2",
+  "com.typesafe.scala-logging" %% "scala-logging" % "3.8.0",
+  "org.slf4j" % "slf4j-simple" % "1.8.0-beta1", // To send logging to standard out, so it can appear in the container's log
   "com.amazonaws" % "aws-java-sdk-s3" % "1.11.224",
   "org.scalatest" %% "scalatest" % "3.0.4" % "test",
   "ch.qos.logback" % "logback-classic" % "1.2.3" % "test",
-  "org.iq80.leveldb" % "leveldb" % "0.9",
+  "org.iq80.leveldb" % "leveldb" % "0.10", // See https://github.com/findify/s3mock/issues/83
   "com.lightbend.akka" %% "akka-stream-alpakka-s3" % "0.14" % "test"
 )
 
 parallelExecution in Test := false
 
 publishMavenStyle := true
 
+// Fixes duplicate error on building docker image, caused by adding the slf4j-simple dependency above
+assemblyMergeStrategy in assembly := {
+  case "module-info.class" => MergeStrategy.discard
+  case x =>
+    val oldStrategy = (assemblyMergeStrategy in assembly).value
+    oldStrategy(x)
+}
+
 publishTo := {
   val nexus = "https://oss.sonatype.org/"
   if (isSnapshot.value)
@@ -59,14 +68,14 @@ mainClass in assembly := Some("io.findify.s3mock.Main")
 test in assembly := {}
 
 dockerfile in docker := new Dockerfile {
-  from("openjdk:9.0.1-11-jre-slim")
+  from("openjdk:8-alpine") // see https://github.com/findify/s3mock/issues/83
   expose(8001)
   add(assembly.value, "/app/s3mock.jar")
-  entryPoint("java", "-Xmx128m", "-jar", "/app/s3mock.jar")
+  entryPoint("sh", "-c", "java -Xmx128m $JAVA_ARGS -jar /app/s3mock.jar")
 }
 imageNames in docker := Seq(
-  ImageName(s"findify/s3mock:${version.value.replaceAll("\\+", "_")}"),
-  ImageName(s"findify/s3mock:latest")
+  ImageName(s"uxforms/s3mock:${version.value.replaceAll("\\+", "_")}"),
+  ImageName(s"uxforms/s3mock:latest")
 )
 
 /*enablePlugins(JavaAppPackaging)

src/main/scala/io/findify/s3mock/Main.scala

@@ -1,14 +1,74 @@
 package io.findify.s3mock
 
+import java.util
+
 import better.files.File
+import com.amazonaws.auth.{AWSStaticCredentialsProvider, AnonymousAWSCredentials}
+import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration
+import com.amazonaws.services.s3.{AmazonS3, AmazonS3ClientBuilder}
+import com.typesafe.config.{Config, ConfigFactory}
 import io.findify.s3mock.provider.FileProvider
 
 /**
   * Created by shutty on 8/9/16.
   */
 object Main {
+
+  private val options = ConfigOptions(ConfigFactory.load().getConfig("s3mock"))
+
   def main(args: Array[String]): Unit = {
-    val server = new S3Mock(8001, new FileProvider(File.newTemporaryDirectory(prefix = "s3mock").pathAsString))
+
+    println(s"JAVA_ARGS: ${System.getenv("JAVA_ARGS")}")
+    println(s"Options: $options")
+
+    val server = new S3Mock(options.port, new FileProvider(options.dir))
+
     server.start
+
+    createBuckets(buildClient(options.host, options.port, options.region), options.initBuckets)
+  }
+
+  private def createBuckets(client: AmazonS3, buckets: Set[String]): Unit = {
+    try {
+      buckets.foreach(b => {
+        client.createBucket(b)
+        println(s"Created bucket: $b")
+      })
+    } finally {
+      client.shutdown()
+    }
+  }
+
+  private def buildClient(host: String, port: Int, region: String): AmazonS3 = {
+    val endpoint = new EndpointConfiguration(s"http://$host:$port", region)
+    AmazonS3ClientBuilder.standard()
+      .withPathStyleAccessEnabled(true)
+      .withCredentials(new AWSStaticCredentialsProvider(new AnonymousAWSCredentials()))
+      .withEndpointConfiguration(endpoint)
+      .build()
   }
 }
+
+
+case class ConfigOptions(dir: String, region: String, host: String, port: Int, initBuckets: Set[String])
+
+object ConfigOptions {
+
+  def apply(config: Config): ConfigOptions = {
+
+    def getWithDefault[T](path: String, default: T): T = {
+      if (config.hasPath(path)) config.getAnyRef(path).asInstanceOf[T] else default
+    }
+
+    import scala.collection.JavaConverters._
+
+    ConfigOptions(
+      getWithDefault("dir", File.newTemporaryDirectory(prefix = "s3mock").pathAsString),
+      getWithDefault("region", "eu-west-1"),
+      getWithDefault("host", "localhost"),
+      getWithDefault("port", 8001),
+      getWithDefault("initBuckets", new util.HashMap[String, String]()).asScala.values.toSet
+    )
+  }
+
+}

src/main/scala/io/findify/s3mock/route/PutObject.scala

@@ -51,16 +51,22 @@ case class PutObject(implicit provider:Provider, mat:Materializer) extends LazyL
           val metadata = populateObjectMetadata(request, bytes)
           Try(provider.putObject(bucket, path, bytes, metadata)) match {
             case Success(()) => HttpResponse(StatusCodes.OK)
-            case Failure(e: NoSuchBucketException) =>
+            case Failure(e: NoSuchBucketException) => {
+              println(s"FAILURE - NoSuchBucket: $e")
+              e.printStackTrace()
               HttpResponse(
                 StatusCodes.NotFound,
                 entity = e.toXML.toString()
               )
-            case Failure(t) =>
+            }
+            case Failure(t) => {
+              println(s"FAILURE: ${t}")
+              t.printStackTrace()
               HttpResponse(
                 StatusCodes.InternalServerError,
                 entity = InternalErrorException(t).toXML.toString()
               )
+            }
           }
         }).runWith(Sink.head[HttpResponse])
       result