Related to issue nficano#64 "Subdirectories not included in zip package".

asaolabs · asaolabs · commit 1d42de8b5c25 · 2017-09-13T09:26:31.000-04:00
Added the ability to explicitly define the list of "source" subdirectories in the config.yaml file under a new "build" configuration section.  Decided it was perhaps best to allow explicit declaration of the folder list so we don't build undesirable (.git) folders into the zipfile.  Modified the template config.yaml with this setting as well.
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
@@ -242,24 +243,34 @@ 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', {}))
+    source_directories = [d.strip() for d in build_config.get('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)
-
-        # Copy handler file into root of the packages folder.
-        copyfile(f, os.path.join(path_to_temp, filename))
+        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))
+        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.
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.
