Merge branch 'master' into master

README.md

@@ -108,29 +108,34 @@ $ node-lambda deploy --help
 
   Options:
 
-    -h, --help                        output usage information
-    -e, --environment [staging]       Choose environment {development, staging, production}
-    -a, --accessKey [your_key]        AWS Access Key
-    -s, --secretKey [your_secret]     AWS Secret Key
-    -P, --profile [your_profile]      AWS Profile
-    -k, --sessionToken [your_token]   AWS Session Token
-    -r, --region [us-east-1]          AWS Region(s)
-    -n, --functionName [node-lambda]  Lambda FunctionName
-    -H, --handler [index.handler]     Lambda Handler {index.handler}
-    -o, --role [your_role]            Amazon Role ARN
-    -m, --memorySize [128]            Lambda Memory Size
-    -t, --timeout [3]                 Lambda Timeout
-    -d, --description [missing]       Lambda Description
-    -u, --runtime [nodejs4.3]         Lambda Runtime {nodejs4.3, nodejs} - "nodejs4.3" is the current standard, "nodejs" is v0.10.36
-    -p, --publish [false]             This boolean parameter can be used to request AWS Lambda to create the Lambda function and publish a version as an atomic operation
-    -v, --version [custom-version]    Lambda Version
-    -f, --configFile []               Path to file holding secret environment variables (e.g. "deploy.env")
-    -b, --vpcSubnets []               VPC Subnet ID(s, comma separated list) for your Lambda Function, when using this, the below param is also required
-    -g, --vpcSecurityGroups []        VPC Security Group ID(s, comma separated list) for your Lambda Function, when using this, the above param is also required
-    -A, --packageDirectory []         Local package directory
-    -x, --excludeGlobs []             Add a space separated list of file(type)s to ignore (e.g. "*.json .env")
-    -D, --prebuiltDirectory []        Prebuilt directory
-    -T, --deployTimeout [120000]      Deploy Timeout
+    -h, --help                                 output usage information
+    -e, --environment [staging]                Choose environment {development, staging, production}
+    -a, --accessKey [your_key]                 AWS Access Key
+    -s, --secretKey [your_secret]              AWS Secret Key
+    -P, --profile [your_profile]               AWS Profile
+    -k, --sessionToken [your_token]            AWS Session Token
+    -r, --region [us-east-1]                   AWS Region(s)
+    -n, --functionName [node-lambda]           Lambda FunctionName
+    -H, --handler [index.handler]              Lambda Handler {index.handler}
+    -o, --role [your_role]                     Amazon Role ARN
+    -m, --memorySize [128]                     Lambda Memory Size
+    -t, --timeout [3]                          Lambda Timeout
+    -d, --description [missing]                Lambda Description
+    -u, --runtime [nodejs6.10]                 Lambda Runtime {nodejs6.10, nodejs4.3}
+    -p, --publish [false]                      This boolean parameter can be used to request AWS Lambda to create the Lambda function and publish a version as an atomic operation
+    -L, --lambdaVersion [custom-version]       Lambda Version
+    -f, --configFile []                        Path to file holding secret environment variables (e.g. "deploy.env")
+    -b, --vpcSubnets []                        VPC Subnet ID(s, comma separated list) for your Lambda Function, when using this, the below param is also required
+    -g, --vpcSecurityGroups []                 VPC Security Group ID(s, comma separated list) for your Lambda Function, when using this, the above param is also required
+    -Q, --deadLetterConfigTargetArn []         Lambda DLQ resource
+    -T, --tracingConfig []                     Lambda tracing settings
+    -A, --packageDirectory []                  Local package directory
+    -I, --dockerImage []                       Docker image for npm install
+    -S, --eventSourceFile [event_sources.json] Path to file holding event source mapping variables (e.g. "event_sources.json")
+    -x, --excludeGlobs []                      Add a space separated list of file(type)s to ignore (e.g. "*.json .env")
+    -D, --prebuiltDirectory []                 Prebuilt directory
+    -z, --deployZipfile []                     Deploy zipfile
+    -T, --deployTimeout [120000]               Deploy Timeout
 ```
 
 ## Custom Environment Variables

bin/node-lambda

@@ -72,6 +72,15 @@ var PACKAGE_DIRECTORY = process.env.PACKAGE_DIRECTORY;
 var CONTEXT_FILE = process.env.CONTEXT_FILE || 'context.json';
 var PREBUILT_DIRECTORY = process.env.PREBUILT_DIRECTORY || '';
 var DEPLOY_TIMEOUT = process.env.DEPLOY_TIMEOUT || 120000;
+var DOCKER_IMAGE = process.env.DOCKER_IMAGE || '';
+var DEPLOY_ZIPFILE = process.env.DEPLOY_ZIPFILE || '';
+var AWS_DLQ_TARGET_ARN = (function() {
+  // You can clear the setting by passing an empty string
+  // when executing updateFunctionConfiguration
+  if (process.env.AWS_DLQ_TARGET_ARN !== undefined)
+    return process.env.AWS_DLQ_TARGET_ARN
+  return undefined;
+})();
 
 program
   .command('deploy')
@@ -109,7 +118,8 @@ program
   .option('-x, --excludeGlobs [' + EXCLUDE_GLOBS + ']',
     'Space-separated glob pattern(s) for additional exclude files (e.g. "event.json dotenv.sample")', EXCLUDE_GLOBS)
   .option('-D, --prebuiltDirectory [' + PREBUILT_DIRECTORY + ']', 'Prebuilt directory', PREBUILT_DIRECTORY)
-   .option('-T, --deployTimeout [' + DEPLOY_TIMEOUT + ']', 'Deploy Timeout', DEPLOY_TIMEOUT)
+  .option('-T, --deployTimeout [' + DEPLOY_TIMEOUT + ']', 'Deploy Timeout', DEPLOY_TIMEOUT)
+  .option('-z, --deployZipfile [' + DEPLOY_ZIPFILE + ']', 'Deploy zipfile', DEPLOY_ZIPFILE)
   .action(function (prg) {
     lambda.deploy(prg);
   });