published 0.1.2

Author: eahefnawy

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@serverless/aws-lambda",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "./serverless.js",
   "publishConfig": {
     "access": "public"
@@ -14,6 +14,7 @@
   "dependencies": {
     "@serverless/aws-iam-role": "^0.1.0",
     "@serverless/aws-s3": "^0.1.0",
+    "@serverless/aws-lambda-layer": "^0.1.0",
     "@serverless/components": "^0.1.0",
     "aws-sdk": "^2.424.0",
     "fs-extra": "^7.0.0",

package.json

@@ -1,3 +1,4 @@
+const path = require('path')
 const aws = require('aws-sdk')
 const { mergeDeepRight, pick } = require('ramda')
 const { Component, hashFile } = require('@serverless/components')
@@ -10,7 +11,7 @@ const {
   pack
 } = require('./utils')
 
-const outputMask = [
+const outputsList = [
   'name',
   'description',
   'memory',
@@ -22,16 +23,17 @@ const outputMask = [
   'runtime',
   'env',
   'role',
+  'layer',
   'arn'
 ]
 
 const defaults = {
-  name: 'serverless',
+  name: 'serverless-layered',
   description: 'AWS Lambda Component',
   memory: 512,
   timeout: 10,
   code: process.cwd(),
-  bucket: null,
+  bucket: undefined,
   shims: [],
   handler: 'handler.hello',
   runtime: 'nodejs8.10',
@@ -54,33 +56,52 @@ class AwsLambda extends Component {
 
     config.role = config.role || (await awsIamRole(config))
 
-    this.cli.status(`Packaging`)
+    if (config.bucket && config.runtime === 'nodejs8.10') {
+      const layer = await this.load('@serverless/aws-lambda-layer')
+
+      const layerInputs = {
+        name: `${config.name}-dependencies`,
+        description: `${config.name} Dependencies Layer`,
+        code: path.join(config.code, 'node_modules'),
+        runtimes: ['nodejs8.10'],
+        prefix: 'nodejs/node_modules',
+        bucket: config.bucket,
+        region: config.region
+      }
+
+      this.cli.status('Deploying Dependencies')
+      const promises = [pack(config.code, config.shims, false), layer(layerInputs)]
+      const res = await Promise.all(promises)
+      config.zipPath = res[0]
+      config.layer = res[1]
+    } else {
+      this.cli.status('Packaging')
+      config.zipPath = await pack(config.code, config.shims)
+    }
 
-    config.zipPath = await pack(config.code, config.shims)
     config.hash = await hashFile(config.zipPath)
 
     let deploymentBucket
     if (config.bucket) {
       deploymentBucket = await this.load('@serverless/aws-s3')
-      await deploymentBucket({ name: config.bucket })
     }
 
     const prevLambda = await getLambda({ lambda, ...config })
 
     if (!prevLambda) {
       if (config.bucket) {
         this.cli.status(`Uploading`)
-        await deploymentBucket.upload({ file: config.zipPath })
+        await deploymentBucket.upload({ name: config.bucket, file: config.zipPath })
       }
 
       this.cli.status(`Creating`)
       config.arn = await createLambda({ lambda, ...config })
     } else {
       config.arn = prevLambda.arn
       if (configChanged(prevLambda, config)) {
-        if (config.bucket) {
+        if (config.bucket && prevLambda.hash !== config.hash) {
           this.cli.status(`Uploading`)
-          await deploymentBucket.upload({ file: config.zipPath })
+          await deploymentBucket.upload({ name: config.bucket, file: config.zipPath })
         }
 
         this.cli.status(`Updating`)
@@ -97,14 +118,15 @@ class AwsLambda extends Component {
     this.state.arn = config.arn
     await this.save()
 
-    const outputs = pick(outputMask, config)
+    const outputs = pick(outputsList, config)
     this.cli.outputs(outputs)
     return outputs
   }
 
   async remove(inputs = {}) {
     const config = mergeDeepRight(defaults, inputs)
     config.name = inputs.name || this.state.name || defaults.name
+
     const lambda = new aws.Lambda({
       region: config.region,
       credentials: this.context.credentials.aws
@@ -113,12 +135,12 @@ class AwsLambda extends Component {
     this.cli.status(`Removing`)
 
     const awsIamRole = await this.load('@serverless/aws-iam-role')
-    const deploymentBucket = await this.load('@serverless/aws-s3')
+    const layer = await this.load('@serverless/aws-lambda-layer')
 
     // there's no need to pass names as input
     // since it's saved in the child component state
     await awsIamRole.remove()
-    await deploymentBucket.remove()
+    await layer.remove()
 
     await deleteLambda({ lambda, name: config.name })
 

serverless.js

@@ -21,7 +21,8 @@ const createLambda = async ({
   description,
   zipPath,
   bucket,
-  role
+  role,
+  layer
 }) => {
   const params = {
     FunctionName: name,
@@ -38,6 +39,10 @@ const createLambda = async ({
     }
   }
 
+  if (layer && layer.arn) {
+    params.Layers = [layer.arn]
+  }
+
   if (bucket) {
     params.Code.S3Bucket = bucket
     params.Code.S3Key = path.basename(zipPath)
@@ -61,7 +66,8 @@ const updateLambda = async ({
   description,
   zipPath,
   bucket,
-  role
+  role,
+  layer
 }) => {
   const functionCodeParams = {
     FunctionName: name,
@@ -88,6 +94,10 @@ const updateLambda = async ({
     }
   }
 
+  if (layer && layer.arn) {
+    functionConfigParams.Layers = [layer.arn]
+  }
+
   await lambda.updateFunctionCode(functionCodeParams).promise()
   const res = await lambda.updateFunctionConfiguration(functionConfigParams).promise()
 
@@ -161,18 +171,25 @@ const configChanged = (pervLambda, lambda) => {
   return not(equals(inputs, prevInputs))
 }
 
-const pack = async (code, shims = []) => {
+const pack = async (code, shims = [], packDeps = true) => {
   if (isArchivePath(code)) {
     return path.resolve(code)
   }
+
+  let exclude = []
+
+  if (!packDeps) {
+    exclude = ['node_modules/**']
+  }
+
   const outputFilePath = path.join(
     tmpdir(),
     `${Math.random()
       .toString(36)
       .substring(6)}.zip`
   )
 
-  return packDir(code, outputFilePath, shims)
+  return packDir(code, outputFilePath, shims, exclude)
 }
 
 module.exports = {