Fix headers handling

Author: pquentin

elasticsearch/_async/client/__init__.py

@@ -25,7 +25,6 @@
     BaseNode,
     BinaryApiResponse,
     HeadApiResponse,
-    HttpHeaders,
     NodeConfig,
     NodePool,
     NodeSelector,
@@ -226,18 +225,6 @@ def __init__(
         ):
             sniff_callback = default_sniff_callback
 
-        headers = HttpHeaders()
-        if headers is not DEFAULT and headers is not None:
-            headers.update(headers)
-        if opaque_id is not DEFAULT and opaque_id is not None:  # type: ignore[comparison-overlap]
-            headers["x-opaque-id"] = opaque_id
-        headers = resolve_auth_headers(
-            headers,
-            api_key=api_key,
-            basic_auth=basic_auth,
-            bearer_auth=bearer_auth,
-        )
-
         if _transport is None:
             node_configs = client_node_configs(
                 hosts,
@@ -309,7 +296,7 @@ def __init__(
                 **transport_kwargs,
             )
 
-            self._base_client = BaseClient(_transport, headers=headers)
+            self._base_client = BaseClient(_transport)
 
             # These are set per-request so are stored separately.
             self._base_client._request_timeout = request_timeout
@@ -320,7 +307,18 @@ def __init__(
             self._base_client._retry_on_status = retry_on_status
 
         else:
-            self._base_client = BaseClient(_transport, headers=headers)
+            self._base_client = BaseClient(_transport)
+
+        if headers is not DEFAULT and headers is not None:
+            self._base_client._headers.update(headers)
+        if opaque_id is not DEFAULT and opaque_id is not None:  # type: ignore[comparison-overlap]
+            self._base_client._headers["x-opaque-id"] = opaque_id
+        self._base_client._headers = resolve_auth_headers(
+            self._base_client._headers,
+            api_key=api_key,
+            basic_auth=basic_auth,
+            bearer_auth=bearer_auth,
+        )
 
         # namespaced clients for compatibility with API names
         self.async_search = AsyncSearchClient(self._base_client)

elasticsearch/_async/client/_base.py

@@ -210,10 +210,10 @@ def _default_sniffed_node_callback(
 
 
 class BaseClient:
-    def __init__(self, _transport: AsyncTransport, headers: HttpHeaders) -> None:
+    def __init__(self, _transport: AsyncTransport) -> None:
         self._transport = _transport
         self._client_meta: Union[DefaultType, Tuple[Tuple[str, str], ...]] = DEFAULT
-        self._headers = headers
+        self._headers = HttpHeaders()
         self._request_timeout: Union[DefaultType, Optional[float]] = DEFAULT
         self._ignore_status: Union[DefaultType, Collection[int]] = DEFAULT
         self._max_retries: Union[DefaultType, int] = DEFAULT

elasticsearch/_sync/client/__init__.py

@@ -24,7 +24,6 @@
     BaseNode,
     BinaryApiResponse,
     HeadApiResponse,
-    HttpHeaders,
     NodeConfig,
     NodePool,
     NodeSelector,
@@ -226,18 +225,6 @@ def __init__(
         ):
             sniff_callback = default_sniff_callback
 
-        headers = HttpHeaders()
-        if headers is not DEFAULT and headers is not None:
-            headers.update(headers)
-        if opaque_id is not DEFAULT and opaque_id is not None:  # type: ignore[comparison-overlap]
-            headers["x-opaque-id"] = opaque_id
-        headers = resolve_auth_headers(
-            headers,
-            api_key=api_key,
-            basic_auth=basic_auth,
-            bearer_auth=bearer_auth,
-        )
-
         if _transport is None:
             node_configs = client_node_configs(
                 hosts,
@@ -309,7 +296,7 @@ def __init__(
                 **transport_kwargs,
             )
 
-            self._base_client = BaseClient(_transport, headers=headers)
+            self._base_client = BaseClient(_transport)
 
             # These are set per-request so are stored separately.
             self._base_client._request_timeout = request_timeout
@@ -320,7 +307,18 @@ def __init__(
             self._base_client._retry_on_status = retry_on_status
 
         else:
-            self._base_client = BaseClient(_transport, headers=headers)
+            self._base_client = BaseClient(_transport)
+
+        if headers is not DEFAULT and headers is not None:
+            self._base_client._headers.update(headers)
+        if opaque_id is not DEFAULT and opaque_id is not None:  # type: ignore[comparison-overlap]
+            self._base_client._headers["x-opaque-id"] = opaque_id
+        self._base_client._headers = resolve_auth_headers(
+            self._base_client._headers,
+            api_key=api_key,
+            basic_auth=basic_auth,
+            bearer_auth=bearer_auth,
+        )
 
         # namespaced clients for compatibility with API names
         self.async_search = AsyncSearchClient(self._base_client)

elasticsearch/_sync/client/_base.py

@@ -210,10 +210,10 @@ def _default_sniffed_node_callback(
 
 
 class BaseClient:
-    def __init__(self, _transport: Transport, headers: HttpHeaders) -> None:
+    def __init__(self, _transport: Transport) -> None:
         self._transport = _transport
         self._client_meta: Union[DefaultType, Tuple[Tuple[str, str], ...]] = DEFAULT
-        self._headers = headers
+        self._headers = HttpHeaders()
         self._request_timeout: Union[DefaultType, Optional[float]] = DEFAULT
         self._ignore_status: Union[DefaultType, Collection[int]] = DEFAULT
         self._max_retries: Union[DefaultType, int] = DEFAULT

test_elasticsearch/test_client/test_options.py

@@ -290,7 +290,7 @@ def test_default_node_configs(self):
             headers={"key": "val"},
             basic_auth=("username", "password"),
         )
-        assert client._headers == {
+        assert client._base_client._headers == {
             "key": "val",
             "authorization": "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
         }
@@ -347,7 +347,7 @@ def test_http_headers_overrides(self):
             "authorization": "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
             "user-agent": USER_AGENT,
         }
-        assert client._headers == {"key": "val"}
+        assert client._base_client._headers == {"key": "val"}
 
     def test_user_agent_override(self):
         client = Elasticsearch(