From a96705427ae7184549929be339e6e71b0ccd11e5 Mon Sep 17 00:00:00 2001 From: dhairyakhandelwal880-dotcom Date: Sun, 15 Nov 2026 12:59:51 +0530 Subject: [PATCH 1/2] fix(data_classes): resolve correct SQS queue URL for China and other AWS partitions (#8799) Signed-off-by: dhairyakhandelwal880-dotcom --- .../utilities/data_classes/sqs_event.py | 16 ++++- .../required_dependencies/test_sqs_event.py | 64 +++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/aws_lambda_powertools/utilities/data_classes/sqs_event.py b/aws_lambda_powertools/utilities/data_classes/sqs_event.py index d01549e5df1..2a7763c73e7 100644 --- a/aws_lambda_powertools/utilities/data_classes/sqs_event.py +++ b/aws_lambda_powertools/utilities/data_classes/sqs_event.py @@ -12,6 +12,18 @@ from collections.abc import ItemsView, Iterator +_PARTITION_DNS_SUFFIX: dict[str, str] = { + "aws": "amazonaws.com", + "aws-cn": "amazonaws.com.cn", + "aws-us-gov": "amazonaws.com", + "aws-iso": "c2s.ic.gov", + "aws-iso-b": "sc2s.sgov.gov", + "aws-iso-e": "cloud.adc-e.uk", + "aws-iso-f": "csp.hci.ic.gov", + "aws-eusc": "amazonaws.eu", +} + + class SQSRecordAttributes(DictWrapper): @property def aws_trace_header(self) -> str | None: @@ -185,11 +197,13 @@ def aws_region(self) -> str: def queue_url(self) -> str: """The URL of the queue.""" arn_parts = self["eventSourceARN"].split(":") + partition = arn_parts[1] region = arn_parts[3] account_id = arn_parts[4] queue_name = arn_parts[5] - queue_url = f"https://sqs.{region}.amazonaws.com/{account_id}/{queue_name}" + dns_suffix = _PARTITION_DNS_SUFFIX.get(partition, "amazonaws.com") + queue_url = f"https://sqs.{region}.{dns_suffix}/{account_id}/{queue_name}" return queue_url diff --git a/tests/unit/data_classes/required_dependencies/test_sqs_event.py b/tests/unit/data_classes/required_dependencies/test_sqs_event.py index 61c098e3811..7ac42093988 100644 --- a/tests/unit/data_classes/required_dependencies/test_sqs_event.py +++ b/tests/unit/data_classes/required_dependencies/test_sqs_event.py @@ -3,6 +3,8 @@ import json from typing import TYPE_CHECKING +import pytest + from aws_lambda_powertools.utilities.data_classes import S3Event, SQSEvent from aws_lambda_powertools.utilities.data_classes.sqs_event import SQSMessageAttributes from tests.functional.utils import load_event @@ -188,3 +190,65 @@ def test_sqs_message_attribute_with_only_one_value(): assert attributes["text"].binary_value is None assert attributes["blob"].binary_value == "YmFzZTY0" assert attributes["blob"].string_value is None + + +@pytest.mark.parametrize( + "arn, expected_queue_url", + [ + ( + "arn:aws:sqs:us-east-1:123456789012:my-queue", + "https://sqs.us-east-1.amazonaws.com/123456789012/my-queue", + ), + ( + "arn:aws-cn:sqs:cn-north-1:123456789012:my-queue", + "https://sqs.cn-north-1.amazonaws.com.cn/123456789012/my-queue", + ), + ( + "arn:aws-cn:sqs:cn-northwest-1:123456789012:my-queue", + "https://sqs.cn-northwest-1.amazonaws.com.cn/123456789012/my-queue", + ), + ( + "arn:aws-us-gov:sqs:us-gov-west-1:123456789012:my-queue", + "https://sqs.us-gov-west-1.amazonaws.com/123456789012/my-queue", + ), + ( + "arn:aws-iso:sqs:us-iso-east-1:123456789012:my-queue", + "https://sqs.us-iso-east-1.c2s.ic.gov/123456789012/my-queue", + ), + ( + "arn:aws-iso-b:sqs:us-isob-east-1:123456789012:my-queue", + "https://sqs.us-isob-east-1.sc2s.sgov.gov/123456789012/my-queue", + ), + ( + "arn:aws-iso-e:sqs:eu-isoe-west-1:123456789012:my-queue", + "https://sqs.eu-isoe-west-1.cloud.adc-e.uk/123456789012/my-queue", + ), + ( + "arn:aws-iso-f:sqs:us-isof-south-1:123456789012:my-queue", + "https://sqs.us-isof-south-1.csp.hci.ic.gov/123456789012/my-queue", + ), + ( + "arn:aws-eusc:sqs:eusc-central-1:123456789012:my-queue", + "https://sqs.eusc-central-1.amazonaws.eu/123456789012/my-queue", + ), + ( + "arn:custom-partition:sqs:custom-region:123456789012:my-queue", + "https://sqs.custom-region.amazonaws.com/123456789012/my-queue", + ), + ], +) +def test_sqs_record_queue_url_partitions(arn: str, expected_queue_url: str): + event = SQSEvent( + { + "Records": [ + { + "messageId": "1", + "body": "test", + "eventSourceARN": arn, + "awsRegion": arn.split(":")[3], + }, + ], + }, + ) + record = next(event.records) + assert record.queue_url == expected_queue_url From d3a818eec3d0da3c4f74eed6ab6dd6fb553b4532 Mon Sep 17 00:00:00 2001 From: dhairyakhandelwal880-dotcom Date: Sun, 15 Nov 2026 16:01:57 +0530 Subject: [PATCH 2/2] refactor(sqs): define _DEFAULT_DNS_SUFFIX constant for amazonaws.com literal Signed-off-by: dhairyakhandelwal880-dotcom --- aws_lambda_powertools/utilities/data_classes/sqs_event.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/aws_lambda_powertools/utilities/data_classes/sqs_event.py b/aws_lambda_powertools/utilities/data_classes/sqs_event.py index 2a7763c73e7..7af1ee30c79 100644 --- a/aws_lambda_powertools/utilities/data_classes/sqs_event.py +++ b/aws_lambda_powertools/utilities/data_classes/sqs_event.py @@ -12,10 +12,12 @@ from collections.abc import ItemsView, Iterator +_DEFAULT_DNS_SUFFIX = "amazonaws.com" + _PARTITION_DNS_SUFFIX: dict[str, str] = { - "aws": "amazonaws.com", + "aws": _DEFAULT_DNS_SUFFIX, "aws-cn": "amazonaws.com.cn", - "aws-us-gov": "amazonaws.com", + "aws-us-gov": _DEFAULT_DNS_SUFFIX, "aws-iso": "c2s.ic.gov", "aws-iso-b": "sc2s.sgov.gov", "aws-iso-e": "cloud.adc-e.uk", @@ -202,7 +204,7 @@ def queue_url(self) -> str: account_id = arn_parts[4] queue_name = arn_parts[5] - dns_suffix = _PARTITION_DNS_SUFFIX.get(partition, "amazonaws.com") + dns_suffix = _PARTITION_DNS_SUFFIX.get(partition, _DEFAULT_DNS_SUFFIX) queue_url = f"https://sqs.{region}.{dns_suffix}/{account_id}/{queue_name}" return queue_url