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

Add type:Sender field to error response (#6465)

Browse Source
This commit is contained in:
Viren Nadkarni 2023-07-04 16:36:20 +05:30 committed by GitHub
parent 7f43889ef6
commit b66272717f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
moto/core/exceptions.py
View File

@ -3,8 +3,6 @@ from jinja2 import DictLoader, Environment
from typing import Any, List, Tuple, Optional from typing import Any, List, Tuple, Optional
import json import json
# TODO: add "<Type>Sender</Type>" to error responses below?
SINGLE_ERROR_RESPONSE = """<?xml version="1.0" encoding="UTF-8"?> SINGLE_ERROR_RESPONSE = """<?xml version="1.0" encoding="UTF-8"?>
<Error> <Error>
@ -20,6 +18,9 @@ WRAPPED_SINGLE_ERROR_RESPONSE = """<?xml version="1.0" encoding="UTF-8"?>
<Error> <Error>
<Code>{{error_type}}</Code> <Code>{{error_type}}</Code>
<Message><![CDATA[{{message}}]]></Message> <Message><![CDATA[{{message}}]]></Message>
{% if include_type_sender %}
<Type>Sender</Type>
{% endif %}
{% block extra %}{% endblock %} {% block extra %}{% endblock %}
<{{request_id_tag}}>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</{{request_id_tag}}> <{{request_id_tag}}>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</{{request_id_tag}}>
</Error> </Error>
@ -44,6 +45,10 @@ class RESTError(HTTPException):
# most APIs use <RequestId>, but some APIs (including EC2, S3) use <RequestID> # most APIs use <RequestId>, but some APIs (including EC2, S3) use <RequestID>
request_id_tag_name = "RequestId" request_id_tag_name = "RequestId"
# When this field is set, the `Type` field will be included in the response
# This indicates that the fault lies with the client
include_type_sender = True
templates = { templates = {
"single_error": SINGLE_ERROR_RESPONSE, "single_error": SINGLE_ERROR_RESPONSE,
"wrapped_single_error": WRAPPED_SINGLE_ERROR_RESPONSE, "wrapped_single_error": WRAPPED_SINGLE_ERROR_RESPONSE,
@ -63,6 +68,7 @@ class RESTError(HTTPException):
error_type=error_type, error_type=error_type,
message=message, message=message,
request_id_tag=self.request_id_tag_name, request_id_tag=self.request_id_tag_name,
include_type_sender=self.include_type_sender,
**kwargs, **kwargs,
) )
self.content_type = "application/xml" self.content_type = "application/xml"

1
moto/sns/exceptions.py
View File

@ -67,6 +67,7 @@ class TagLimitExceededError(SNSException):
class InternalError(SNSException): class InternalError(SNSException):
code = 500 code = 500
include_type_sender = False
def __init__(self, message: str): def __init__(self, message: str):
super().__init__("InternalFailure", message) super().__init__("InternalFailure", message)

2
tests/test_sns/test_topics_boto3.py
View File

@ -148,6 +148,7 @@ def test_create_topic_in_multiple_regions():
err = exc.value.response["Error"] err = exc.value.response["Error"]
assert err["Code"] == "NotFound" assert err["Code"] == "NotFound"
assert err["Message"] == "Topic does not exist" assert err["Message"] == "Topic does not exist"
assert err["Type"] == "Sender"
@mock_sns @mock_sns
@ -538,6 +539,7 @@ def test_create_fifo_topic():
"Fifo Topic names must end with .fifo and must be made up of only uppercase and lowercase ASCII letters, " "Fifo Topic names must end with .fifo and must be made up of only uppercase and lowercase ASCII letters, "
"numbers, underscores, and hyphens, and must be between 1 and 256 characters long." "numbers, underscores, and hyphens, and must be between 1 and 256 characters long."
) )
err.response["Error"]["Type"].should.equal("Sender")
try: try:
conn.create_topic(Name="test_topic.fifo") conn.create_topic(Name="test_topic.fifo")