Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion packages/smithy-http/src/smithy_http/deserializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from .aio.interfaces import HTTPResponse
from .bindings import Binding, ResponseBindingMatcher
from .interfaces import Field, Fields
from .utils import split_header

if TYPE_CHECKING:
from smithy_core.aio.interfaces import StreamingBlob as AsyncStreamingBlob
Expand Down Expand Up @@ -205,7 +206,17 @@ def __init__(self, field: Field) -> None:
def read_list(
self, schema: Schema, consumer: Callable[["ShapeDeserializer"], None]
) -> None:
for value in self._field.values:
values = self._field.values
if len(values) == 1:
is_http_date_list = False
value_schema = schema.members["member"]
if value_schema.shape_type is ShapeType.TIMESTAMP:
trait = value_schema.get_trait(TimestampFormatTrait)
is_http_date_list = (
trait is None or trait.format is TimestampFormat.HTTP_DATE
)
values = split_header(values[0], is_http_date_list)
for value in values:
consumer(HTTPHeaderDeserializer(value))


Expand Down
86 changes: 85 additions & 1 deletion packages/smithy-http/tests/unit/test_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1250,6 +1250,90 @@ def header_cases() -> list[HTTPMessageTestCase]:
]


def header_deser_cases() -> list[HTTPMessageTestCase]:
return [
HTTPMessageTestCase(
HTTPHeaders(string_list_member=["foo", "bar", "baz"]),
HTTPMessage(fields=tuples_to_fields([("stringList", "foo, bar, baz")])),
),
HTTPMessageTestCase(
HTTPHeaders(string_list_member=["foo, bar", "spam", "eggs"]),
HTTPMessage(
fields=tuples_to_fields([("stringList", '"foo, bar", spam, eggs')])
),
),
HTTPMessageTestCase(
HTTPHeaders(
http_date_list_timestamp_member=[
datetime.datetime(2025, 1, 1, tzinfo=UTC),
datetime.datetime(2024, 1, 1, tzinfo=UTC),
]
),
HTTPMessage(
fields=tuples_to_fields(
[
(
"httpDateListTimestamp",
"Wed, 01 Jan 2025 00:00:00 GMT, Mon, 01 Jan 2024 00:00:00 GMT",
),
]
),
),
),
HTTPMessageTestCase(
HTTPHeaders(
http_date_list_timestamp_member=[
datetime.datetime(2025, 1, 1, tzinfo=UTC),
datetime.datetime(2024, 1, 1, tzinfo=UTC),
]
),
HTTPMessage(
fields=tuples_to_fields(
[
(
"httpDateListTimestamp",
'"Wed, 01 Jan 2025 00:00:00 GMT", "Mon, 01 Jan 2024 00:00:00 GMT"',
),
]
),
),
),
HTTPMessageTestCase(
HTTPHeaders(
date_time_list_timestamp_member=[
datetime.datetime(2025, 1, 1, tzinfo=UTC),
datetime.datetime(2024, 1, 1, tzinfo=UTC),
]
),
HTTPMessage(
fields=tuples_to_fields(
[
(
"dateTimeListTimestamp",
"2025-01-01T00:00:00Z, 2024-01-01T00:00:00Z",
),
]
),
),
),
HTTPMessageTestCase(
HTTPHeaders(
epoch_list_timestamp_member=[
datetime.datetime(2025, 1, 1, tzinfo=UTC),
datetime.datetime(2024, 1, 1, tzinfo=UTC),
]
),
HTTPMessage(
fields=tuples_to_fields(
[
("epochListTimestamp", "1735689600, 1704067200"),
]
),
),
),
]


def empty_prefix_header_ser_cases() -> list[HTTPMessageTestCase]:
return [
HTTPMessageTestCase(
Expand Down Expand Up @@ -1714,9 +1798,9 @@ async def test_serialize_response_omitting_empty_payload() -> None:

RESPONSE_DESER_CASES: list[HTTPMessageTestCase] = (
header_cases()
+ header_deser_cases()
+ empty_prefix_header_deser_cases()
+ payload_cases()
+ response_payload_cases()
)


Expand Down