Add lambda ZipFile property

tests/test_awslambda.py

@@ -1,5 +1,5 @@
 import unittest
-from troposphere import GetAtt, Template
+from troposphere import GetAtt, Template, Join
 from troposphere.awslambda import Code, Function
 
 
@@ -20,5 +20,29 @@ def test_exclusive(self):
         t.add_resource(lambda_func)
         t.to_json()
 
+    def test_zip_file(self):
+        lambda_func = Function(
+            "AMIIDLookup",
+            Handler="index.handler",
+            Role=GetAtt("LambdaExecutionRole", "Arn"),
+            Code=Code(
+                ZipFile=Join("", [
+                    "var response = require('cfn-response');",
+                    "exports.handler = function(event, context) {",
+                    "  var input = parseInt(event.ResourceProperties.Input);",
+                    "  var responseData = {Value: input * 5};",
+                    "  response.send("
+                    "    event, context, response.SUCCESS, responseData"
+                    "  );",
+                    "};"
+                ]),
+            ),
+            Runtime="nodejs",
+            Timeout="25",
+        )
+        t = Template()
+        t.add_resource(lambda_func)
+        t.to_json()
+
 if __name__ == '__main__':
     unittest.main()

troposphere/awslambda.py

@@ -4,11 +4,35 @@
 
 class Code(AWSProperty):
     props = {
-        'S3Bucket': (basestring, True),
-        'S3Key': (basestring, True),
+        'S3Bucket': (basestring, False),
+        'S3Key': (basestring, False),
         'S3ObjectVersion': (basestring, False),
+        'ZipFile': (basestring, False)
     }
 
+    def __init__(self, title=None, **kwargs):
+        super(Code, self).__init__(title, **kwargs)
+
+        if 'ZipFile' in kwargs:
+            if 'S3Bucket' in kwargs:
+                raise ValueError(
+                    "You can't specify both 'S3Bucket' and 'ZipFile'"
+                )
+            elif 'S3Key' in kwargs:
+                raise ValueError(
+                    "You can't specify both 'S3Key' and 'ZipFile'"
+                )
+            elif 'S3ObjectVersion' in kwargs:
+                raise ValueError(
+                    "You can't specify both 'S3ObjectVersion' and 'ZipFile'"
+                )
+        else:  # ZipFile not specified
+            if 'S3Bucket' not in kwargs or 'S3Key' not in kwargs:
+                raise ValueError(
+                    'You must specify a bucket location (both the S3Bucket '
+                    'and S3Key properties) or the ZipFile property'
+                )
+
 
 class Function(AWSObject):
     resource_type = "AWS::Lambda::Function"