allow specifying path for mountCode, to point to a relative Lambda mount path

whummer · whummer · commit 5a35b670a4c2 · 2022-07-20T21:42:19.000+02:00
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ custom:
       - my_custom_network
     lambda:
       # Enable this flag to improve performance
-      mountCode: True
+      mountCode: true  # specify either "true", or a relative path to the root Lambda mount path
     docker:
       # Enable this flag to run "docker ..." commands as sudo
       sudo: False
@@ -67,10 +67,13 @@ Note the `stages` attribute in the config above. The `serverless-localstack` plu
 
 ### Mounting Lambda code for better performance
 
-Note that the `localstack.lambda.mountCode` flag above will mount the local directory
-into the Docker container that runs the Lambda code in LocalStack. If you remove this
-flag, your Lambda code is deployed in the traditional way which is more in line with
-how things work in AWS, but also comes with a performance penalty: packaging the code,
+Note that the `localstack.lambda.mountCode` flag above will mount the local directory into
+the Docker container that runs the Lambda code in LocalStack. You can either specify the boolean
+value `true` (to mount the project root folder), or a relative path to the root Lambda mount path
+within your project (e.g., `./functions`).
+
+If you remove this flag, your Lambda code is deployed in the traditional way which is more in
+line with how things work in AWS, but also comes with a performance penalty: packaging the code,
 uploading it to the local S3 service, downloading it in the local Lambda API, extracting
 it, and finally copying/mounting it into a Docker container to run the Lambda. Mounting code
 from multiple projects is not supported with simple configuration, and you must use the
@@ -195,6 +198,7 @@ custom:
 
 ## Change Log
 
+* v1.0.0: Allow specifying path for mountCode, to point to a relative Lambda mount path
 * v0.4.36: Add patch to avoid "TypeError" in AwsDeploy plugin on Serverless v3.4.0+
 * v0.4.35: Add config option to connect to additional Docker networks
 * v0.4.33: Fix parsing StepFunctions endpoint if the endpointInfo isn't defined
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-localstack",
-  "version": "0.4.36",
+  "version": "1.0.0",
   "description": "Connect Serverless to LocalStack!",
   "main": "src/index.js",
   "scripts": {
@@ -18,8 +18,9 @@
     "type": "git",
     "url": "git+ssh://git@github.com/localstack/serverless-localstack"
   },
-  "author": "Waldemar Hummer (whummer)",
+  "author": "LocalStack Team <info@localstack.cloud>",
   "contributors": [
+    "LocalStack Team <info@localstack.cloud>",
     "temyers",
     "Waldemar Hummer (whummer)",
     "Justin McCormick <me@justinmccormick.com>",
diff --git a/src/index.js b/src/index.js
@@ -1,6 +1,7 @@
 'use strict';
 const AWS = require('aws-sdk');
 const fs = require('fs');
+const path = require('path');
 const {promisify} = require('es6-promisify');
 const exec = promisify(require('child_process').exec);
 
@@ -169,7 +170,7 @@ class LocalstackPlugin {
     }
 
     // Patch plugin methods
-    this.skipIfMountLambda('Package', 'packageService')
+    this.skipIfMountLambda('Package', 'packageService');
     function compileFunction(functionName) {
       if (!this.shouldMountCode()) {
         return compileFunction._functionOriginal.apply(null, arguments);
@@ -184,6 +185,10 @@ class LocalstackPlugin {
           if (res.Type === 'AWS::Lambda::Function') {
             res.Properties.Code.S3Bucket = '__local__';
             res.Properties.Code.S3Key = process.cwd();
+            const mountCode = this.config.lambda.mountCode;
+            if (typeof mountCode === 'string' && mountCode.toLowerCase() !== 'true') {
+              res.Properties.Code.S3Key = path.join(res.Properties.Code.S3Key, this.config.lambda.mountCode);
+            }
             if (process.env.LAMBDA_MOUNT_CWD) {
               // Allow users to define a custom working directory for Lambda mounts.
               // For example, when deploying a Serverless app in a Linux VM (that runs Docker) on a
@@ -439,7 +444,7 @@ class LocalstackPlugin {
       }
       return containerID;
     }
-    
+
     return getContainer().then(
       (containerID) => {
         if(containerID) {
