Fix: s3Prefix actually works for createLambda

realestate-com-au · Feb 15, 2017 · 87a24f6 · 87a24f6
1 parent 56e92f3
commit 87a24f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/scala/com/gilt/aws/lambda/AwsLambda.scala b/src/main/scala/com/gilt/aws/lambda/AwsLambda.scala
@@ -41,6 +41,7 @@ private[lambda] object AwsLambda {
                    handlerName: HandlerName,
                    roleName: RoleARN,
                    s3BucketId: S3BucketId,
+                   s3Prefix: String,
                    timeout:  Option[Timeout],
                    memory: Option[Memory]
                     ): Try[CreateFunctionResult] = {
@@ -60,7 +61,7 @@ private[lambda] object AwsLambda {
         val functionCode = {
           val c = new FunctionCode
           c.setS3Bucket(s3BucketId.value)
-          c.setS3Key(jar.getName)
+          c.setS3Key(s3Prefix + jar.getName)
           c
         }
 

diff --git a/src/main/scala/com/gilt/aws/lambda/AwsLambdaPlugin.scala b/src/main/scala/com/gilt/aws/lambda/AwsLambdaPlugin.scala
@@ -91,7 +91,8 @@ object AwsLambdaPlugin extends AutoPlugin {
     AwsS3.pushJarToS3(jar, resolvedBucketId, resolvedS3KeyPrefix) match {
       case Success(s3Key) =>
         for ((resolvedLambdaName, resolvedHandlerName) <- resolvedLambdaHandlers) yield {
-          AwsLambda.createLambda(resolvedRegion, jar, resolvedLambdaName, resolvedHandlerName, resolvedRoleName, resolvedBucketId, resolvedTimeout, resolvedMemory) match {
+          AwsLambda.createLambda(resolvedRegion, jar, resolvedLambdaName, resolvedHandlerName, resolvedRoleName,
+            resolvedBucketId, resolvedS3KeyPrefix, resolvedTimeout, resolvedMemory) match {
             case Success(createFunctionCodeResult) =>
               resolvedLambdaName.value -> LambdaARN(createFunctionCodeResult.getFunctionArn)
             case Failure(exception) =>