Raise exceptions on invalid requests

Author: schwing

lambdawebhook/hook.py

@@ -3,7 +3,7 @@
 import sys
 import hashlib
 
-# Add the ./site-packages directory to the path for Lambda to load our libs
+# Add the lib directory to the path for Lambda to load our libs
 sys.path.append(os.path.join(os.path.dirname(__file__), 'lib'))
 import requests  # NOQA
 import hmac  # NOQA
@@ -17,7 +17,6 @@ def verify_signature(secret, signature, payload):
 
 def lambda_handler(event, context):
     print 'Webhook received'
-    print event['secret']
     verified = verify_signature(event['secret'],
                                 event['x_hub_signature'],
                                 event['payload'])
@@ -30,9 +29,9 @@ def lambda_handler(event, context):
                                     'X-Hub-Signature':  event['x_hub_signature']
                                  },
                                  json=event['payload'])
-        return {'status': {response.status_code: response.reason}}
+        response.raise_for_status()
     else:
-        return {'status': {403: 'Forbidden'}}
+        raise requests.HTTPError('400 Client Error: Bad Request')
 
 
 if __name__ == "__main__":

test/unit_test.py

@@ -3,6 +3,7 @@
 import os
 import json
 import httpretty
+from requests import HTTPError
 
 
 def load_test_event():
@@ -12,7 +13,6 @@ def load_test_event():
         githubevent['payload'] = json.dumps(githubevent['payload'])
     return githubevent
 
-
 githubevent = load_test_event()
 
 
@@ -31,11 +31,11 @@ def runTest(self):
 class LambdaHandlerTestCase(unittest.TestCase):
     @httpretty.activate
     def runTest(self):
+        invalidevent = load_test_event()
+        invalidevent['secret'] = 'invalidsecret'
+        self.assertRaises(HTTPError, lambdawebhook.hook.lambda_handler, invalidevent, {})
+
         # Check return codes
         httpretty.register_uri(httpretty.POST, 'https://localhost/github-webhook/',
                                status=200)
-        self.assertEqual(lambdawebhook.hook.lambda_handler(githubevent, ''), {'status': {200: 'OK'}})
-
-        httpretty.register_uri(httpretty.POST, 'https://localhost/github-webhook/',
-                               status=403)
-        self.assertEqual(lambdawebhook.hook.lambda_handler(githubevent, ''), {'status': {403: 'Forbidden'}})
+        self.assertIsNone(lambdawebhook.hook.lambda_handler(githubevent, {}))

tox.ini

@@ -13,6 +13,7 @@ setenv =
 deps=
     nose
     httpretty
+    requests
 
 [testenv:flake8]
 basepython = python2.7