Expose API key as a test fixture

Author: JoshMock

test_elasticsearch_serverless/conftest.py

@@ -21,7 +21,7 @@
 
 from elasticsearch_serverless import Elasticsearch
 
-from .utils import es_url, es_version
+from .utils import es_api_key, es_url, es_version
 
 
 @pytest.fixture(scope="session")
@@ -32,6 +32,14 @@ def elasticsearch_url():
         pytest.skip(str(e))
 
 
+@pytest.fixture(scope="session")
+def elasticsearch_api_key():
+    try:
+        return es_api_key()
+    except RuntimeError as e:
+        pytest.skip(str(e))
+
+
 @pytest.fixture(scope="session")
 def elasticsearch_version(elasticsearch_url) -> Tuple[int, ...]:
     """Returns the version of the current Elasticsearch cluster"""

test_elasticsearch_serverless/test_async/test_server/conftest.py

@@ -27,7 +27,7 @@
 
 @pytest_asyncio.fixture(scope="function")
 @pytest.mark.usefixtures("sync_client")
-async def async_client(elasticsearch_url):
+async def async_client(elasticsearch_url, elasticsearch_api_key):
     # 'sync_client' fixture is used for the guaranteed wipe_cluster() call.
 
     if not hasattr(elasticsearch_serverless, "AsyncElasticsearch"):
@@ -39,7 +39,7 @@ async def async_client(elasticsearch_url):
     client = None
     try:
         client = elasticsearch_serverless.AsyncElasticsearch(
-            elasticsearch_url, request_timeout=3
+            elasticsearch_url, api_key=elasticsearch_api_key, request_timeout=3
         )
         yield client
     finally:

test_elasticsearch_serverless/test_server/conftest.py

@@ -21,7 +21,7 @@
 
 import elasticsearch_serverless
 
-from ..utils import es_api_key, wipe_cluster
+from ..utils import wipe_cluster
 
 # Information about the Elasticsearch instance running, if any
 # Used for
@@ -31,19 +31,19 @@
 
 
 @pytest.fixture(scope="session")
-def sync_client_factory(elasticsearch_url):
+def sync_client_factory(elasticsearch_url, elasticsearch_api_key):
     client = None
     try:
         # Configure the client with API key and optionally
         # an HTTP conn class depending on 'PYTHON_CONNECTION_CLASS' envvar
-        kw = {}
+        kw = {'api_key': elasticsearch_api_key}
         if "PYTHON_CONNECTION_CLASS" in os.environ:
             kw["node_class"] = os.environ["PYTHON_CONNECTION_CLASS"]
 
         # We do this little dance with the URL to force
         # Requests to respect 'headers: None' within rest API spec tests.
         client = elasticsearch_serverless.Elasticsearch(
-            elasticsearch_url, api_key=es_api_key(), **kw
+            elasticsearch_url, **kw
         )
 
         # Wipe the cluster before we start testing just in case it wasn't wiped