Merge branch 'master' of github.com:nficano/python-lambda

nficano · nficano · commit 1104f8166009 · 2017-09-18T12:01:05.000-04:00
* 'master' of github.com:nficano/python-lambda: Should address issue nficano#38. The calls to determine whether or not a function exists wasn't calling multiple times if you have more than 50 lambda functions configured. For those users who have lots of functions defined, the deploy will try to re-create an existing lambda function Found some holes in error handling when the config.yaml properties aren't set for the build, build/source_directories properties. We now handle these cases correctly and default to the existing behavior if the values are missing. Related to issue nficano#64 "Subdirectories not included in zip package". Revert "Related to issue nficano#64 "Subdirectories not included in zip package"." Related to issue nficano#64 "Subdirectories not included in zip package".
diff --git a/aws_lambda/aws_lambda.py b/aws_lambda/aws_lambda.py
@@ -9,8 +9,9 @@
 import time
 from imp import load_source
 from shutil import copy
-from shutil import copyfile
+from shutil import copyfile, copytree
 from tempfile import mkdtemp
+from collections import defaultdict
 
 import boto3
 import botocore
@@ -246,24 +247,36 @@ def build(src, requirements=False, local_package=None):
         else output_filename
     )
 
+    # Allow definition of source code directories we want to build into our zipped package.
+    build_config = defaultdict(**cfg.get('build', {}))
+    build_source_directories = build_config.get('source_directories', '')
+    build_source_directories = build_source_directories if build_source_directories is not None else ''
+    source_directories = [d.strip() for d in build_source_directories.split(',')]
+
     files = []
     for filename in os.listdir(src):
         if os.path.isfile(filename):
             if filename == '.DS_Store':
                 continue
             if filename == 'config.yaml':
                 continue
-        # TODO: Check subdirectories for '.DS_Store' files
-        print('Bundling: %r' % filename)
-        files.append(os.path.join(src, filename))
+            print('Bundling: %r' % filename)
+            files.append(os.path.join(src, filename))
+        elif os.path.isdir(filename) and filename in source_directories:
+            print('Bundling directory: %r' % filename)
+            files.append(os.path.join(src, filename))
 
     # "cd" into `temp_path` directory.
     os.chdir(path_to_temp)
     for f in files:
-        _, filename = os.path.split(f)
+        if os.path.isfile(f):
+            _, filename = os.path.split(f)
 
-        # Copy handler file into root of the packages folder.
-        copyfile(f, os.path.join(path_to_temp, filename))
+            # Copy handler file into root of the packages folder.
+            copyfile(f, os.path.join(path_to_temp, filename))
+        elif os.path.isdir(f):
+            destination_folder = os.path.join(path_to_temp, f[len(src) + 1:])
+            copytree(f, destination_folder)
 
     # Zip them together into a single file.
     # TODO: Delete temp directory created once the archive has been compiled.
@@ -527,8 +540,13 @@ def function_exists(cfg, function_name):
         'lambda', aws_access_key_id, aws_secret_access_key,
         cfg.get('region'),
     )
-    functions = client.list_functions().get('Functions', [])
-    for fn in functions:
-        if fn.get('FunctionName') == function_name:
-            return True
-    return False
+
+    # Need to loop through until we get all of the lambda functions returned.  It appears
+    # to be only returning 50 functions at a time.
+    functions = []
+    functions_resp = client.list_functions()
+    functions.extend([f['FunctionName'] for f in functions_resp.get('Functions', [])])
+    while('NextMarker' in functions_resp):
+        functions_resp = client.list_functions(Marker=functions_resp.get('NextMarker'))
+        functions.extend([f['FunctionName'] for f in functions_resp.get('Functions', [])])
+    return function_name in functions
diff --git a/aws_lambda/project_templates/config.yaml b/aws_lambda/project_templates/config.yaml
@@ -25,3 +25,7 @@ aws_secret_access_key:
 environment_variables:
     env_1: foo
     env_2: baz
+
+# Build options
+build:
+  source_directories: lib # a comma delimited list of directories in your project root that contains source to package.
