Merge branch 'develop'

@@ -2,3 +2,4 @@ include README.md
 include LICENSE
 include LICENSE
 include requirements.txt
 include requirements.txt
 include kappa/_version
 include kappa/_version
+recursive-include samples *.js *.yml *.cf *.json

+kappa
+=====
+
+**Kappa** is a command line tool that (hopefully) makes it easier to
+deploy, update, and test functions for AWS Lambda.
+
+There are quite a few steps involved in developing a Lambda function.
+You have to:
+
+* Write the function itself (Javascript only for now)
+* Create the IAM roles required by the Lambda function itself (the executing
+role) as well as the policy required by whoever is invoking the Lambda
+function (the invocation role)
+* Zip the function and any dependencies and upload it to AWS Lambda
+* Test the function with mock data
+* Retrieve the output of the function from CloudWatch Logs
+* Add an event source to the function
+* View the output of the live function
+
+Kappa tries to help you with some of this.  The IAM roles are created
+in a CloudFormation template and kappa takes care of creating, updating, and
+deleting the CloudFormation stack.  Kappa will also zip up the function and
+any dependencies and upload them to AWS Lambda.  It also sends test data
+to the uploaded function and finds the related CloudWatch log stream and
+displays the log events.  Finally, it will add the event source to turn
+your function on.
+
+Kappa is a command line tool.  The basic command format is:
+
+    kappa --config <path to config file> <command>
+
+Where ``command`` is one of:
+
+* deploy - deploy the CloudFormation template containing the IAM roles and zip the function and upload it to AWS Lambda
+* test - send test data to the new Lambda function
+* tail - display the most recent log events for the function
+* add-event-source - hook up an event source to your Lambda function
+* delete - delete the CloudFormation stack containing the IAM roles and delete the Lambda function
+
+The ``config file`` is a YAML format file containing all of the information
+about your Lambda function.
+
+An example project based on a Kinesis stream can be found in
+[samples/kinesis](https://github.com/garnaat/kappa/tree/develop/samples/kinesis).
+
+The basic workflow is:
+
+* Create your Lambda function
+* Create your CloudFormation template with the execution and invocation roles
+* Create some sample data
+* Create the YAML config file with all of the information
+* Run ``kappa --config <path-to-config> deploy`` to create roles and upload function
+* Run ``kappa --config <path-to-config> test`` to invoke the function with test data
+* Run ``kappa --config <path-to-config> tail`` to view the functions output in CloudWatch logs
+* Run ``kappa --config <path-to-config> add-event-source`` to hook your function up to the event source
+* Run ``kappa --config <path-to-config> tail`` to see more output
+
+If you have to make changes in your function or in your IAM roles, simply run
+``kappa deploy`` again and the changes will be uploaded as necessary.
\ No newline at end of file

@@ -64,7 +64,7 @@ def set_debug_logger(logger_names=['kappa'], stream=None):
 @click.argument(
 @click.argument(
     'command',
     'command',
     required=True,
     required=True,
-    type=click.Choice(['deploy', 'test', 'tail', 'delete'])
+    type=click.Choice(['deploy', 'test', 'tail', 'add-event-source', 'delete'])
 )
 )
 def main(config=None, debug=False, dryrun=False, command=None):
 def main(config=None, debug=False, dryrun=False, command=None):
     if debug:
     if debug:
@@ -79,6 +79,8 @@ def main(config=None, debug=False, dryrun=False, command=None):
         kappa.tail()
         kappa.tail()
     elif command == 'delete':
     elif command == 'delete':
         kappa.delete()
         kappa.delete()
+    elif command == 'add-event-source':
+        kappa.add_event_source()
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':

@@ -14,6 +14,7 @@
 import logging
 import logging
 import os
 import os
 import zipfile
 import zipfile
+import time
 
 
 import botocore.session
 import botocore.session
 from botocore.exceptions import ClientError
 from botocore.exceptions import ClientError
@@ -23,6 +24,8 @@ LOG = logging.getLogger(__name__)
 
 
 class Kappa(object):
 class Kappa(object):
 
 
+    completed_states = ('CREATE_COMPLETE', 'UPDATE_COMPLETE')
+
     def __init__(self, config):
     def __init__(self, config):
         self.config = config
         self.config = config
         self.session = botocore.session.get_session()
         self.session = botocore.session.get_session()
@@ -52,6 +55,14 @@ class Kappa(object):
             response = cfn.create_stack(
             response = cfn.create_stack(
                 StackName=stack_name, TemplateBody=template_body,
                 StackName=stack_name, TemplateBody=template_body,
                 Capabilities=['CAPABILITY_IAM'])
                 Capabilities=['CAPABILITY_IAM'])
+        done = False
+        while not done:
+            response = cfn.describe_stacks(StackName=stack_name)
+            status = response['Stacks'][0]['StackStatus']
+            LOG.debug('Stack status is: %s', status)
+            if status in self.completed_states:
+                done = True
+            time.sleep(1)
 
 
     def get_role_arn(self, role_name):
     def get_role_arn(self, role_name):
         role_arn = None
         role_arn = None
@@ -157,6 +168,20 @@ class Kappa(object):
         for log_event in response['events']:
         for log_event in response['events']:
             print('%s: %s' % (log_event['timestamp'], log_event['message']))
             print('%s: %s' % (log_event['timestamp'], log_event['message']))
 
 
+    def add_event_source(self):
+        lambda_svc = self.session.create_client('lambda', self.region)
+        try:
+            invoke_role = self.get_role_arn(
+                self.config['cloudformation']['invoke_role'])
+            response = lambda_svc.add_event_source(
+                FunctionName=self.config['lambda']['name'],
+                Role=invoke_role,
+                EventSource=self.config['lambda']['event_source'],
+                BatchSize=self.config['lambda'].get('batch_size', 100))
+            LOG.debug(response)
+        except Exception:
+            LOG.exception('Unable to add event source')
+
     def deploy(self):
     def deploy(self):
         self.create_update_roles(
         self.create_update_roles(
             self.config['cloudformation']['stack_name'],
             self.config['cloudformation']['stack_name'],

+console.log('Loading event');
+exports.handler = function(event, context) {
+   console.log(JSON.stringify(event, null, '  '));
+   for(i = 0; i < event.Records.length; ++i) {
+      encodedPayload = event.Records[i].kinesis.data;
+      payload = new Buffer(encodedPayload, 'base64').toString('ascii');
+      console.log("Decoded payload: " + payload);
+   }
+   context.done(null, "Hello World");  // SUCCESS with message
+};

+---
+profile: personal
+region: us-east-1
+cloudformation:
+  template: roles.cf
+  stack_name: TestKinesis
+  exec_role: ExecRole
+  invoke_role: InvokeRole
+lambda:
+  name: KinesisSample
+  zipfile_name: KinesisSample.zip
+  description: Testing Kinesis Lambda handler
+  path: ProcessKinesisRecords.js
+  handler: ProcessKinesisRecords.handler
+  runtime: nodejs
+  memory_size: 128
+  timeout: 3
+  mode: event
+  event_source: arn:aws:kinesis:us-east-1:084307701560:stream/lambdastream
+  test_data: input.json
+  
\ No newline at end of file

+{
+    "Records": [
+        {
+            "kinesis": {
+                "partitionKey": "partitionKey-3",
+                "kinesisSchemaVersion": "1.0",
+                "data": "SGVsbG8sIHRoaXMgaXMgYSB0ZXN0IDEyMy4=",
+                "sequenceNumber": "49545115243490985018280067714973144582180062593244200961"
+            },
+            "eventSource": "aws:kinesis",
+            "eventID": "shardId-000000000000:49545115243490985018280067714973144582180062593244200961",
+            "invokeIdentityArn": "arn:aws:iam::059493405231:role/testLEBRole",
+            "eventVersion": "1.0",
+            "eventName": "aws:kinesis:record",
+            "eventSourceARN": "arn:aws:kinesis:us-east-1:35667example:stream/examplestream",
+            "awsRegion": "us-east-1"
+        }
+    ]
+}

+{
+    "AWSTemplateFormatVersion": "2010-09-09",
+    "Resources": {
+        "ExecRole": {
+            "Type": "AWS::IAM::Role",
+            "Properties": {
+                "AssumeRolePolicyDocument": {
+                    "Version" : "2012-10-17",
+                    "Statement": [ {
+                        "Effect": "Allow",
+                        "Principal": {
+                            "Service": [ "lambda.amazonaws.com" ]
+                        },
+                        "Action": [ "sts:AssumeRole" ]
+                    } ]
+                }
+            }
+        },
+        "ExecRolePolicies": {
+            "Type": "AWS::IAM::Policy",
+            "Properties": {
+                "PolicyName": "ExecRolePolicy",
+                "PolicyDocument": {
+                    "Version" : "2012-10-17",
+                    "Statement": [ {
+                        "Effect": "Allow",
+                        "Action": [
+                            "logs:*"
+                        ],
+                        "Resource": "arn:aws:logs:*:*:*"
+                    } ]
+                },
+                "Roles": [ { "Ref": "ExecRole" } ]
+            }
+        },
+        "InvokeRole": {
+            "Type": "AWS::IAM::Role",
+            "Properties": {
+                "AssumeRolePolicyDocument": {
+                    "Version" : "2012-10-17",
+                    "Statement": [ {
+                        "Effect": "Allow",
+                        "Principal": {
+                            "Service": [ "s3.amazonaws.com" ]
+                        },
+                        "Action": [ "sts:AssumeRole" ],
+                        "Condition": {
+                            "ArnLike": {
+                                "sts:ExternalId": "arn:aws:s3:::*"
+                            }
+                        }
+                    },
+                    {
+                        "Effect": "Allow",
+                        "Principal": {
+                            "Service": "lambda.amazonaws.com"
+                        },
+                        "Action": "sts:AssumeRole"
+                    } ]
+                }
+            }
+        },
+        "InvokeRolePolicies": {
+            "Type": "AWS::IAM::Policy",
+            "Properties": {
+                "PolicyName": "ExecRolePolicy",
+                "PolicyDocument": {
+                    "Version" : "2012-10-17",
+                    "Statement": [
+                        {
+                            "Effect":"Allow",
+                            "Action":[
+                                "lambda:InvokeFunction",
+                                "kinesis:GetRecords",
+                                "kinesis:GetShardIterator",
+                                "kinesis:DescribeStream",
+                                "kinesis:ListStreams"
+                            ],
+                            "Resource":[
+                                "*"
+                            ]
+                        }
+                    ]
+                },
+                "Roles": [ { "Ref": "InvokeRole" } ]
+            }
+        }
+    }
+}