unofficial ducktype elastic_client

Author: aaxelb

elasticsearch_metrics/imps/elastic6.py

@@ -356,7 +356,7 @@ class DjelmeElastic6Backend:
     imp_kwargs: dict[str, str]
 
     @property
-    def elastic6_client(self):
+    def elastic_client(self):
         # assumes `connections.configure` was already called
         return connections.get_connection(self.backend_name)
 
@@ -378,9 +378,10 @@ def djelme_teardown(self, recordtypes: collections.abc.Iterable[type]) -> None:
             logger.info("tearing down %r", _metric_type)
             _indexname_wildcard = _metric_type._template_pattern
             _templatename = _metric_type._template_name
-            self.elastic6_client.indices.delete(index=_indexname_wildcard)
+            _client = self.elastic_client
+            _client.indices.delete(index=_indexname_wildcard)
             try:
-                self.elastic6_client.indices.delete_template(_templatename)
+                _client.indices.delete_template(_templatename)
             except NotFoundError:
                 pass
 

elasticsearch_metrics/imps/elastic8.py

@@ -775,7 +775,7 @@ def default_index_name_prefix(self) -> str:
         return self.imp_kwargs.get("djelme_default_index_name_prefix", "")
 
     @property
-    def elastic8_client(self) -> Elastic8Client:
+    def elastic_client(self) -> Elastic8Client:
         # assumes `connections.configure` was already called
         return esdsl.connections.get_connection(self._elastic8dsl_connection_name)
 
@@ -802,7 +802,7 @@ def djelme_teardown(self, recordtypes: collections.abc.Iterable[type]) -> None:
         # for ProtoDjelmeBackend
         for _recordtype in recordtypes:
             assert issubclass(_recordtype, BaseDjelmeRecord)
-            _recordtype.do_teardown(self.elastic8_client)
+            _recordtype.do_teardown(self.elastic_client)
 
 
 if __debug__ and typing.TYPE_CHECKING:

elasticsearch_metrics/tests/test_imps_elastic8.py

@@ -34,7 +34,7 @@ def _es8_client(
 ) -> elasticsearch8.Elasticsearch:
     _backend = djelme_registry.get_backend(backend_name)
     assert isinstance(_backend, djelme.DjelmeElastic8Backend)
-    return _backend.elastic8_client
+    return _backend.elastic_client
 
 
 class TestNamesAndPatterns(SimpleDjelmeTestCase):