Merge pull request #15 from garnaat/fix-examples

Updating samples and fixing some bugs found in the process.

@@ -58,10 +58,6 @@ class Context(object):
         return self.config.get('region', None)
         return self.config.get('region', None)
 
 
     @property
     @property
-    def cfn_config(self):
-        return self.config.get('cloudformation', None)
-
-    @property
     def lambda_config(self):
     def lambda_config(self):
         return self.config.get('lambda', None)
         return self.config.get('lambda', None)
 
 

@@ -213,4 +213,4 @@ class SNSEventSource(EventSource):
 
 
     def status(self, function):
     def status(self, function):
         LOG.debug('status for SNS notification for %s', function.name)
         LOG.debug('status for SNS notification for %s', function.name)
-        return self.exist(function)
+        return self.exists(function)

@@ -20,8 +20,6 @@ LOG = logging.getLogger(__name__)
 
 
 class Policy(object):
 class Policy(object):
 
 
-    Path = '/kappa/'
-
     def __init__(self, context, config):
     def __init__(self, context, config):
         self._context = context
         self._context = context
         self._config = config
         self._config = config
@@ -39,7 +37,11 @@ class Policy(object):
 
 
     @property
     @property
     def document(self):
     def document(self):
-        return self._config['document']
+        return self._config.get('document', None)
+
+    @property
+    def path(self):
+        return self._config.get('path', '/kappa/')
 
 
     @property
     @property
     def arn(self):
     def arn(self):
@@ -49,25 +51,36 @@ class Policy(object):
                 self._arn = policy.get('Arn', None)
                 self._arn = policy.get('Arn', None)
         return self._arn
         return self._arn
 
 
-    def exists(self):
+    def _find_all_policies(self):
+        # boto3 does not currently do pagination for ListPolicies
+        # so we have to do it ourselves
+        policies = []
         try:
         try:
-            response = self._iam_svc.list_policies(PathPrefix=self.Path)
-            LOG.debug(response)
-            for policy in response['Policies']:
-                if policy['PolicyName'] == self.name:
-                    return policy
+            response = self._iam_svc.list_policies()
+            policies += response['Policies']
+            while response['IsTruncated']:
+                LOG.debug('getting another page of policies')
+                response = self._iam_svc.list_policies(
+                    Marker=response['Marker'])
+                policies += response['Policies']
         except Exception:
         except Exception:
             LOG.exception('Error listing policies')
             LOG.exception('Error listing policies')
+        return policies
+
+    def exists(self):
+        for policy in self._find_all_policies():
+            if policy['PolicyName'] == self.name:
+                return policy
         return None
         return None
 
 
     def create(self):
     def create(self):
         LOG.debug('creating policy %s', self.name)
         LOG.debug('creating policy %s', self.name)
         policy = self.exists()
         policy = self.exists()
-        if not policy:
+        if not policy and self.document:
             with open(self.document, 'rb') as fp:
             with open(self.document, 'rb') as fp:
                 try:
                 try:
                     response = self._iam_svc.create_policy(
                     response = self._iam_svc.create_policy(
-                        Path=self.Path, PolicyName=self.name,
+                        Path=self.path, PolicyName=self.name,
                         PolicyDocument=fp.read(),
                         PolicyDocument=fp.read(),
                         Description=self.description)
                         Description=self.description)
                     LOG.debug(response)
                     LOG.debug(response)
@@ -76,7 +89,9 @@ class Policy(object):
 
 
     def delete(self):
     def delete(self):
         response = None
         response = None
-        if self.arn:
+        # Only delete the policy if it has a document associated with it.
+        # This indicates that it was a custom policy created by kappa.
+        if self.arn and self.document:
             LOG.debug('deleting policy %s', self.name)
             LOG.debug('deleting policy %s', self.name)
             response = self._iam_svc.delete_policy(PolicyArn=self.arn)
             response = self._iam_svc.delete_policy(PolicyArn=self.arn)
             LOG.debug(response)
             LOG.debug(response)

 ---
 ---
+# Change the profile and region to suit your application
 profile: personal
 profile: personal
 region: us-east-1
 region: us-east-1
 iam:
 iam:
-  role_name: KinesisSampleRole
-  role_policy: AWSLambdaKinesisExecutionRole
+  # In this case, we are using an existing managed policy so we just
+  # need to put the name of that policy here.
+  policy:
+    name: AWSLambdaKinesisExecutionRole
+  # The name of the IAM role used for executing the Lambda function.
+  # The policy listed above will be attached to this role once it is created.
+  role:
+    name: KinesisSampleRole
 lambda:
 lambda:
   name: KinesisSample
   name: KinesisSample
   zipfile_name: KinesisSample.zip
   zipfile_name: KinesisSample.zip
@@ -15,6 +22,8 @@ lambda:
   timeout: 3
   timeout: 3
   event_sources:
   event_sources:
     -
     -
+      # You need to change this arn to point to your own kinesis
+      # stream that you have created separately.
       arn: arn:aws:kinesis:us-east-1:084307701560:stream/lambdastream
       arn: arn:aws:kinesis:us-east-1:084307701560:stream/lambdastream
       starting_position: TRIM_HORIZON
       starting_position: TRIM_HORIZON
       batch_size: 100
       batch_size: 100

 ---
 ---
+# Change profile and region to suit your application
 profile: personal
 profile: personal
 region: us-east-1
 region: us-east-1
-cloudformation:
-  template: roles.cf
-  stack_name: TestS3
-  exec_role: ExecRole
-  invoke_role: InvokeRole
+iam:
+  # In this case, we are using an existing managed policy so we just
+  # need to put the name of that policy here.
+  policy:
+    name: AWSLambdaExecute
+  # The name of the IAM role used for executing the Lambda function.
+  # The policy listed above will be attached to this role once it is created.
+  role:
+    name: KappaS3SampleRole
 lambda:
 lambda:
   name: S3Sample
   name: S3Sample
   zipfile_name: S3Sample.zip
   zipfile_name: S3Sample.zip

@@ -16,7 +16,9 @@ exports.handler = function(event, context) {
 	// Read options from the event.
 	// Read options from the event.
 	console.log("Reading options from event:\n", util.inspect(event, {depth: 5}));
 	console.log("Reading options from event:\n", util.inspect(event, {depth: 5}));
 	var srcBucket = event.Records[0].s3.bucket.name;
 	var srcBucket = event.Records[0].s3.bucket.name;
-	var srcKey    = event.Records[0].s3.object.key;
+	// Object key may have spaces or unicode non-ASCII characters.
+    var srcKey    =
+    decodeURIComponent(event.Records[0].s3.object.key.replace(/\+/g, " "));  
 	var dstBucket = srcBucket + "resized";
 	var dstBucket = srcBucket + "resized";
 	var dstKey    = "resized-" + srcKey;
 	var dstKey    = "resized-" + srcKey;
 
 

 ---
 ---
+# change profile and region to suit your needs
 profile: personal
 profile: personal
 region: us-east-1
 region: us-east-1
 resources: resources.json
 resources: resources.json
@@ -24,9 +25,11 @@ lambda:
       statement_id: sns_invoke
       statement_id: sns_invoke
       action: lambda:invokeFunction
       action: lambda:invokeFunction
       principal: sns.amazonaws.com
       principal: sns.amazonaws.com
+      # change this to refer to your own SNS topic
       source_arn: arn:aws:sns:us-east-1:084307701560:lambda_topic
       source_arn: arn:aws:sns:us-east-1:084307701560:lambda_topic
   event_sources:
   event_sources:
     -
     -
+      # change this to refer to your own SNS topic
       arn: arn:aws:sns:us-east-1:084307701560:lambda_topic
       arn: arn:aws:sns:us-east-1:084307701560:lambda_topic
   test_data: input.json
   test_data: input.json
   
   
\ No newline at end of file

+{
+  "Records":[
+    {
+      "EventSource":"aws:sns",
+      "EventVersion": "1.0",
+      "EventSubscriptionArn": "arn:aws:sns:us-east-1:123456789012:lambda_topic:0b6941c3-f04d-4d3e-a66d-b1df00e1e381",
+      "Sns":{
+          "Type" : "Notification",
+          "MessageId" : "e70fa8dd-0d77-5944-8862-e569494b48b5",
+          "TopicArn" : "arn:aws:sns:us-east-1:658794617753:lambda-chat",
+          "Message" : "{\"name\":\"Mitch Garnaat\",\"message\":\"just testing this out\"}",
+          "Timestamp" : "2015-04-24T13:15:40.632Z",
+          "Channel" : "foo",
+          "SignatureVersion" : "1",
+          "Signature" : "n0zU4mvKQT5vy6RbDK3BoiWQrFBirbaIGRQOVXE4Vx1XE0SrsXBo4mPm2eDMgjFboP0RJxRCvkFpN07mbnVOIoT2UWKVD2hU1vLdTlEPE4ppSSx17KzhABsOuA8XwijL3hm4cpVHmCmhNXcKekC+fGCryjf9cxr6ODm45PxxE4WLSak85uLzgWhfbAEgPqD2Q/Fa3NwJIyBkZWEdlpJCeaZb4gCzPauvcynRyzWS+e+76WpXMgInCU2y7lhtajDpHrDlZ13UvHOWAQONFRGJXsxFeP370tnzVKfdfMPNbmr4gb3dk+VP0+PsyrIakqp31cO5umUZwSeVZaXLQLewmg==",
+          "SigningCertURL" : "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-d6d679a1d18e95c2f9ffcf11f4f9e198.pem",
+          "UnsubscribeURL" : "https://sns.us-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-1:658794617753:lambda-chat:f1bde0aa-11eb-4417-a9cf-6a00c6aac0a7"
+      }
+    }
+  ]
+}