howler-api 2.12.0.330__py3-none-any.whl → 2.13.0.dev327__py3-none-any.whl

howler/datastore/store.py

@@ -55,6 +55,8 @@ class ESStore(object):
             config = _config
 
         self._apikey: Optional[tuple[str, str]] = None
+        self._username: Optional[str] = None
+        self._password: Optional[str] = None
         self._hosts = []
 
         for host in config.datastore.hosts:
@@ -64,6 +66,9 @@ class ESStore(object):
                     os.environ[f"{host.name.upper()}_HOST_APIKEY_ID"],
                     os.environ[f"{host.name.upper()}_HOST_APIKEY_SECRET"],
                 )
+            elif os.getenv(f"{host.name.upper()}_HOST_USERNAME") is not None:
+                self._username = os.environ[f"{host.name.upper()}_HOST_USERNAME"]
+                self._password = os.environ[f"{host.name.upper()}_HOST_PASSWORD"]
 
         self._closed = False
         self._collections: dict[str, ESCollection] = {}
@@ -73,12 +78,26 @@ class ESStore(object):
         tracer = logging.getLogger("elasticsearch")
         tracer.setLevel(logging.CRITICAL)
 
-        self.client = elasticsearch.Elasticsearch(
-            hosts=self._hosts,  # type: ignore
-            api_key=self._apikey,
-            max_retries=0,
-            request_timeout=TRANSPORT_TIMEOUT,
-        )
+        if self._apikey is not None:
+            self.client = elasticsearch.Elasticsearch(
+                hosts=self._hosts,  # type: ignore
+                api_key=self._apikey,
+                max_retries=0,
+                request_timeout=TRANSPORT_TIMEOUT,
+            )
+        elif self._username is not None and self._password is not None:
+            self.client = elasticsearch.Elasticsearch(
+                hosts=self._hosts,  # type: ignore
+                basic_auth=(self._username, self._password),
+                max_retries=0,
+                request_timeout=TRANSPORT_TIMEOUT,
+            )
+        else:
+            self.client = elasticsearch.Elasticsearch(
+                hosts=self._hosts,  # type: ignore
+                max_retries=0,
+                request_timeout=TRANSPORT_TIMEOUT,
+            )
         self.eql = elasticsearch.client.EqlClient(self.client)
         self.archive_access = archive_access
         self.url_path = "elastic"

{howler_api-2.12.0.330.dist-info → howler_api-2.13.0.dev327.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: howler-api
-Version: 2.12.0.330
+Version: 2.13.0.dev327
 Summary: Howler - API server
 License: MIT
 Keywords: howler,alerting,gc,canada,cse-cst,cse,cst,cyber,cccs
@@ -54,8 +54,8 @@ Requires-Dist: requests (==2.32.4)
 Requires-Dist: typing-extensions (>=4.12.2,<5.0.0)
 Requires-Dist: validators (>=0.34.0,<0.35.0)
 Requires-Dist: wsproto (==1.2.0)
-Project-URL: Documentation, https://cybercentrecanada.github.io/howler/developer/backend/
-Project-URL: Homepage, https://cybercentrecanada.github.io/howler/
+Project-URL: Documentation, https://cybercentrecanada.github.io/howler-docs/developer/backend/
+Project-URL: Homepage, https://cybercentrecanada.github.io/howler-docs/
 Project-URL: Repository, https://github.com/CybercentreCanada/howler-api
 Description-Content-Type: text/markdown
 

{howler_api-2.12.0.330.dist-info → howler_api-2.13.0.dev327.dist-info}/RECORD

@@ -62,7 +62,7 @@ howler/datastore/howler_store.py,sha256=kW7FKM-tILcfTmrjSB1yZm-ZnumPS_tiQEZUDaQo
 howler/datastore/migrations/fix_process.py,sha256=J0FxqcXbQ161sgmQ5teyEcPuX7WYB9wqs0CO8m1jk0U,1218
 howler/datastore/operations.py,sha256=5WdJBewXRIG71ZexQcYASv0IYoDi1m9ia8332u5mXSs,3919
 howler/datastore/schemas.py,sha256=kuxqYVWMgqnrdU-ypkDxoSzEtECUrRCKXjU_R5Kg7X4,3158
-howler/datastore/store.py,sha256=MiAJO55jrkZuB572vbQJAceCNcA7PeU4tLbzkoSLLqA,6111
+howler/datastore/store.py,sha256=MzIvZy8deMgpnKR-TKTTcttH6kkYy4EBSYMCh0Q-J0E,7055
 howler/datastore/support/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 howler/datastore/support/build.py,sha256=5cX2Jl9vTgCWa_hiM-7LwxVm3pwHN5k0eiyGzHo11vE,7861
 howler/datastore/support/schemas.py,sha256=kuxqYVWMgqnrdU-ypkDxoSzEtECUrRCKXjU_R5Kg7X4,3158
@@ -194,7 +194,7 @@ howler/utils/path.py,sha256=DfOU4i4zSs4wchHoE8iE7aWVLkTxiC_JRGepF2hBYBk,690
 howler/utils/socket_utils.py,sha256=nz1SklC9xBHUSfHyTJjpq3mbozX1GDf01WzdGxfaUII,2212
 howler/utils/str_utils.py,sha256=HE8Hqh2HlOLaj16w0H9zKOyDJLp-f1LQ50y_WeGZaEk,8389
 howler/utils/uid.py,sha256=p9dsqyvZ-lpiAuzZWCPCeEM99kdk0Ly9czf04HNdSuw,1341
-howler_api-2.12.0.330.dist-info/METADATA,sha256=vmtwJSZedsVHVimSkBgnYx743JN9yynqD30eWVFwbUM,2802
-howler_api-2.12.0.330.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-howler_api-2.12.0.330.dist-info/entry_points.txt,sha256=Lu9SBGvwe0wczJHmc-RudC24lmQk7tv3ZBXon9RIihg,259
-howler_api-2.12.0.330.dist-info/RECORD,,
+howler_api-2.13.0.dev327.dist-info/METADATA,sha256=9HnnzJyvMRuTNlutykpH3woD2k9yvHaDeKEMWR9d0HI,2815
+howler_api-2.13.0.dev327.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+howler_api-2.13.0.dev327.dist-info/entry_points.txt,sha256=Lu9SBGvwe0wczJHmc-RudC24lmQk7tv3ZBXon9RIihg,259
+howler_api-2.13.0.dev327.dist-info/RECORD,,