Merge pull request nficano#25 from OpenTrons/master

nficano · web-flow · commit fc32da51aa31 · 2017-01-30T13:21:35.000-05:00
add keyword arg for VpcConfig on lambda function update
diff --git a/aws_lambda/aws_lambda.py b/aws_lambda/aws_lambda.py
@@ -294,15 +294,24 @@ def create_function(cfg, path_to_zip_file):
     client = get_client('lambda', aws_access_key_id, aws_secret_access_key,
                         cfg.get('region'))
 
+    function_name = os.environ.get('LAMBDA_FUNCTION_NAME') or cfg.get('function_name')
+    print('Creating lambda function with name: {}'.format(function_name))
     client.create_function(
-        FunctionName=cfg.get('function_name'),
+        FunctionName=function_name,
         Runtime=cfg.get('runtime', 'python2.7'),
         Role=role,
         Handler=cfg.get('handler'),
         Code={'ZipFile': byte_stream},
         Description=cfg.get('description'),
         Timeout=cfg.get('timeout', 15),
         MemorySize=cfg.get('memory_size', 512),
+        Environment={
+            'Variables': {
+                key.strip('LAMBDA_'): value
+                for key, value in os.environ.items()
+                if key.startswith('LAMBDA_')
+            }
+        },
         Publish=True
     )
 
@@ -333,7 +342,11 @@ def update_function(cfg, path_to_zip_file):
         Handler=cfg.get('handler'),
         Description=cfg.get('description'),
         Timeout=cfg.get('timeout', 15),
-        MemorySize=cfg.get('memory_size', 512)
+        MemorySize=cfg.get('memory_size', 512),
+        VpcConfig={
+            'SubnetIds': cfg.get('subnet_ids', []),
+            'SecurityGroupIds': cfg.get('security_group_ids', [])
+        }
     )
 
 
