fix(es): Getting only netloc for a host field (#219)

* fix(es): Getting only netloc for a host field * chore: update generator version
opendatadiscovery · Sep 11, 2023 · b2d9f77 · b2d9f77
1 parent 021e6e8
commit b2d9f77
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/odd_collector/adapters/elasticsearch/adapter.py b/odd_collector/adapters/elasticsearch/adapter.py
@@ -1,5 +1,6 @@
 import logging
 from typing import Dict, Iterable, Optional
+from urllib.parse import urlparse
 
 from elasticsearch import Elasticsearch
 from funcy import get_lax
@@ -22,7 +23,9 @@ def __init__(self, config: ElasticsearchPlugin) -> None:
  verify_certs=config.verify_certs,
  ca_certs=config.ca_certs,
  )
- self.__oddrn_generator = ElasticSearchGenerator(host_settings=config.host)
+ self.__oddrn_generator = ElasticSearchGenerator(
+ host_settings=urlparse(config.host).netloc
+ )
 
  def get_data_entity_list(self) -> DataEntityList:
  return DataEntityList(
@@ -34,9 +37,7 @@ def get_data_source_oddrn(self) -> str:
  return self.__oddrn_generator.get_data_source_oddrn()
 
  def get_datasets(self) -> Iterable[DataEntity]:
- logger.info(
- "Start collecting datasets from Elasticsearch at {self.config.host}"
- )
+ logger.info(f"Start collecting datasets from Elasticsearch at {self.config}")
  result = []
  logger.info("Get indices")
  indices = self.__get_indices()

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,7 @@ more-itertools = "8.13.0"
 mysql-connector-python = "^8.0.32"
 neo4j = "4.3.7"
 oracledb = "1.2.1"
-oddrn-generator = "^0.1.90"
+oddrn-generator = "^0.1.93"
 psycopg2-binary = "2.9.3"
 python = "^3.9"
 pyhumps = "3.0.2"