Merge pull request #41 from bakdata/feature/error-handling

Feature/error handling

Author: philipp94831

.travis.yml

@@ -16,7 +16,7 @@ matrix:
     - name: R 3.6.0
       env: R_VERSION=3.6.0
 install:
-  - PIPENV_VERBOSITY=-1 pipenv install --dev
+  - pipenv install --dev
 script:
   - ./build.sh ${R_VERSION} && LOGLEVEL=INFO VERSION=${R_VERSION//\./_} pipenv run python -m unittest && if [ "$TRAVIS_BRANCH" = "master" ]; then ./integration_test.sh ${R_VERSION} ; fi
 deploy:
@@ -27,6 +27,7 @@ deploy:
       branch: master
 env:
   global:
-    - AWS_DEFAULT_REGION: eu-central-1
+    - AWS_DEFAULT_REGION=eu-central-1
+    - PIPENV_VERBOSITY=-1
     - secure: lcvzavlau1syMM1uMZVSIHMUu8nGA9zN3KLqfJ4OiVVNEYxK0wrRtJKJyLCZM+SfEGoUkreLRLjEcQePDAV5+0A1xPEc+hnCWbDjAsl5Cj2t3ei76dKM5xwEAspMGaw+D1kwgWrreJXYzDvVDbgNc74XH49TpGMyKc4XGxFpvoixY5CjsYgigrvNn9OGfNjZkku99TRdxjBE14cmxtAwS3tMM5PL45Of4ZyrJ4Jl1Jeo5qncihNfHWDvSySb0MhdSBpYvXLPLffUS8tTurvwkRWEwcdPmjok04g+gKElvyEwUx1YmRvALBW7YdJ8Z58OaYIDhi7MGL6AM5fguPy+ldHy97zzVzhExIo5gdSM+IHVtjzPwTeICIT/Jh1OjbjN2wcnbV197LBdIHqSaaLibTuxlFwig6BFPq2hmWYu3ChtmheyVza8pZ9XTuutoWhO92uTvClJzI3cuD+pAFRKslnhIgClP5ifd1JA9HnzB/29bSGVwG5SD7dP11eTxfhXX44xfDkRPzs+GOTZH7Tc63AjuSayR7RM2IE//036LoRNRDZC4NCNrjKyBW2tROtR+BW06cY077kEmt2I4jEyHXb74ivsmD2JLSjCX5kf3oBI71zk/xWkM0NHV4ASVODzyyUShaYar+q2K/j4JqJQnATAMrwpK/yJopHMIa4Jx9A=
     - secure: GIVFD4H5E1Azi+41/lZqg3DX1dYu0oMaIOkr9GOY1UrzAmCgXRJ9A3P3b6UxGTltANy26jVROrDbeBhKrys5xUyPaUJTWV2oJEn8aMXbIQU9hQlxgRwJRLxBA1BkD6G59N52hlvV1K6p+jsrklHpB6NOvHrzH8Dsf17A9vtXb3FhPrDM+3aZIWNhib69w56kGqF9scJcBEAnjK9GAaz80jzwS620h3jn4gtft0gWKm80DB9wytBC/MuckfrMp9XkRKuRGFeFcgJaXRJzfd1Od4UnJCmbWdRB8bhHZUhW/0BtbgS+kjHm+zDAqqInYyx9Fv1dH1AeanLGxu3CsJJe5obNjeMtXKBKzTWf9n8IbLCi3jg050CVZ7zh2MP/gPZVdVvkmPAi1ZZDMwZhrAaLauZN9giFnOssE1lVkzZGmXgg24QWUFMh6x/ZKPj+krlb1V0aqoeTRwLHSupgrAj4q7qmkRFmxnb1RBeVrYvq8FnmV98dp8PsCNYvtaeqMK6A04WRA8hQwo+9nk/bTOpC9gzEGDZuMicpT6M0NIRsE0QCoYAreaWYz+ahBKBSprjwpQc8y+fBWGlWKT9Xs5eJvyrUVF5/2AJKYX/gUhfIMYrVKNZeub9iVksKl5xDbo/IS78M3r2/qLP+9SQQxvArsZ7ru1c52x+wY3sXMb6XQLM=

integration_test.sh

@@ -18,7 +18,7 @@ function integrationTest {
     sam package \
         --output-template-file packaged.yaml \
         --s3-bucket ${bucket} \
-        --s3-prefix R-${version}/test \
+        --s3-prefix R-${version} \
         --template-file test-template.yaml \
         --region ${region}
     version_="${version//\./_}"

tests/sam.py

@@ -76,7 +76,6 @@ def get_client(self):
                                         retries={'max_attempts': 0},
                                         )
         return boto3.client('lambda',
-                            region_name="eu-central-1",
                             endpoint_url="http://{}:{}".format(self.host, self.port),
                             use_ssl=False,
                             verify=False,

tests/test_aws.py

@@ -20,7 +20,7 @@ def setUpClass(cls):
     def get_client(self):
         return self.lambda_server.get_client() if is_local() else boto3.client('lambda')
 
-    @unittest.skipUnless(is_local(), "Only works locally")
+    @unittest.skipUnless(is_local(), "Credentials missing for remote Lambda")
     def test_s3_get_object(self):
         lambda_client = self.get_client()
         response = lambda_client.invoke(FunctionName=get_function_name("AWSFunction"))

tests/test_runtime.py

@@ -90,6 +90,7 @@ def test_missing_source_file(self):
                                         )
         raw_payload = response['Payload'].read().decode('utf-8')
         json_payload = json.loads(raw_payload)
+        self.assertEqual('Unhandled', response['FunctionError'])
         self.assertIn('Source file does not exist: missing.[R|r]', json_payload['errorMessage'])
         self.assertEqual('simpleError', json_payload['errorType'])
 
@@ -101,6 +102,7 @@ def test_missing_function(self):
                                         )
         raw_payload = response['Payload'].read().decode('utf-8')
         json_payload = json.loads(raw_payload)
+        self.assertEqual('Unhandled', response['FunctionError'])
         self.assertIn('Function "handler_missing" does not exist', json_payload['errorMessage'])
         self.assertEqual('simpleError', json_payload['errorType'])
 
@@ -112,6 +114,7 @@ def test_function_as_variable(self):
                                         )
         raw_payload = response['Payload'].read().decode('utf-8')
         json_payload = json.loads(raw_payload)
+        self.assertEqual('Unhandled', response['FunctionError'])
         self.assertIn('Function "handler_as_variable" does not exist', json_payload['errorMessage'])
         self.assertEqual('simpleError', json_payload['errorType'])
 
@@ -121,6 +124,7 @@ def test_missing_argument(self):
         response = lambda_client.invoke(FunctionName=get_function_name("ExampleFunction"))
         raw_payload = response['Payload'].read().decode('utf-8')
         json_payload = json.loads(raw_payload)
+        self.assertEqual('Unhandled', response['FunctionError'])
         self.assertIn('argument "x" is missing, with no default', json_payload['errorMessage'])
         self.assertEqual('simpleError', json_payload['errorType'])
 
@@ -132,6 +136,7 @@ def test_unused_argument(self):
                                         )
         raw_payload = response['Payload'].read().decode('utf-8')
         json_payload = json.loads(raw_payload)
+        self.assertEqual('Unhandled', response['FunctionError'])
         self.assertIn('unused argument (y = 1)', json_payload['errorMessage'])
         self.assertEqual('simpleError', json_payload['errorType'])
 
@@ -154,6 +159,7 @@ def test_missing_library(self):
                                         )
         raw_payload = response['Payload'].read().decode('utf-8')
         json_payload = json.loads(raw_payload)
+        self.assertEqual('Unhandled', response['FunctionError'])
         self.assertIn('there is no package called ‘Matrix’', json_payload['errorMessage'])
         error_type = 'packageNotFoundError' if get_version() == '3_6_0' else 'simpleError'
         self.assertEqual(error_type, json_payload['errorType'])