fix param pre-processing for forwarder after botocore upgrade

alexrashed · alexrashed · commit d13a19e0e337 · 2023-05-16T16:58:23.000+02:00
diff --git a/localstack/aws/forwarder.py b/localstack/aws/forwarder.py
@@ -175,6 +175,8 @@ def create_aws_request_context(
     # The endpoint URL is mandatory here, set a dummy if not given (doesn't _need_ to be localstack specific)
     if not endpoint_url:
         endpoint_url = "http://localhost.localstack.cloud"
+    # pre-process the request args (some params are modified using botocore event handlers)
+    parameters = client._emit_api_params(parameters, operation, request_context)
     request_dict = client._convert_to_request_dict(
         parameters, operation, endpoint_url, context=request_context
     )
diff --git a/setup.cfg b/setup.cfg
@@ -69,7 +69,7 @@ runtime =
     awscrt>=0.13.14
     boto>=2.49.0
     boto3>=1.26.121
-    botocore>=1.29.121
+    botocore>=1.29.133
     cbor2>=5.2.0
     crontab>=0.22.6
     dnslib>=0.9.10
diff --git a/tests/unit/aws/test_service_router.py b/tests/unit/aws/test_service_router.py
@@ -172,6 +172,8 @@ def test_service_router_works_for_every_service(
     }
     request_args = _create_dummy_request_args(operation)
 
+    # pre-process the request args (some params are modified using botocore event handlers)
+    request_args = client._emit_api_params(request_args, operation, request_context)
     # The endpoint URL is mandatory here, just set a dummy (doesn't _need_ to be localstack specific)
     request_dict = client._convert_to_request_dict(
         request_args, operation, "http://localhost.localstack.cloud", request_context

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,8 @@ def create_aws_request_context(`
`175`	`175`	`# The endpoint URL is mandatory here, set a dummy if not given (doesn't _need_ to be localstack specific)`
`176`	`176`	`if not endpoint_url:`
`177`	`177`	`endpoint_url = "http://localhost.localstack.cloud"`
	`178`	`+ # pre-process the request args (some params are modified using botocore event handlers)`
	`179`	`+ parameters = client._emit_api_params(parameters, operation, request_context)`
`178`	`180`	`request_dict = client._convert_to_request_dict(`
`179`	`181`	`parameters, operation, endpoint_url, context=request_context`
`180`	`182`	`)`
Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,8 @@ def test_service_router_works_for_every_service(`
`172`	`172`	`}`
`173`	`173`	`request_args = _create_dummy_request_args(operation)`
`174`	`174`
	`175`	`+ # pre-process the request args (some params are modified using botocore event handlers)`
	`176`	`+ request_args = client._emit_api_params(request_args, operation, request_context)`
`175`	`177`	`# The endpoint URL is mandatory here, just set a dummy (doesn't _need_ to be localstack specific)`
`176`	`178`	`request_dict = client._convert_to_request_dict(`
`177`	`179`	`request_args, operation, "http://localhost.localstack.cloud", request_context`