Merge pull request #150 from ing-bank/fix/errorlogs

fix error logs for setting bucket acl and policies

Author: kr7ysztof

build.sbt

@@ -46,7 +46,7 @@ libraryDependencies ++= Seq(
     "com.auth0"                    % "java-jwt"                % "3.9.0",
     "com.typesafe.akka"            %% "akka-testkit"           % akkaVersion       % Test,
     "com.typesafe.akka"            %% "akka-http-testkit"      % akkaHttpVersion   % Test,
-    "org.scalatest"                %% "scalatest"              % "3.1.0"           % "it,test",
+    "org.scalatest"                %% "scalatest"              % "3.1.2"           % "it,test",
     "com.amazonaws"                %  "aws-java-sdk-sts"       % "1.11.723"        % IntegrationTest,
     "com.hazelcast"                % "hazelcast"               % "4.0.1",
     "com.hazelcast"                % "hazelcast-kubernetes"    % "2.0.1"

src/main/scala/com/ing/wbaa/rokku/proxy/handler/LoggerHandlerWithId.scala

@@ -26,8 +26,6 @@ class LoggerHandlerWithId {
     MDC.remove(statusCodeKey)
   }
 
-  def a(x: Any*) = println(x.length)
-
   def info(message: String, args: Any*)(implicit id: RequestId): Unit = {
     MDC.put(requestIdKey, id.value)
     MDC.put(statusCodeKey, "-")
@@ -39,7 +37,10 @@ class LoggerHandlerWithId {
   def warn(message: String, args: Any*)(implicit id: RequestId, statusCode: StatusCode = StatusCodes.Continue): Unit = {
     MDC.put(requestIdKey, id.value)
     MDC.put(statusCodeKey, statusCode.value)
-    log.warn(message, args.asInstanceOf[mutable.WrappedArray[AnyRef]]: _*)
+    if (args.isInstanceOf[mutable.WrappedArray[_]])
+      log.warn(message, args.asInstanceOf[mutable.WrappedArray[AnyRef]]: _*)
+    else
+      log.warn(message, args.asInstanceOf[scala.collection.immutable.$colon$colon[AnyRef]]: _*)
     MDC.remove(requestIdKey)
     MDC.remove(statusCodeKey)
   }
@@ -48,7 +49,10 @@ class LoggerHandlerWithId {
     MDC.put(requestIdKey, id.value)
     MDC.put(statusCodeKey, statusCode.value)
     countLogErrors(MetricsFactory.ERROR_REPORTED_TOTAL)
-    log.error(message, args.asInstanceOf[mutable.WrappedArray[AnyRef]]: _*)
+    if (args.isInstanceOf[mutable.WrappedArray[_]])
+      log.error(message, args.asInstanceOf[mutable.WrappedArray[AnyRef]]: _*)
+    else
+      log.error(message, args.asInstanceOf[scala.collection.immutable.$colon$colon[AnyRef]]: _*)
     MDC.remove(requestIdKey)
     MDC.remove(statusCodeKey)
   }

src/main/scala/com/ing/wbaa/rokku/proxy/provider/aws/S3Client.scala

@@ -48,7 +48,7 @@ trait S3Client {
       s3Client.setBucketAcl(bucketName, acl)
       s3Client.setBucketPolicy(bucketName, """{"Statement": [{"Action": ["s3:GetObject"],"Effect": "Allow","Principal": "*","Resource": ["arn:aws:s3:::*"]}],"Version": "2012-10-17"}""")
     } match {
-      case Failure(exception) => logger.error("setting bucket acls and policies ex={}", exception)
+      case Failure(exception) => logger.error("setting bucket acls and policies ex={}", exception.getMessage)
       case Success(_)         => logger.info("acls and policies for bucket {} done", bucketName)
     }
   }

src/test/scala/com/ing/wbaa/rokku/proxy/provider/LoggerHandlerWithIdSpec.scala

@@ -0,0 +1,46 @@
+package com.ing.wbaa.rokku.proxy.provider
+
+import ch.qos.logback.classic.{ Level, Logger }
+import com.ing.wbaa.rokku.proxy.data.RequestId
+import com.ing.wbaa.rokku.proxy.handler.LoggerHandlerWithId
+import org.scalatest.BeforeAndAfter
+import org.scalatest.diagrams.Diagrams
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
+class LoggerHandlerWithIdSpec extends AnyWordSpec with Matchers with Diagrams with BeforeAndAfter {
+
+  private val logger = new LoggerHandlerWithId
+  implicit val id: RequestId = RequestId("1")
+
+  private val logRoot: Logger = org.slf4j.LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME).asInstanceOf[Logger]
+  private val currentLogLevel = logRoot.getLevel
+  private val val1 = 1
+  private val val2 = 2
+  before(logRoot.setLevel(Level.DEBUG))
+  after(logRoot.setLevel(currentLogLevel))
+
+  "Logger" should {
+    "work" in {
+
+      noException should be thrownBy {
+
+        logger.debug("test debug {}", val1)
+        logger.debug("test debug {} {}", val1, val2)
+        logger.debug("test debug {}", new RuntimeException("RTE").getMessage)
+
+        logger.info("test info {}", val1)
+        logger.info("test info {} {}", val1, val2)
+        logger.info("test info {}", new RuntimeException("RTE").getMessage)
+
+        logger.warn("test warn {}", val1)
+        logger.warn("test warn {} {}", val1, val2)
+        logger.warn("test warn {}", new RuntimeException("RTE").getMessage)
+
+        logger.error("test error {}", val1)
+        logger.error("test error {} {}", val1, val2)
+        logger.error("test error {}", new RuntimeException("RTE").getMessage)
+      }
+    }
+  }
+}