migrate elasticsearch

Author: provinzkraut

src/pytest_databases/docker/docker-compose.elasticsearch.yml

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import contextlib
+import dataclasses
 import os
 import sys
 from pathlib import Path
@@ -9,14 +11,21 @@
 from elasticsearch7 import Elasticsearch as Elasticsearch7
 from elasticsearch7 import Elasticsearch as Elasticsearch8
 
+from pytest_databases._service import DockerService
 from pytest_databases.docker import DockerServiceRegistry
 from pytest_databases.helpers import simple_string_hash
+from pytest_databases.types import ServiceContainer
 
 if TYPE_CHECKING:
     from collections.abc import Generator
 
 
-COMPOSE_PROJECT_NAME: str = f"pytest-databases-elasticsearch-{simple_string_hash(__file__)}"
+@dataclasses.dataclass
+class ElasticsearchService(ServiceContainer):
+    scheme: str
+    user: str
+    password: str
+    database: str
 
 
 def elasticsearch7_responsive(scheme: str, host: str, port: int, user: str, password: str, database: str) -> bool:
@@ -39,22 +48,6 @@ def elasticsearch8_responsive(scheme: str, host: str, port: int, user: str, pass
         return False
 
 
-@pytest.fixture(scope="session")
-def elasticsearch_compose_project_name() -> str:
-    return os.environ.get("COMPOSE_PROJECT_NAME", COMPOSE_PROJECT_NAME)
-
-
-@pytest.fixture(autouse=False, scope="session")
-def elasticsearch_docker_services(
-    elasticsearch_compose_project_name: str, worker_id: str = "main"
-) -> Generator[DockerServiceRegistry, None, None]:
-    if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
-        pytest.skip("Docker not available on this platform")
-
-    with DockerServiceRegistry(worker_id, compose_project_name=elasticsearch_compose_project_name) as registry:
-        yield registry
-
-
 @pytest.fixture(scope="session")
 def elasticsearch_user() -> str:
     return "elastic"
@@ -75,102 +68,71 @@ def elasticsearch_scheme() -> str:
     return "http"
 
 
-@pytest.fixture(scope="session")
-def elasticsearch7_port() -> int:
-    return 9200
-
-
-@pytest.fixture(scope="session")
-def elasticsearch8_port() -> int:
-    return 9201
-
-
-@pytest.fixture(scope="session")
-def elasticsearch_docker_compose_files() -> list[Path]:
-    return [Path(Path(__file__).parent / "docker-compose.elasticsearch.yml")]
-
-
-@pytest.fixture(scope="session")
-def default_elasticsearch_service_name() -> str:
-    return "elasticsearch8"
-
-
-@pytest.fixture(scope="session")
-def elasticsearch_docker_ip(elasticsearch_docker_services: DockerServiceRegistry) -> str:
-    return elasticsearch_docker_services.docker_ip
+@contextlib.contextmanager
+def _provide_elasticsearch_service(
+    docker_service: DockerService,
+    image: str,
+    name: str,
+    client_cls: type[Elasticsearch7 | Elasticsearch8],
+):
+    user = "elastic"
+    password = "changeme"
+    database = "db"
+    scheme = "http"
+
+    def check(_service: ServiceContainer) -> bool:
+        try:
+            with client_cls(
+                hosts=[{"host": _service.host, "port": _service.port, "scheme": scheme}],
+                verify_certs=False,
+                http_auth=(user, password),
+            ) as client:
+                return client.ping()
+        except Exception:  # noqa: BLE001
+            return False
+
+    with docker_service.run(
+        image=image,
+        name=name,
+        container_port=9200,
+        env={
+            "discovery.type": "single-node",
+            "xpack.security.enabled": "false",
+        },
+        check=check,
+    ) as service:
+        yield ElasticsearchService(
+            host=service.host,
+            port=service.port,
+            user=user,
+            password=password,
+            scheme=scheme,
+            database=database,
+        )
 
 
 @pytest.fixture(autouse=False, scope="session")
-def elasticsearch7_service(
-    elasticsearch_docker_services: DockerServiceRegistry,
-    elasticsearch_docker_compose_files: list[Path],
-    elasticsearch7_port: int,
-    elasticsearch_database: str,
-    elasticsearch_user: str,
-    elasticsearch_password: str,
-    elasticsearch_scheme: str,
-) -> Generator[None, None, None]:
-    elasticsearch_docker_services.start(
-        "elasticsearch7",
-        docker_compose_files=elasticsearch_docker_compose_files,
-        timeout=45,
-        pause=1,
-        check=elasticsearch7_responsive,
-        port=elasticsearch7_port,
-        database=elasticsearch_database,
-        user=elasticsearch_user,
-        password=elasticsearch_password,
-        scheme=elasticsearch_scheme,
-    )
-    yield
+def elasticsearch7_service(docker_service: DockerService) -> Generator[ElasticsearchService, None, None]:
+    with _provide_elasticsearch_service(
+        docker_service=docker_service,
+        image="elasticsearch:7.17.19",
+        name="elasticsearch-7",
+        client_cls=Elasticsearch7,
+    ) as service:
+        yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
-def elasticsearch8_service(
-    elasticsearch_docker_services: DockerServiceRegistry,
-    elasticsearch_docker_compose_files: list[Path],
-    elasticsearch8_port: int,
-    elasticsearch_database: str,
-    elasticsearch_user: str,
-    elasticsearch_password: str,
-    elasticsearch_scheme: str,
-) -> Generator[None, None, None]:
-    elasticsearch_docker_services.start(
-        "elasticsearch8",
-        docker_compose_files=elasticsearch_docker_compose_files,
-        timeout=45,
-        pause=1,
-        check=elasticsearch8_responsive,
-        port=elasticsearch8_port,
-        database=elasticsearch_database,
-        user=elasticsearch_user,
-        password=elasticsearch_password,
-        scheme=elasticsearch_scheme,
-    )
-    yield
+def elasticsearch8_service(docker_service: DockerService) -> Generator[ElasticsearchService, None, None]:
+    with _provide_elasticsearch_service(
+        docker_service=docker_service,
+        image="elasticsearch:8.13.0",
+        name="elasticsearch-8",
+        client_cls=Elasticsearch8,
+    ) as service:
+        yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
-def elasticsearch_service(
-    elasticsearch_docker_services: DockerServiceRegistry,
-    default_elasticsearch_service_name: str,
-    elasticsearch_docker_compose_files: list[Path],
-    elasticsearch8_port: int,
-    elasticsearch_database: str,
-    elasticsearch_user: str,
-    elasticsearch_password: str,
-    elasticsearch_scheme: str,
-) -> Generator[None, None, None]:
-    elasticsearch_docker_services.start(
-        name=default_elasticsearch_service_name,
-        docker_compose_files=elasticsearch_docker_compose_files,
-        timeout=45,
-        pause=1,
-        check=elasticsearch8_responsive,
-        port=elasticsearch8_port,
-        database=elasticsearch_database,
-        user=elasticsearch_user,
-        password=elasticsearch_password,
-        scheme=elasticsearch_scheme,
-    )
-    yield
+def elasticsearch_service(elasticsearch8_service) -> ElasticsearchService:
+    return elasticsearch8_service