From 90e82aff3ec78fb080ed03fe6b9c1a6b73b9d7ff Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 18 Feb 2021 11:51:38 +0000 Subject: [PATCH] properly log the lambda response correctly boto returns a `StreamingBody`[1] response rather than a json struct. We're currently just logging things like "Error calling lambda o2-1-proxy with function error " which is obviously less than ideal. Also make the tests properly reflect this - annoyingly it appears like we can't use moto to reliably test this interface as the moto `mock_lambda` decorator needs you to be running inside a docker container?? [1] https://botocore.amazonaws.com/v1/documentation/api/latest/reference/response.html#botocore.response.StreamingBody --- app/clients/cbc_proxy.py | 2 +- tests/app/clients/test_cbc_proxy.py | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/clients/cbc_proxy.py b/app/clients/cbc_proxy.py index 707d6df35..3177f0a37 100644 --- a/app/clients/cbc_proxy.py +++ b/app/clients/cbc_proxy.py @@ -147,7 +147,7 @@ class CBCProxyClientBase(ABC): elif 'FunctionError' in result: current_app.logger.info( - f"Error calling lambda {lambda_name} with function error { result['Payload'] }" + f"Error calling lambda {lambda_name} with function error { result['Payload'].read() }" ) success = False diff --git a/tests/app/clients/test_cbc_proxy.py b/tests/app/clients/test_cbc_proxy.py index 62a6f4f06..320ff044d 100644 --- a/tests/app/clients/test_cbc_proxy.py +++ b/tests/app/clients/test_cbc_proxy.py @@ -1,3 +1,4 @@ +from io import BytesIO import json import uuid from collections import namedtuple @@ -380,10 +381,7 @@ def test_cbc_proxy_will_failover_to_second_lambda_if_function_error( { 'StatusCode': 200, 'FunctionError': 'Handled', - 'Payload': { - "errorMessage": "", - "errorType": "CBCNewConnectionError" - } + 'Payload': BytesIO(json.dumps({"errorMessage": "", "errorType": "CBCNewConnectionError"}).encode('utf-8')), }, { 'StatusCode': 200 @@ -522,10 +520,7 @@ def test_cbc_proxy_create_and_send_tries_failover_lambda_on_function_error_and_r ld_client_mock.invoke.return_value = { 'StatusCode': 200, 'FunctionError': 'something', - 'Payload': { - 'errorMessage': 'some message', - 'errorType': 'SomeErrorType' - } + 'Payload': BytesIO(json.dumps({"errorMessage": "some message", "errorType": "SomeErrorType"}).encode('utf-8')), } with pytest.raises(CBCProxyRetryableException) as e: