change file persmissions so allow executable binaries during build; add configuration param to allow inclusion of additional directories in build

Nathan Ogden · Nathan Ogden · commit daa330cd01ed · 2017-06-26T14:22:11.000-04:00
diff --git a/aws_lambda/aws_lambda.py b/aws_lambda/aws_lambda.py
@@ -6,7 +6,7 @@
 import sys
 import time
 from imp import load_source
-from shutil import copy, copyfile
+from shutil import copy, copyfile, copytree
 from tempfile import mkdtemp
 
 import botocore
@@ -207,6 +207,17 @@ def build(src, requirements=False, local_package=None):
             print("Bundling: %r" % filename)
             files.append(os.path.join(src, filename))
 
+    # include additional directories
+    include_paths = cfg.get('include_directories', [])
+    for include_path in include_paths:
+        if not os.path.isdir(include_path):
+            continue
+        print("Bundling: %r" % include_path)
+        copytree(
+            include_path,
+            os.path.join(path_to_temp, include_path)
+        )
+
     # "cd" into `temp_path` directory.
     os.chdir(path_to_temp)
     for f in files:
diff --git a/aws_lambda/helpers.py b/aws_lambda/helpers.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import os
+import stat
 import zipfile
 import datetime as dt
 
-
 def mkdir(path):
     if not os.path.exists(path):
         os.makedirs(path)
@@ -22,7 +22,12 @@ def archive(src, dest, filename):
 
     for root, _, files in os.walk(src):
         for file in files:
-            zfh.write(os.path.join(root, file))
+            filePath = os.path.join(root, file)
+            zfh.write(filePath)
+            # set global read+write+execute permissions (needed to execute binaries)
+            # TODO: set permission from file
+            info = zfh.getinfo(filePath.strip("./"))
+            info.external_attr = 0777 << 16L
     zfh.close()
     return os.path.join(dest, filename)
 
