Correct casing for x-amzn-RequestId header (#13230)

dfangl · web-flow · commit b592fbd62c0d · 2025-10-07T18:51:45.000+02:00
diff --git a/localstack-core/localstack/aws/protocol/serializer.py b/localstack-core/localstack/aws/protocol/serializer.py
@@ -1228,6 +1228,15 @@ def _prepare_additional_traits_in_xml(self, root: ETree.Element | None, request_
         request_id_element = ETree.SubElement(response_metadata, "RequestId")
         request_id_element.text = request_id
 
+    def _prepare_additional_traits_in_response(
+        self, response: Response, operation_model: OperationModel, request_id: str
+    ):
+        response.headers["x-amzn-RequestId"] = request_id
+        response = super()._prepare_additional_traits_in_response(
+            response, operation_model, request_id
+        )
+        return response
+
 
 class EC2ResponseSerializer(QueryResponseSerializer):
     """
@@ -1495,7 +1504,7 @@ def _serialize_type_blob(self, body: dict, value: str | bytes, _, key: str, mime
     def _prepare_additional_traits_in_response(
         self, response: Response, operation_model: OperationModel, request_id: str
     ):
-        response.headers["x-amzn-requestid"] = request_id
+        response.headers.setdefault("x-amzn-RequestId", request_id)
         response = super()._prepare_additional_traits_in_response(
             response, operation_model, request_id
         )
@@ -1921,7 +1930,7 @@ def _serialize_body_params(
     def _prepare_additional_traits_in_response(
         self, response: Response, operation_model: OperationModel, request_id: str
     ) -> Response:
-        response.headers["x-amzn-requestid"] = request_id
+        response.headers["x-amzn-RequestId"] = request_id
         response = super()._prepare_additional_traits_in_response(
             response, operation_model, request_id
         )
@@ -2015,7 +2024,7 @@ def _serialize_error(
     def _prepare_additional_traits_in_response(
         self, response: Response, operation_model: OperationModel, request_id: str
     ):
-        response.headers["x-amzn-requestid"] = request_id
+        response.headers["x-amzn-RequestId"] = request_id
         response.headers["Smithy-Protocol"] = "rpc-v2-cbor"
         response = super()._prepare_additional_traits_in_response(
             response, operation_model, request_id
diff --git a/tests/aws/services/cloudwatch/test_cloudwatch.py b/tests/aws/services/cloudwatch/test_cloudwatch.py
@@ -2975,6 +2975,8 @@ def test_basic_operations_multiple_protocols(
                 payload=input_values,
             )
             assert response.status_code == 200
+            # Check if x-amzn-RequestId is in the response headers - case-sensitive check
+            assert "x-amzn-RequestId" in dict(response.headers)
 
         get_metric_input = {
             "MetricDataQueries": [
diff --git a/tests/aws/services/cloudwatch/test_cloudwatch.snapshot.json b/tests/aws/services/cloudwatch/test_cloudwatch.snapshot.json
@@ -43,7 +43,7 @@
     }
   },
   "tests/aws/services/cloudwatch/test_cloudwatch.py::TestCloudWatchMultiProtocol::test_basic_operations_multiple_protocols[json]": {
-    "recorded-date": "18-09-2025, 13:56:03",
+    "recorded-date": "06-10-2025, 14:45:54",
     "recorded-content": {
       "describe-alarms": {
         "CompositeAlarms": [],
@@ -76,7 +76,7 @@
     }
   },
   "tests/aws/services/cloudwatch/test_cloudwatch.py::TestCloudWatchMultiProtocol::test_basic_operations_multiple_protocols[smithy-rpc-v2-cbor]": {
-    "recorded-date": "18-09-2025, 13:56:06",
+    "recorded-date": "06-10-2025, 14:45:56",
     "recorded-content": {
       "describe-alarms": {
         "CompositeAlarms": [],
@@ -109,7 +109,7 @@
     }
   },
   "tests/aws/services/cloudwatch/test_cloudwatch.py::TestCloudWatchMultiProtocol::test_basic_operations_multiple_protocols[query]": {
-    "recorded-date": "18-09-2025, 13:56:09",
+    "recorded-date": "06-10-2025, 14:45:59",
     "recorded-content": {
       "describe-alarms": {
         "DescribeAlarmsResponse": {
diff --git a/tests/aws/services/cloudwatch/test_cloudwatch.validation.json b/tests/aws/services/cloudwatch/test_cloudwatch.validation.json
@@ -1,29 +1,29 @@
 {
   "tests/aws/services/cloudwatch/test_cloudwatch.py::TestCloudWatchMultiProtocol::test_basic_operations_multiple_protocols[json]": {
-    "last_validated_date": "2025-09-18T13:56:03+00:00",
+    "last_validated_date": "2025-10-06T14:45:54+00:00",
     "durations_in_seconds": {
-      "setup": 0.48,
-      "call": 3.45,
-      "teardown": 0.0,
-      "total": 3.93
+      "setup": 0.82,
+      "call": 2.64,
+      "teardown": 0.01,
+      "total": 3.47
     }
   },
   "tests/aws/services/cloudwatch/test_cloudwatch.py::TestCloudWatchMultiProtocol::test_basic_operations_multiple_protocols[query]": {
-    "last_validated_date": "2025-09-18T13:56:09+00:00",
+    "last_validated_date": "2025-10-06T14:45:59+00:00",
     "durations_in_seconds": {
-      "setup": 0.0,
-      "call": 3.05,
-      "teardown": 0.0,
-      "total": 3.05
+      "setup": 0.01,
+      "call": 2.39,
+      "teardown": 0.02,
+      "total": 2.42
     }
   },
   "tests/aws/services/cloudwatch/test_cloudwatch.py::TestCloudWatchMultiProtocol::test_basic_operations_multiple_protocols[smithy-rpc-v2-cbor]": {
-    "last_validated_date": "2025-09-18T13:56:06+00:00",
+    "last_validated_date": "2025-10-06T14:45:56+00:00",
     "durations_in_seconds": {
       "setup": 0.0,
-      "call": 3.05,
-      "teardown": 0.0,
-      "total": 3.05
+      "call": 2.4,
+      "teardown": 0.02,
+      "total": 2.42
     }
   },
   "tests/aws/services/cloudwatch/test_cloudwatch.py::TestCloudWatchMultiProtocol::test_exception_serializing_with_no_shape_in_spec[json]": {
diff --git a/tests/unit/aws/protocol/test_serializer.py b/tests/unit/aws/protocol/test_serializer.py
@@ -97,8 +97,11 @@ def _botocore_serializer_integration_test(
 
     # Use the parser from botocore to parse the serialized response
     response_parser = create_parser(service_protocol)
+    # Properly use HeadersDict from botocore to properly parse headers
+    response_dict = serialized_response.to_readonly_response_dict()
+    response_dict["headers"] = HeadersDict(response_dict.get("headers", {}))
     parsed_response = response_parser.parse(
-        serialized_response.to_readonly_response_dict(),
+        response_dict,
         service.operation_model(action).output_shape,
     )
 

Original file line number	Diff line number	Diff line change
`@@ -2975,6 +2975,8 @@ def test_basic_operations_multiple_protocols(`
`2975`	`2975`	`payload=input_values,`
`2976`	`2976`	`)`
`2977`	`2977`	`assert response.status_code == 200`
	`2978`	`+ # Check if x-amzn-RequestId is in the response headers - case-sensitive check`
	`2979`	`+ assert "x-amzn-RequestId" in dict(response.headers)`
`2978`	`2980`
`2979`	`2981`	`get_metric_input = {`
`2980`	`2982`	`"MetricDataQueries": [`