Fallback to timeout and memorySize from provider

dherault · May 3, 2019 · f70da0b · f70da0b
1 parent 3307aa0
commit f70da0b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 23 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/createAuthScheme.js b/src/createAuthScheme.js
@@ -117,7 +117,7 @@ function createAuthScheme(
 
       let done = false;
       // Creat the Lambda Context for the Auth function
-      const lambdaContext = createLambdaContext(authFun, (err, result, fromPromise) => {
+      const lambdaContext = createLambdaContext(authFun, serverless.service.provider, (err, result, fromPromise) => {
         if (done) {
           const warning = fromPromise
             ? `Warning: Auth function '${authFunName}' returned a promise and also uses a callback!\nThis is problematic and might cause issues in your lambda.`

diff --git a/src/createLambdaContext.js b/src/createLambdaContext.js
@@ -4,10 +4,11 @@ const utils = require('./utils');
   Mimicks the lambda context object
   http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-context.html
 */
-module.exports = function createLambdaContext(fun, cb) {
+module.exports = function createLambdaContext(fun, provider, cb) {
 
   const functionName = fun.name;
-  const endTime = new Date().getTime() + (fun.timeout ? fun.timeout * 1000 : 6000);
+  const timeout = (fun.timeout ? fun.timeout : provider.timeout ? provider.timeout : 6) * 1000; // default 6 second timeout
+  const endTime = new Date().getTime() + timeout;
   const done = typeof cb === 'function' ? cb : ((x, y) => x || y); // eslint-disable-line no-extra-parens
 
   return {
@@ -19,7 +20,7 @@ module.exports = function createLambdaContext(fun, cb) {
 
     /* Properties */
     functionName,
-    memoryLimitInMB:    fun.memorySize,
+    memoryLimitInMB:    fun.memorySize || provider.memorySize,
     functionVersion:    `offline_functionVersion_for_${functionName}`,
     invokedFunctionArn: `offline_invokedFunctionArn_for_${functionName}`,
     awsRequestId:       `offline_awsRequestId_${utils.randomId()}`,

diff --git a/src/index.js b/src/index.js
@@ -649,7 +649,7 @@ class Offline {
             debugLog('event:', event);
 
             // We create the context, its callback (context.done/succeed/fail) will send the HTTP response
-            const lambdaContext = createLambdaContext(fun, (err, data, fromPromise) => {
+            const lambdaContext = createLambdaContext(fun, this.service.provider, (err, data, fromPromise) => {
               // Everything in this block happens once the lambda function has resolved
               debugLog('_____ HANDLER RESOLVED _____');