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

nficano · nficano · commit 9c2ebd1a3a47 · 2017-07-14T10:52:39.000-04:00
* 'master' of github.com:nficano/python-lambda:
  Cleaned up some verbiage in the env. variables section
  Cleaning up the documentation now that the pull was done.
  Updated documentation with install info
  Adding private environment variable values for deploy - supports non-hard coded values in the config
  Adding Python3.6 support for local and runtime environments
  Bump version: 0.8.2 → 0.8.3
  Bump version: 0.8.1 → 0.8.2
diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,6 @@ docs/_build/
 
 # PyBuilder
 target/
+
+# Jetbrains/PyCharm project files
+.idea/
diff --git a/README.rst b/README.rst
@@ -28,7 +28,7 @@ The *Python-Lambda* library takes away the guess work of developing your Python-
 Requirements
 ============
 
-* Python 2.7 (At the time of writing this, AWS Lambda only supports Python 2.7).
+* Python 2.7 & 3.6 (At the time of writing this, AWS Lambda only supports Python 2.7/3.6).
 * Pip (~8.1.1)
 * Virtualenv (~15.0.0)
 * Virtualenvwrapper (~4.7.1)
@@ -153,13 +153,15 @@ Now try and run:
 
 Environment Variables
 =====================
-Lambda functions support environment variables. In order to set environment variables for your deployed code to use, you can configure them in ``config.yaml``
+Lambda functions support environment variables. In order to set environment variables for your deployed code to use, you can configure them in ``config.yaml``.  To load the
+value for the environment variable at the time of deployment (instead of hard coding them in your configuration file), you can use local environment values (see 'env3' in example code below).
 
 .. code:: yaml
 
   environment_variables:
     env1: foo
     env2: baz
+    env3: ${LOCAL_ENVIRONMENT_VARIABLE_NAME}
 
 This would create environment variables in the lambda instance upon deploy. If your functions don't need environment variables, simply leave this section out of your config.
 
diff --git a/aws_lambda/__init__.py b/aws_lambda/__init__.py
@@ -2,7 +2,7 @@
 # flake8: noqa
 __author__ = 'Nick Ficano'
 __email__ = 'nficano@gmail.com'
-__version__ = '0.8.1'
+__version__ = '0.8.3'
 
 from .aws_lambda import deploy, invoke, init, build, cleanup_old_versions
 
diff --git a/aws_lambda/aws_lambda.py b/aws_lambda/aws_lambda.py
@@ -20,6 +20,7 @@
 from .helpers import mkdir
 from .helpers import read
 from .helpers import timestamp
+from .helpers import get_environment_variable_value
 
 
 log = logging.getLogger(__name__)
@@ -344,7 +345,7 @@ def create_function(cfg, path_to_zip_file):
     """Register and upload a function to AWS Lambda."""
 
     print('Creating your new Lambda function')
-    byte_stream = read(path_to_zip_file)
+    byte_stream = read(path_to_zip_file, binary_file=True)
     aws_access_key_id = cfg.get('aws_access_key_id')
     aws_secret_access_key = cfg.get('aws_secret_access_key')
 
@@ -375,7 +376,7 @@ def create_function(cfg, path_to_zip_file):
         kwargs.update(
             Environment={
                 'Variables': {
-                    key: value
+                    key: get_environment_variable_value(value)
                     for key, value
                     in cfg.get('environment_variables').items()
                 }
@@ -389,7 +390,7 @@ def update_function(cfg, path_to_zip_file):
     """Updates the code of an existing Lambda function"""
 
     print('Updating your Lambda function')
-    byte_stream = read(path_to_zip_file)
+    byte_stream = read(path_to_zip_file, binary_file=True)
     aws_access_key_id = cfg.get('aws_access_key_id')
     aws_secret_access_key = cfg.get('aws_secret_access_key')
 
@@ -422,7 +423,7 @@ def update_function(cfg, path_to_zip_file):
         kwargs.update(
             Environment={
                 'Variables': {
-                    key: value
+                    key: get_environment_variable_value(value)
                     for key, value
                     in cfg.get('environment_variables').items()
                 }
diff --git a/aws_lambda/helpers.py b/aws_lambda/helpers.py
@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
-import datetime as dt
 import os
 import zipfile
-
+import datetime as dt
+import re
 
 def mkdir(path):
     if not os.path.exists(path):
         os.makedirs(path)
 
 
-def read(path, loader=None):
-    with open(path) as fh:
+def read(path, loader=None, binary_file=False):
+    open_mode = 'rb' if binary_file else 'r'
+    with open(path, mode=open_mode) as fh:
         if not loader:
             return fh.read()
         return loader(fh.read())
@@ -30,3 +31,12 @@ def archive(src, dest, filename):
 def timestamp(fmt='%Y-%m-%d-%H%M%S'):
     now = dt.datetime.utcnow()
     return now.strftime(fmt)
+
+
+def get_environment_variable_value(val):
+    env_val = val
+    if val is not None and isinstance(val, str):
+        match = re.search(r'^\${(?P<environment_key_name>\w+)*}$', val)
+        if match is not None:
+            env_val = os.environ.get(match.group('environment_key_name'))
+    return env_val
diff --git a/aws_lambda/project_templates/config.yaml b/aws_lambda/project_templates/config.yaml
@@ -4,6 +4,7 @@ function_name: my_lambda_function
 handler: service.handler
 # role: lambda_basic_execution
 description: My first lambda function
+runtime: python2.7
 
 # if access key and secret are left blank, boto will use the credentials
 # defined in the [default] section of ~/.aws/credentials.
@@ -14,6 +15,7 @@ aws_secret_access_key:
 # timeout: 15
 # memory_size: 512
 #
+
 # Experimental Environment variables
 environment_variables:
     env_1: foo
diff --git a/setup.cfg b/setup.cfg
@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 0.8.1
+current_version = 0.8.3
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}
diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 
 setup(
     name='python-lambda',
-    version='0.8.1',
+    version='0.8.3',
     description='The bare minimum for a Python app running on Amazon Lambda.',
     long_description=readme,
     author='Nick Ficano',
