APIGW: fix AWS_PROXY payload with Custom Domains (#12296)

bentsku · web-flow · commit 5d463b5f241c · 2025-02-21T19:49:21.000+01:00
diff --git a/localstack-core/localstack/services/apigateway/next_gen/execute_api/handlers/parse.py b/localstack-core/localstack/services/apigateway/next_gen/execute_api/handlers/parse.py
@@ -134,7 +134,6 @@ def create_context_variables(context: RestApiInvocationContext) -> ContextVariab
         domain_prefix = domain_name.split(".")[0]
         now = datetime.datetime.now()
 
-        # TODO: verify which values needs to explicitly have None set
         context_variables = ContextVariables(
             accountId=context.account_id,
             apiId=context.api_id,
diff --git a/localstack-core/localstack/services/apigateway/next_gen/execute_api/integrations/aws.py b/localstack-core/localstack/services/apigateway/next_gen/execute_api/integrations/aws.py
@@ -518,9 +518,13 @@ def create_lambda_input_event(self, context: RestApiInvocationContext) -> Lambda
         invocation_req: InvocationRequest = context.invocation_request
         integration_req: IntegrationRequest = context.integration_request
 
-        # TODO: binary support of APIGW
         body, is_b64_encoded = self._format_body(integration_req["body"])
 
+        if context.base_path:
+            path = context.context_variables["path"]
+        else:
+            path = invocation_req["path"]
+
         input_event = LambdaInputEvent(
             headers=self._format_headers(dict(integration_req["headers"])),
             multiValueHeaders=self._format_headers(
@@ -536,7 +540,7 @@ def create_lambda_input_event(self, context: RestApiInvocationContext) -> Lambda
             or None,
             pathParameters=invocation_req["path_parameters"] or None,
             httpMethod=invocation_req["http_method"],
-            path=invocation_req["path"],
+            path=path,
             resource=context.resource["path"],
         )
 
