Merging environment variable support into master

jmeekhof · jmeekhof · commit 81300c1746ef · 2017-06-16T16:38:42.000Z
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,20 @@
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,py}]
+charset = utf-8
+trim_trailing_whitespace = true
+
+# 4 space indentation
+[*.py]
+indent_style = space
+indent_size = 4
+
+[*.rst]
+trim_trailing_whitespace = true
diff --git a/README.rst b/README.rst
@@ -151,6 +151,18 @@ Now try and run:
            https://<API endpoint URL>
     # 5.8580000000000005
 
+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``
+
+.. code:: yaml
+    environment_variables:
+        env1: foo
+        env2: baz
+
+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.
+
+
 Development
 ===========
 
diff --git a/aws_lambda/aws_lambda.py b/aws_lambda/aws_lambda.py
@@ -348,29 +348,35 @@ def create_function(cfg, path_to_zip_file):
     client = get_client('lambda', aws_access_key_id, aws_secret_access_key,
                         cfg.get('region'))
 
+    #Do we prefer development variable over config?
     func_name = (
         os.environ.get('LAMBDA_FUNCTION_NAME') or cfg.get('function_name')
     )
     print('Creating lambda function with name: {}'.format(func_name))
-    client.create_function(
-        FunctionName=func_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_')
+    kwargs={
+        'FunctionName': func_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),
+        'Publish': True
+    }
+
+    if 'environment_variables' in cfg:
+        kwargs.update(
+            Environment = {
+                'Variables': {
+                    key: value
+                    for key, value
+                    in cfg.get('environment_variables').items()
+                }
             }
-        },
-        Publish=True
-    )
+        )
 
+    client.create_function( **kwargs )
 
 def update_function(cfg, path_to_zip_file):
     """Updates the code of an existing Lambda function"""
@@ -392,18 +398,31 @@ def update_function(cfg, path_to_zip_file):
         Publish=True
     )
 
-    client.update_function_configuration(
-        FunctionName=cfg.get('function_name'),
-        Role=role,
-        Handler=cfg.get('handler'),
-        Description=cfg.get('description'),
-        Timeout=cfg.get('timeout', 15),
-        MemorySize=cfg.get('memory_size', 512),
-        VpcConfig={
+    kwargs = {
+        'FunctionName': cfg.get('function_name'),
+        'Role': role,
+        'Handler': cfg.get('handler'),
+        'Description': cfg.get('description'),
+        'Timeout': cfg.get('timeout', 15),
+        'MemorySize': cfg.get('memory_size', 512),
+        'VpcConfig': {
             'SubnetIds': cfg.get('subnet_ids', []),
             'SecurityGroupIds': cfg.get('security_group_ids', [])
         }
-    )
+    }
+
+    if 'environment_variables' in cfg:
+        kwargs.update(
+            Environment={
+                'Variables': {
+                    key: value
+                    for key, value
+                    in cfg.get('environment_variables').items()
+                }
+            }
+        )
+
+    client.update_function_configuration(**kwargs)
 
 
 def function_exists(cfg, function_name):
diff --git a/aws_lambda/project_templates/config.yaml b/aws_lambda/project_templates/config.yaml
@@ -13,3 +13,8 @@ aws_secret_access_key:
 # dist_directory: dist
 # timeout: 15
 # memory_size: 512
+#
+# Experimental Environment variables
+environment_variables:
+    env_1: foo
+    env_2: baz
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-boto3==1.4.1
-botocore==1.4.61
+boto3==1.4.4
+botocore==1.5.62
 click==6.6
 docutils==0.12
 futures==3.0.5
