Merge pull request #2 from hypexr/master

deployLambda supports specifying a vpc configuration and waiting for pending lambda changes to complete

Author: eahefnawy

README.md

@@ -172,6 +172,12 @@ const lambdaParams = {
   roleArn: 'aws:iam:role:arn:xxx', // required
   lambdaSrc: 'path/to/lambda/directory' // required. could also be a buffer of a zip file
   memory: 512 // optional, along with the other lambda config
+  vpcConfig: // optional, specify a VPC
+    securityGroupIds:
+      - sg-xxx
+    subnetIds:
+      - subnet-xxx
+      - subnet-xxx
 }
 
 const { lambdaArn, lambdaSize, lambdaSha } = await aws.utils.updateOrCreateLambda(params)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serverless/aws-sdk",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "Powerful Serverless Utilities",
   "main": "src/index.js",
   "author": "Serverless, Inc.",

src/deployLambda.js

@@ -1,6 +1,21 @@
 const fs = require('fs')
 const { sleep, zip } = require('./utils')
 
+
+const getVpcConfig = (vpcConfig) => {
+  if (vpcConfig == 'undefined' || vpcConfig == null) {
+    return {
+      SecurityGroupIds: [],
+      SubnetIds: []
+    }
+  }
+
+  return {
+    SecurityGroupIds: vpcConfig.securityGroupIds,
+    SubnetIds: vpcConfig.subnetIds
+  }
+}
+
 const updateOrCreateLambda = async (aws, params = {}) => {
   try {
     if (!params.lambdaName) {
@@ -31,6 +46,8 @@ const updateOrCreateLambda = async (aws, params = {}) => {
 
     const lambda = new aws.Lambda()
 
+    const vpcConfig = getVpcConfig(params.vpcConfig)
+
     try {
       const updateFunctionConfigurationParams = {
         FunctionName: params.lambdaName, // required
@@ -43,11 +60,15 @@ const updateOrCreateLambda = async (aws, params = {}) => {
         Runtime: params.runtime || 'nodejs12.x',
         Environment: {
           Variables: params.env || {}
-        }
+        },
+        VpcConfig: vpcConfig
       }
 
       await lambda.updateFunctionConfiguration(updateFunctionConfigurationParams).promise()
 
+      // Updates (like vpc changes) need to complete before calling updateFunctionCode
+      await lambda.waitFor('functionUpdated', { FunctionName: params.lambdaName }).promise()
+
       const updateFunctionCodeParams = {
         FunctionName: params.lambdaName, // required
         ZipFile: params.lambdaSrc, // required
@@ -80,7 +101,8 @@ const updateOrCreateLambda = async (aws, params = {}) => {
         Timeout: params.timeout || 300,
         Layers: params.layers || [],
         Runtime: params.runtime || 'nodejs12.x',
-        Publish: params.publish === true ? true : false
+        Publish: params.publish === true ? true : false,
+        VpcConfig: vpcConfig
       }
 
       const lambdaRes = await lambda.createFunction(createFunctionParams).promise()