undo unnecessary changes, fix tests

whummer · whummer · commit 73e1bcb4725f · 2023-02-26T18:04:37.000+01:00
diff --git a/localstack/services/apigateway/templates.py b/localstack/services/apigateway/templates.py
@@ -10,7 +10,6 @@
 from localstack.constants import APPLICATION_JSON
 from localstack.services.apigateway.context import ApiInvocationContext
 from localstack.utils.aws.templating import VelocityUtil, VtlTemplate
-from localstack.utils.functions import run_safe
 from localstack.utils.json import extract_jsonpath, json_safe
 from localstack.utils.strings import to_str
 
@@ -178,13 +177,6 @@ def render_vtl(self, template, variables):
 
     @staticmethod
     def build_variables_mapping(api_context: ApiInvocationContext):
-        # prepare request body
-        request_body = api_context.data
-        if isinstance(request_body, bytes):
-            request_body = to_str(request_body)
-        if isinstance(request_body, str):
-            request_body = run_safe(lambda: json.loads(request_body), _default=request_body)
-
         # TODO: make this (dict) an object so usages of "render_vtl" variables are defined
         return {
             "context": api_context.context or {},
@@ -200,12 +192,6 @@ def build_variables_mapping(api_context: ApiInvocationContext):
                     "header": dict(api_context.headers),
                 },
             },
-            "request": {
-                "header": dict(api_context.headers),
-                "querystring": api_context.query_params(),
-                "path": api_context.invocation_path,
-                "body": request_body,
-            },
         }
 
 
diff --git a/tests/integration/test_apigateway.py b/tests/integration/test_apigateway.py
@@ -1325,7 +1325,10 @@ def test_put_integration_dynamodb_proxy_validation_with_request_template(self):
             "application/json": json.dumps(
                 {
                     "TableName": "MusicCollection",
-                    "Item": {"id": {"S": "$request.body.id"}, "data": {"S": "$request.body.data"}},
+                    "Item": {
+                        "id": {"S": "$input.path('id')"},
+                        "data": {"S": "$input.path('data')"},
+                    },
                 }
             )
         }
@@ -1349,7 +1352,10 @@ def test_api_key_required_for_methods(self):
             "application/json": json.dumps(
                 {
                     "TableName": "MusicCollection",
-                    "Item": {"id": {"S": "$request.body.id"}, "data": {"S": "$request.body.data"}},
+                    "Item": {
+                        "id": {"S": "$input.path('id')"},
+                        "data": {"S": "$input.path('data')"},
+                    },
                 }
             )
         }
@@ -1402,7 +1408,10 @@ def test_multiple_api_keys_validate(self, apigateway_client):
             "application/json": json.dumps(
                 {
                     "TableName": "MusicCollection",
-                    "Item": {"id": {"S": "$request.body.id"}, "data": {"S": "$request.body.data"}},
+                    "Item": {
+                        "id": {"S": "$input.path('id')"},
+                        "data": {"S": "$input.path('data')"},
+                    },
                 }
             )
         }

Original file line number	Diff line number	Diff line change
`@@ -1325,7 +1325,10 @@ def test_put_integration_dynamodb_proxy_validation_with_request_template(self):`
`1325`	`1325`	`"application/json": json.dumps(`
`1326`	`1326`	`{`
`1327`	`1327`	`"TableName": "MusicCollection",`
`1328`		`- "Item": {"id": {"S": "$request.body.id"}, "data": {"S": "$request.body.data"}},`
	`1328`	`+ "Item": {`
	`1329`	`+ "id": {"S": "$input.path('id')"},`
	`1330`	`+ "data": {"S": "$input.path('data')"},`
	`1331`	`+ },`
`1329`	`1332`	`}`
`1330`	`1333`	`)`
`1331`	`1334`	`}`
`@@ -1349,7 +1352,10 @@ def test_api_key_required_for_methods(self):`
`1349`	`1352`	`"application/json": json.dumps(`
`1350`	`1353`	`{`
`1351`	`1354`	`"TableName": "MusicCollection",`
`1352`		`- "Item": {"id": {"S": "$request.body.id"}, "data": {"S": "$request.body.data"}},`
	`1355`	`+ "Item": {`
	`1356`	`+ "id": {"S": "$input.path('id')"},`
	`1357`	`+ "data": {"S": "$input.path('data')"},`
	`1358`	`+ },`
`1353`	`1359`	`}`
`1354`	`1360`	`)`
`1355`	`1361`	`}`
`@@ -1402,7 +1408,10 @@ def test_multiple_api_keys_validate(self, apigateway_client):`
`1402`	`1408`	`"application/json": json.dumps(`
`1403`	`1409`	`{`
`1404`	`1410`	`"TableName": "MusicCollection",`
`1405`		`- "Item": {"id": {"S": "$request.body.id"}, "data": {"S": "$request.body.data"}},`
	`1411`	`+ "Item": {`
	`1412`	`+ "id": {"S": "$input.path('id')"},`
	`1413`	`+ "data": {"S": "$input.path('data')"},`
	`1414`	`+ },`
`1406`	`1415`	`}`
`1407`	`1416`	`)`
`1408`	`1417`	`}`