Include params set in provide-client-param event handlers in dynamic context params for endpoint resolution

botocore/client.py

@@ -819,7 +819,6 @@ def _resolve_signature_version(self, service_name, resolved):
 
 
 class BaseClient:
-
     # This is actually reassigned with the py->op_name mapping
     # when the client creator creates the subclass.  This value is used
     # because calls such as client.get_paginator('list_objects') use the
@@ -913,15 +912,10 @@ def _make_api_call(self, operation_name, api_params):
             'has_streaming_input': operation_model.has_streaming_input,
             'auth_type': operation_model.auth_type,
         }
-        endpoint_url, additional_headers = self._resolve_endpoint_ruleset(
-            operation_model, api_params, request_context
-        )
         request_dict = self._convert_to_request_dict(
             api_params=api_params,
             operation_model=operation_model,
-            endpoint_url=endpoint_url,
             context=request_context,
-            headers=additional_headers,
         )
         resolve_checksum_context(request_dict, operation_model, api_params)
 
@@ -979,13 +973,22 @@ def _convert_to_request_dict(
         self,
         api_params,
         operation_model,
-        endpoint_url,
+        endpoint_url=None,
         context=None,
         headers=None,
         set_user_agent_header=True,
+        ignore_signing_region=False,
     ):
         api_params = self._emit_api_params(
-            api_params, operation_model, context
+            api_params=api_params,
+            operation_model=operation_model,
+            context=context,
+        )
+        endpoint_url, additional_headers = self._resolve_endpoint_ruleset(
+            operation_model=operation_model,
+            params=api_params,
+            request_context=context,
+            ignore_signing_region=ignore_signing_region,
         )
         request_dict = self._serializer.serialize_to_request(
             api_params, operation_model
@@ -994,6 +997,8 @@ def _convert_to_request_dict(
             request_dict.pop('host_prefix', None)
         if headers is not None:
             request_dict['headers'].update(headers)
+        if additional_headers is not None:
+            request_dict['headers'].update(additional_headers)
         if set_user_agent_header:
             user_agent = self._client_config.user_agent
         else:

botocore/signers.py

@@ -657,20 +657,12 @@ def generate_presigned_url(
 
     operation_model = self.meta.service_model.operation_model(operation_name)
     bucket_is_arn = ArnParser.is_arn(params.get('Bucket', ''))
-    endpoint_url, additional_headers = self._resolve_endpoint_ruleset(
-        operation_model,
-        params,
-        context,
-        ignore_signing_region=(not bucket_is_arn),
-    )
-
     request_dict = self._convert_to_request_dict(
         api_params=params,
         operation_model=operation_model,
-        endpoint_url=endpoint_url,
         context=context,
-        headers=additional_headers,
         set_user_agent_header=False,
+        ignore_signing_region=(not bucket_is_arn),
     )
 
     # Switch out the http method if user specified it.
@@ -780,20 +772,12 @@ def generate_presigned_post(
     operation_model = self.meta.service_model.operation_model('CreateBucket')
     params = {'Bucket': bucket}
     bucket_is_arn = ArnParser.is_arn(params.get('Bucket', ''))
-    endpoint_url, additional_headers = self._resolve_endpoint_ruleset(
-        operation_model,
-        params,
-        context,
-        ignore_signing_region=(not bucket_is_arn),
-    )
-
     request_dict = self._convert_to_request_dict(
         api_params=params,
         operation_model=operation_model,
-        endpoint_url=endpoint_url,
         context=context,
-        headers=additional_headers,
         set_user_agent_header=False,
+        ignore_signing_region=(not bucket_is_arn),
     )
 
     # Append that the bucket name to the list of conditions.

tests/functional/test_context_params.py

@@ -343,7 +343,7 @@ def test_client_context_param_sent_to_endpoint_resolver(
         ),
     )
 
-    # Stub client to prevent a request from getting sent and asceertain that
+    # Stub client to prevent a request from getting sent and ascertain that
     # only a single request would get sent. Wrap the EndpointProvider's
     # resolve_endpoint method for inspecting the arguments it gets called with.
     with ClientHTTPStubber(client, strict=True) as http_stubber:
@@ -488,3 +488,42 @@ def test_dynamic_context_param_sent_to_endpoint_resolver(
         )
     else:
         mock_resolve_endpoint.assert_called_once_with(Region='us-east-1')
+
+
+def test_dynamic_context_param_from_event_handler_sent_to_endpoint_resolver(
+    monkeypatch,
+    patched_session,
+):
+    # patch loader to return fake service model and fake endpoint ruleset
+    patch_load_service_model(
+        patched_session,
+        monkeypatch,
+        FAKE_MODEL_WITH_DYNAMIC_CONTEXT_PARAM,
+        FAKE_RULESET_WITH_DYNAMIC_CONTEXT_PARAM,
+    )
+
+    # event handler for provide-client-params that modifies the value of the
+    # MockOpParam parameter
+    def change_param(params, **kwargs):
+        params['MockOpParam'] = 'mock-op-param-value-2'
+
+    client = patched_session.create_client(
+        'otherservice', region_name='us-east-1'
+    )
+    client.meta.events.register_last(
+        'provide-client-params.other-service.*', change_param
+    )
+
+    with ClientHTTPStubber(client, strict=True) as http_stubber:
+        http_stubber.add_response(status=200)
+        with mock.patch.object(
+            client._ruleset_resolver._provider,
+            'resolve_endpoint',
+            wraps=client._ruleset_resolver._provider.resolve_endpoint,
+        ) as mock_resolve_endpoint:
+            client.mock_operation(MockOpParam='mock-op-param-value-1')
+
+    mock_resolve_endpoint.assert_called_once_with(
+        Region='us-east-1',
+        FooDynamicContextParamName='mock-op-param-value-2',
+    )

tests/unit/test_signers.py

@@ -991,6 +991,37 @@ def test_generate_presign_url_emits_is_presign_in_context(self):
                 'the following kwargs emitted: %s' % kwargs,
             )
 
+    def test_context_param_from_event_handler_sent_to_endpoint_resolver(self):
+        def change_bucket_param(params, **kwargs):
+            params['Bucket'] = 'mybucket-bar'
+
+        self.client.meta.events.register_last(
+            'provide-client-params.s3.*', change_bucket_param
+        )
+
+        self.client.generate_presigned_url(
+            'get_object', Params={'Bucket': 'mybucket-foo', 'Key': self.key}
+        )
+
+        ref_request_dict = {
+            'body': b'',
+            # If the bucket name set in the provide-client-params event handler
+            # was correctly passed to the endpoint provider as a dynamic context
+            # parameter, it will appear in the URL and the auth_path:
+            'url': 'https://mybucket-bar.s3.amazonaws.com/mykey',
+            'headers': {},
+            'auth_path': '/mybucket-bar/mykey',
+            'query_string': {},
+            'url_path': '/mykey',
+            'method': 'GET',
+            'context': mock.ANY,
+        }
+        self.generate_url_mock.assert_called_with(
+            request_dict=ref_request_dict,
+            expires_in=3600,
+            operation_name='GetObject',
+        )
+
 
 class TestGeneratePresignedPost(unittest.TestCase):
     def setUp(self):