Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assume synchronous Lambda invocation by default (#3615)

Browse Source 
* Assume synchronous Lambda invocation by default

* Support Python 2 with dict-unpacking
This commit is contained in:
Laurie O 2021-01-26 23:28:01 +10:00 committed by GitHub
parent 9324ca3b0c
commit ddd3c0edc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/awslambda/models.py
View File

@ -621,7 +621,8 @@ class LambdaFunction(CloudFormationModel, DockerModel):
# Get the invocation type: # Get the invocation type:
res, errored, logs = self._invoke_lambda(code=self.code, event=body) res, errored, logs = self._invoke_lambda(code=self.code, event=body)
if request_headers.get("x-amz-invocation-type") == "RequestResponse": inv_type = request_headers.get("x-amz-invocation-type", "RequestResponse")
if inv_type == "RequestResponse":
encoded = base64.b64encode(logs.encode("utf-8")) encoded = base64.b64encode(logs.encode("utf-8"))
response_headers["x-amz-log-result"] = encoded.decode("utf-8") response_headers["x-amz-log-result"] = encoded.decode("utf-8")
result = res.encode("utf-8") result = res.encode("utf-8")

18
tests/test_awslambda/test_lambda.py
View File

@ -103,8 +103,9 @@ def test_list_functions():
@pytest.mark.network @pytest.mark.network
@pytest.mark.parametrize("invocation_type", [None, "RequestResponse"])
@mock_lambda @mock_lambda
def test_invoke_requestresponse_function(): def test_invoke_requestresponse_function(invocation_type):
conn = boto3.client("lambda", _lambda_region) conn = boto3.client("lambda", _lambda_region)
conn.create_function( conn.create_function(
FunctionName="testFunction", FunctionName="testFunction",
@ -118,12 +119,15 @@ def test_invoke_requestresponse_function():
Publish=True, Publish=True,
) )
# Only add invocation-type keyword-argument when provided, otherwise the request
# fails to be validated
kw = {}
if invocation_type:
kw["InvocationType"] = invocation_type
in_data = {"msg": "So long and thanks for all the fish"} in_data = {"msg": "So long and thanks for all the fish"}
success_result = conn.invoke( success_result = conn.invoke(
FunctionName="testFunction", FunctionName="testFunction", Payload=json.dumps(in_data), LogType="Tail", **kw
InvocationType="RequestResponse",
Payload=json.dumps(in_data),
LogType="Tail",
) )
if "FunctionError" in success_result: if "FunctionError" in success_result:
@ -141,9 +145,7 @@ def test_invoke_requestresponse_function():
# Logs should not be returned by default, only when the LogType-param is supplied # Logs should not be returned by default, only when the LogType-param is supplied
success_result = conn.invoke( success_result = conn.invoke(
FunctionName="testFunction", FunctionName="testFunction", Payload=json.dumps(in_data), **kw
InvocationType="RequestResponse",
Payload=json.dumps(in_data),
) )
success_result["StatusCode"].should.equal(200) success_result["StatusCode"].should.equal(200)