address PR comments

bentsku · bentsku · commit 6b0bf8f9e94d · 2024-07-06T20:41:38.000+02:00
diff --git a/localstack-core/localstack/services/apigateway/next_gen/execute_api/integrations/http.py b/localstack-core/localstack/services/apigateway/next_gen/execute_api/integrations/http.py
@@ -44,6 +44,10 @@ def _get_default_headers(context: RestApiInvocationContext) -> dict[str, str]:
             "user-agent": f"AmazonAPIGateway_{context.api_id}",
         }
 
+    @staticmethod
+    def _get_integration_timeout(integration: Integration) -> float:
+        return int(integration.get("timeoutInMillis", 29000)) / 1000
+
 
 class RestApiHttpIntegration(BaseRestApiHttpIntegration):
     """
@@ -70,8 +74,9 @@ def invoke(self, context: RestApiInvocationContext) -> Response:
         if method not in NO_BODY_METHODS:
             request_parameters["data"] = integration_req["body"]
 
-        # TODO: configurable timeout (29 by default)
-        # request_parameters["timeout"] = 29
+        # TODO: configurable timeout (29 by default) (check type and default value in provider)
+        # integration: Integration = context.resource_method["methodIntegration"]
+        # request_parameters["timeout"] = self._get_integration_timeout(integration)
         # TODO: check for redirects
         # request_parameters["allow_redirects"] = False
 
@@ -128,6 +133,9 @@ def invoke(self, context: RestApiInvocationContext) -> Response:
         if method not in NO_BODY_METHODS:
             request_parameters["data"] = invocation_req["body"]
 
+        # TODO: configurable timeout (29 by default) (check type and default value in provider)
+        # request_parameters["timeout"] = self._get_integration_timeout(integration)
+
         request_response = requests.request(**request_parameters)
 
         response_headers = Headers(dict(request_response.headers))
diff --git a/tests/aws/services/apigateway/test_apigateway_http.py b/tests/aws/services/apigateway/test_apigateway_http.py
@@ -46,18 +46,17 @@ def add_http_integration_transformers(snapshot):
         # TODO: shared between HTTP & HTTP_PROXY
         "$..content.headers.x-amzn-trace-id",
         "$..content.headers.x-forwarded-for",
+        "$..headers.x-amz-apigw-id",
+        "$..headers.x-amzn-trace-id",
         "$..content.origin",
         "$..headers.server",
+        # TODO: only missing for HTTP
+        "$..headers.x-amzn-requestid",
         # TODO: for HTTP integration only: requests (urllib3) automatically adds `Accept-Encoding` when sending the
         #  request, seems like we cannot remove it
         "$..headers.accept-encoding",
-        "$..headers.x-amz-apigw-id",
         # TODO: only missing for HTTP_PROXY
         "$..headers.x-amzn-remapped-x-amzn-requestid",
-        "$..headers.x-amzn-trace-id",
-        # TODO: only missing for HTTP
-        "$..headers.x-amzn-requestid",
-        "$..headers.x-amzn-trace-id",
     ]
 )
 @markers.snapshot.skip_snapshot_verify(
