adding various changes based on review feedback

slapula · slapula · commit 2d80bcd96416 · 2017-09-03T15:25:54.000-05:00
diff --git a/aws_lambda/aws_lambda.py b/aws_lambda/aws_lambda.py
@@ -15,6 +15,7 @@
 import botocore
 import pip
 import yaml
+import md5
 
 from .helpers import archive
 from .helpers import mkdir
@@ -457,15 +458,20 @@ def upload_s3(cfg, path_to_zip_file):
     """Upload a function to AWS S3."""
 
     print('Uploading your new Lambda function')
-    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')
-
     account_id = get_account_id(aws_access_key_id, aws_secret_access_key)
-    role = get_role_name(account_id, cfg.get('role', 'lambda_basic_execution'))
-
     client = get_client('s3', aws_access_key_id, aws_secret_access_key,
                         cfg.get('region'))
+    role = get_role_name(account_id, cfg.get('role', 'basic_s3_upload'))
+    byte_stream = b''
+    with open(path_to_zip_file, mode='rb') as fh:
+        byte_stream = fh.read()
+    s3_key_prefix = cfg.get('s3_key_prefix', '/dist')
+    checksum = md5.new(byte_stream).hexdigest()
+    timestamp = str(time.time())
+    filename = '{prefix}{checksum}-{ts}.zip'.format(prefix=s3_key_prefix, checksum=checksum, ts=timestamp)
+    print(filename)
 
     # Do we prefer development variable over config?
     buck_name = (
@@ -476,7 +482,7 @@ def upload_s3(cfg, path_to_zip_file):
     )
     kwargs = {
         'Bucket': '{}'.format(buck_name),
-        'Key': cfg.get('s3_key', '{}.zip'.format(func_name)),
+        'Key': '{}'.format(filename),
         'Body': byte_stream
     }
 
diff --git a/aws_lambda/project_templates/config.yaml b/aws_lambda/project_templates/config.yaml
@@ -2,11 +2,14 @@ region: us-east-1
 
 function_name: my_lambda_function
 handler: service.handler
-# role: lambda_basic_execution
-# bucket_name: my_s3_bucket
-# s3_key: 'path/to/file.zip'
 description: My first lambda function
 runtime: python2.7
+# role: lambda_basic_execution
+
+# S3 upload requires appropriate role with s3:PutObject permission
+# (ex. basic_s3_upload), a destination bucket, and the key prefix
+# bucket_name: 'example-bucket'
+# s3_key_prefix: 'path/to/file/'
 
 # if access key and secret are left blank, boto will use the credentials
 # defined in the [default] section of ~/.aws/credentials.
