Skip to content

Commit ede7473

Browse files
fix(data_classes): resolve correct SQS queue URL for China and other AWS partitions (#8799) (#8814)
* fix(data_classes): resolve correct SQS queue URL for China and other AWS partitions (#8799) Signed-off-by: dhairyakhandelwal880-dotcom <dhairyakhandelwal880@gmail.com> * refactor(sqs): define _DEFAULT_DNS_SUFFIX constant for amazonaws.com literal Signed-off-by: dhairyakhandelwal880-dotcom <dhairyakhandelwal880@gmail.com> --------- Signed-off-by: dhairyakhandelwal880-dotcom <dhairyakhandelwal880@gmail.com>
1 parent a8177ad commit ede7473

2 files changed

Lines changed: 81 additions & 1 deletion

File tree

‎aws_lambda_powertools/utilities/data_classes/sqs_event.py‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,20 @@
1212
from collections.abc import ItemsView, Iterator
1313

1414

15+
_DEFAULT_DNS_SUFFIX = "amazonaws.com"
16+
17+
_PARTITION_DNS_SUFFIX: dict[str, str] = {
18+
"aws": _DEFAULT_DNS_SUFFIX,
19+
"aws-cn": "amazonaws.com.cn",
20+
"aws-us-gov": _DEFAULT_DNS_SUFFIX,
21+
"aws-iso": "c2s.ic.gov",
22+
"aws-iso-b": "sc2s.sgov.gov",
23+
"aws-iso-e": "cloud.adc-e.uk",
24+
"aws-iso-f": "csp.hci.ic.gov",
25+
"aws-eusc": "amazonaws.eu",
26+
}
27+
28+
1529
class SQSRecordAttributes(DictWrapper):
1630
@property
1731
def aws_trace_header(self) -> str | None:
@@ -185,11 +199,13 @@ def aws_region(self) -> str:
185199
def queue_url(self) -> str:
186200
"""The URL of the queue."""
187201
arn_parts = self["eventSourceARN"].split(":")
202+
partition = arn_parts[1]
188203
region = arn_parts[3]
189204
account_id = arn_parts[4]
190205
queue_name = arn_parts[5]
191206

192-
queue_url = f"https://sqs.{region}.amazonaws.com/{account_id}/{queue_name}"
207+
dns_suffix = _PARTITION_DNS_SUFFIX.get(partition, _DEFAULT_DNS_SUFFIX)
208+
queue_url = f"https://sqs.{region}.{dns_suffix}/{account_id}/{queue_name}"
193209

194210
return queue_url
195211

‎tests/unit/data_classes/required_dependencies/test_sqs_event.py‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import json
44
from typing import TYPE_CHECKING
55

6+
import pytest
7+
68
from aws_lambda_powertools.utilities.data_classes import S3Event, SQSEvent
79
from aws_lambda_powertools.utilities.data_classes.sqs_event import SQSMessageAttributes
810
from tests.functional.utils import load_event
@@ -188,3 +190,65 @@ def test_sqs_message_attribute_with_only_one_value():
188190
assert attributes["text"].binary_value is None
189191
assert attributes["blob"].binary_value == "YmFzZTY0"
190192
assert attributes["blob"].string_value is None
193+
194+
195+
@pytest.mark.parametrize(
196+
"arn, expected_queue_url",
197+
[
198+
(
199+
"arn:aws:sqs:us-east-1:123456789012:my-queue",
200+
"https://sqs.us-east-1.amazonaws.com/123456789012/my-queue",
201+
),
202+
(
203+
"arn:aws-cn:sqs:cn-north-1:123456789012:my-queue",
204+
"https://sqs.cn-north-1.amazonaws.com.cn/123456789012/my-queue",
205+
),
206+
(
207+
"arn:aws-cn:sqs:cn-northwest-1:123456789012:my-queue",
208+
"https://sqs.cn-northwest-1.amazonaws.com.cn/123456789012/my-queue",
209+
),
210+
(
211+
"arn:aws-us-gov:sqs:us-gov-west-1:123456789012:my-queue",
212+
"https://sqs.us-gov-west-1.amazonaws.com/123456789012/my-queue",
213+
),
214+
(
215+
"arn:aws-iso:sqs:us-iso-east-1:123456789012:my-queue",
216+
"https://sqs.us-iso-east-1.c2s.ic.gov/123456789012/my-queue",
217+
),
218+
(
219+
"arn:aws-iso-b:sqs:us-isob-east-1:123456789012:my-queue",
220+
"https://sqs.us-isob-east-1.sc2s.sgov.gov/123456789012/my-queue",
221+
),
222+
(
223+
"arn:aws-iso-e:sqs:eu-isoe-west-1:123456789012:my-queue",
224+
"https://sqs.eu-isoe-west-1.cloud.adc-e.uk/123456789012/my-queue",
225+
),
226+
(
227+
"arn:aws-iso-f:sqs:us-isof-south-1:123456789012:my-queue",
228+
"https://sqs.us-isof-south-1.csp.hci.ic.gov/123456789012/my-queue",
229+
),
230+
(
231+
"arn:aws-eusc:sqs:eusc-central-1:123456789012:my-queue",
232+
"https://sqs.eusc-central-1.amazonaws.eu/123456789012/my-queue",
233+
),
234+
(
235+
"arn:custom-partition:sqs:custom-region:123456789012:my-queue",
236+
"https://sqs.custom-region.amazonaws.com/123456789012/my-queue",
237+
),
238+
],
239+
)
240+
def test_sqs_record_queue_url_partitions(arn: str, expected_queue_url: str):
241+
event = SQSEvent(
242+
{
243+
"Records": [
244+
{
245+
"messageId": "1",
246+
"body": "test",
247+
"eventSourceARN": arn,
248+
"awsRegion": arn.split(":")[3],
249+
},
250+
],
251+
},
252+
)
253+
record = next(event.records)
254+
assert record.queue_url == expected_queue_url

0 commit comments

Comments
 (0)