Increase Lambda timeout & memory + fix logging (#15)

build.sbt

@@ -6,30 +6,29 @@ ThisBuild / scalaVersion := "2.13.11"
 
 lazy val root = (project in file("."))
   .settings(
-    name := "da-reference-generator"
+    name := "da-reference-generator",
+    libraryDependencies ++= Seq(
+      awsSdkDynamoDbV2,
+      awsSdkDynamoDbV1 % Test,
+      lambdaJavaCore,
+      lambdaJavaEvents,
+      scalaTest % Test,
+      ocitools,
+      circeCore,
+      circeGeneric,
+      circeParser,
+      scalaLogging,
+      logback,
+      logstash,
+      typesafe,
+      testContainer % Test,
+      testContainerDynalite % Test
+    )
   )
 
-libraryDependencies ++= Seq(
-  awsSdkDynamoDbV2,
-  awsSdkDynamoDbV1 % Test,
-  lambdaJavaCore,
-  lambdaJavaEvents,
-  scalaTest % Test,
-  ocitools,
-  circeCore,
-  circeGeneric,
-  circeParser,
-  scalaLogging,
-  logback,
-  logstash,
-  typesafe,
-  testContainer % Test,
-  testContainerDynalite % Test
-)
-
 (assembly / assemblyJarName) := "reference-generator.jar"
 
 (assembly / assemblyMergeStrategy) := {
-  case PathList("META-INF", xs @_*) => MergeStrategy.discard
+  case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
   case _ => MergeStrategy.first
 }

src/main/scala/uk/gov/nationalarchives/referencegenerator/Lambda.scala

@@ -7,15 +7,14 @@ import com.typesafe.scalalogging.Logger
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider
 import software.amazon.awssdk.regions.Region
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient
-import uk.gov.nationalarchives.referencegenerator.Lambda.{Input, Reference, config, counterClient}
+import uk.gov.nationalarchives.referencegenerator.Lambda.{Input, Reference, config, counterClient, logger}
 import io.circe.syntax._
 import software.amazon.awssdk.http.SdkHttpClient
 import software.amazon.awssdk.http.apache.ApacheHttpClient
 
 import scala.util.{Failure, Success, Try}
 
 class Lambda extends RequestHandler[APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent] {
-  val logger: Logger = Logger[Lambda]
 
   override def handleRequest(event: APIGatewayProxyRequestEvent, context: Context): APIGatewayProxyResponseEvent = {
     val queryParams = event.getQueryStringParameters
@@ -57,7 +56,7 @@ class Lambda extends RequestHandler[APIGatewayProxyRequestEvent, APIGatewayProxy
 }
 
 object Lambda {
-
+  val logger: Logger = Logger[Lambda]
   val sdkHttpClient: SdkHttpClient = ApacheHttpClient.builder().build()
   val counterClient: DynamoDbClient = DynamoDbClient.builder()
     .credentialsProvider(DefaultCredentialsProvider.create())

terraform/root_main.tf

@@ -44,6 +44,8 @@ module "reference_generator_lambda" {
     REFERENCE_COUNTER   = "referenceCounter"
     QUERY_PARAM         = "numberofrefs"
   }
-  runtime = "java11"
-  tags    = local.hosting_common_tags
+  runtime         = "java11"
+  timeout_seconds = 60
+  memory_size     = 1024
+  tags            = local.hosting_common_tags
 }