Merge branch 'main' into common_core

Author: jonhealy1

CHANGELOG.md

@@ -9,12 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-- Added core library package for common logic [#186]https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/186
-
 ### Changed
 
-- Moved Elasticsearch and Opensearch backends into separate packages [#186]https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/186
-
 ### Fixed
 
 ## [v1.1.0]

VERSION

@@ -43,7 +43,7 @@ services:
       - RELOAD=true
       - ENVIRONMENT=local
       - WEB_CONCURRENCY=10
-      - ES_HOST=172.17.0.1
+      - ES_HOST=opensearch
       - ES_PORT=9202
       - ES_USE_SSL=false
       - ES_VERIFY_CERTS=false
@@ -74,6 +74,7 @@ services:
   opensearch:
     container_name: os-container
     image: opensearchproject/opensearch:${OPENSEARCH_VERSION:-2.11.1}
+    hostname: opensearch
     environment:
       - discovery.type=single-node
       - plugins.security.disabled=true

docker-compose.yml

@@ -218,7 +218,6 @@ async def all_collections(self, **kwargs) -> Collections:
         next_link = None
         if len(hits) == limit:
             last_hit = hits[-1]
-            logger.info(last_hit)
             next_search_after = last_hit["sort"]
             next_token = urlsafe_b64encode(
                 ",".join(map(str, next_search_after)).encode()

stac_fastapi/core/stac_fastapi/core/core.py

@@ -1,2 +1,2 @@
 [metadata]
-version = attr: stac_fastapi.elasticsearch.version.__version__
+version = 1.1.0

stac_fastapi/elasticsearch/setup.cfg

@@ -40,7 +40,7 @@
 
 setup(
     name="stac-fastapi.elasticsearch",
-    description="An implementation of STAC API based on the FastAPI framework with Elasticsearch.",
+    description="An implementation of STAC API based on the FastAPI framework with both Elasticsearch and Opensearch.",
     long_description=desc,
     long_description_content_type="text/markdown",
     python_requires=">=3.8",

stac_fastapi/elasticsearch/setup.py

@@ -40,6 +40,15 @@ def _es_config() -> Dict[str, Any]:
     if (u := os.getenv("ES_USER")) and (p := os.getenv("ES_PASS")):
         config["http_auth"] = (u, p)
 
+    if api_key := os.getenv("ES_API_KEY"):
+        if isinstance(config["headers"], dict):
+            headers = {**config["headers"], "x-api-key": api_key}
+
+        else:
+            config["headers"] = {"x-api-key": api_key}
+
+        config["headers"] = headers
+
     return config