fix MOCK & fixture

bentsku · bentsku · commit 836bfdb29bff · 2025-04-11T00:23:46.000+02:00
diff --git a/localstack-core/localstack/services/apigateway/next_gen/execute_api/test_invoke.py b/localstack-core/localstack/services/apigateway/next_gen/execute_api/test_invoke.py
@@ -22,7 +22,7 @@
 
 TEST_INVOKE_TEMPLATE = """Execution log for request {request_id}
 {formatted_date} : Starting execution for request: {request_id}
-{formatted_date} : HTTP Method: GET, Resource Path: {resource_path}
+{formatted_date} : HTTP Method: {request_method}, Resource Path: {resource_path}
 {formatted_date} : Method request path: {method_request_path_parameters}
 {formatted_date} : Method request query string: {method_request_query_string}
 {formatted_date} : Method request headers: {method_request_headers}
@@ -68,7 +68,8 @@ def log_template(invocation_context: RestApiInvocationContext, response_headers:
     return TEST_INVOKE_TEMPLATE.format(
         formatted_date=formatted_date,
         request_id=context_var["requestId"],
-        resource_path=context_var["resourcePath"],
+        resource_path=request["path"],
+        request_method=request["http_method"],
         method_request_path_parameters=dict_to_string(request["path_parameters"]),
         method_request_query_string=dict_to_string(request["query_string_parameters"]),
         method_request_headers=_dump_headers(request.get("headers")),
@@ -176,11 +177,18 @@ def run_test_invocation(
     invocation_context = create_test_invocation_context(test_request, deployment)
 
     test_chain = create_test_chain()
-    # we manually add the trace-id, as it is normally added by handlers.response_enricher which adds to much data for
-    # the TestInvoke
-    test_response = Response(
-        headers={"X-Amzn-Trace-Id": invocation_context.trace_id, "Content-Type": APPLICATION_JSON}
-    )
+    # header order is important
+    if invocation_context.integration["type"] == "MOCK":
+        base_headers = {"Content-Type": APPLICATION_JSON}
+    else:
+        # we manually add the trace-id, as it is normally added by handlers.response_enricher which adds to much data
+        # for the TestInvoke. It needs to be first
+        base_headers = {
+            "X-Amzn-Trace-Id": invocation_context.trace_id,
+            "Content-Type": APPLICATION_JSON,
+        }
+
+    test_response = Response(headers=base_headers)
     start_time = datetime.datetime.now()
     test_chain.handle(context=invocation_context, response=test_response)
     end_time = datetime.datetime.now()
diff --git a/tests/aws/services/apigateway/apigateway_fixtures.py b/tests/aws/services/apigateway/apigateway_fixtures.py
@@ -26,6 +26,15 @@ def assert_response_is_201(response: Dict) -> bool:
     return True
 
 
+def import_rest_api(apigateway_client, **kwargs):
+    response = apigateway_client.import_rest_api(**kwargs)
+    assert_response_is_201(response)
+    resources = apigateway_client.get_resources(restApiId=response.get("id"))
+    root_id = next(item for item in resources["items"] if item["path"] == "/")["id"]
+
+    return response, root_id
+
+
 def create_rest_resource(apigateway_client, **kwargs):
     response = apigateway_client.create_resource(**kwargs)
     assert_response_is_201(response)
diff --git a/tests/aws/services/apigateway/conftest.py b/tests/aws/services/apigateway/conftest.py
@@ -13,6 +13,7 @@
     create_rest_api_stage,
     create_rest_resource,
     create_rest_resource_method,
+    import_rest_api,
 )
 from tests.aws.services.lambda_.test_lambda import TEST_LAMBDA_PYTHON_ECHO_STATUS_CODE
 
@@ -223,7 +224,7 @@ def import_apigw(aws_client, aws_client_factory):
         apigateway_client = aws_client.apigateway
 
     def _import_apigateway_function(*args, **kwargs):
-        response, root_id = apigateway_client.import_rest_api(**kwargs)
+        response, root_id = import_rest_api(apigateway_client**kwargs)
         rest_api_ids.append(response.get("id"))
         return response, root_id
 
diff --git a/tests/aws/services/apigateway/test_apigateway_api.py b/tests/aws/services/apigateway/test_apigateway_api.py
@@ -2320,6 +2320,7 @@ def test_invoke_test_method(self, create_rest_apigw, snapshot, aws_client):
                 lambda k, v: str(v) if k == "latency" else None, "latency", replace_reference=False
             )
         )
+        # TODO: maybe transformer `log` better
         snapshot.add_transformer(
             snapshot.transform.key_value("log", "log", reference_replacement=False)
         )

Original file line number	Diff line number	Diff line change
`@@ -2320,6 +2320,7 @@ def test_invoke_test_method(self, create_rest_apigw, snapshot, aws_client):`
`2320`	`2320`	`lambda k, v: str(v) if k == "latency" else None, "latency", replace_reference=False`
`2321`	`2321`	`)`
`2322`	`2322`	`)`
	`2323`	+ # TODO: maybe transformer `log` better
`2323`	`2324`	`snapshot.add_transformer(`
`2324`	`2325`	`snapshot.transform.key_value("log", "log", reference_replacement=False)`
`2325`	`2326`	`)`