forgot to add refs to upload func

slapula · slapula · commit 5d9a6af2d4d2 · 2017-08-17T23:12:32.000-05:00
diff --git a/aws_lambda/__init__.py b/aws_lambda/__init__.py
@@ -4,7 +4,7 @@
 __email__ = 'nficano@gmail.com'
 __version__ = '1.0.1'
 
-from .aws_lambda import deploy, invoke, init, build, cleanup_old_versions
+from .aws_lambda import deploy, invoke, init, build, upload, cleanup_old_versions
 
 # Set default logging handler to avoid "No handler found" warnings.
 import logging
diff --git a/aws_lambda/aws_lambda.py b/aws_lambda/aws_lambda.py
@@ -476,8 +476,8 @@ def upload_s3(cfg, path_to_zip_file):
     )
     kwargs = {
         'Bucket': cfg.get('bucket_name'),
-        'Key': cfg.get('s3_key', '{}'.format(func_name)),
-        'Body': {'ZipFile': byte_stream}
+        'Key': cfg.get('s3_key', '{}.zip'.format(func_name)),
+        'Body': byte_stream
     }
 
     client.put_object(**kwargs)
diff --git a/scripts/lambda b/scripts/lambda
@@ -46,7 +46,11 @@ def invoke(event_file, verbose):
 def deploy(use_requirements, local_package):
     aws_lambda.deploy(CURRENT_DIR, use_requirements, local_package)
 
-
+@click.command(help="Upload your lambda to S3.")
+@click.option('--use-requirements', default=False, is_flag=True, help='Install all packages defined in requirements.txt')
+@click.option('--local-package', default=None, help='Install local package as well.', type=click.Path(), multiple=True)
+def upload(use_requirements, local_package):
+    aws_lambda.upload(CURRENT_DIR, use_requirements, local_package)
 
 @click.command(help="Delete old versions of your functions")
 @click.option("--keep-last", type=int, prompt="Please enter the number of recent versions to keep")
@@ -57,6 +61,7 @@ if __name__ == '__main__':
     cli.add_command(init)
     cli.add_command(invoke)
     cli.add_command(deploy)
+    cli.add_command(upload)
     cli.add_command(build)
     cli.add_command(cleanup)
     cli()

Original file line number	Diff line number	Diff line change
`@@ -476,8 +476,8 @@ def upload_s3(cfg, path_to_zip_file):`
`476`	`476`	`)`
`477`	`477`	`kwargs = {`
`478`	`478`	`'Bucket': cfg.get('bucket_name'),`
`479`		`- 'Key': cfg.get('s3_key', '{}'.format(func_name)),`
`480`		`- 'Body': {'ZipFile': byte_stream}`
	`479`	`+ 'Key': cfg.get('s3_key', '{}.zip'.format(func_name)),`
	`480`	`+ 'Body': byte_stream`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`client.put_object(**kwargs)`