ignore 400 fix

Author: jamesfisher-geo

Makefile

@@ -59,13 +59,17 @@ test:
 
 .PHONY: test-opensearch
 test-opensearch:
-	-$(run_os) /bin/bash -c 'export && ./scripts/wait-for-it-es.sh opensearch:9202 && cd /app/stac_fastapi/elasticsearch/tests/clients && pytest'
+	-$(run_os) /bin/bash -c 'export && ./scripts/wait-for-it-es.sh opensearch:9202 && cd /app/stac_fastapi/elasticsearch/tests/ && pytest'
 	docker-compose down
 
-.PHONY: run-database
-run-database:
+.PHONY: run-database-es
+run-database-es:
 	docker-compose run --rm elasticsearch
 
+.PHONY: run-database-os
+run-database-os:
+	docker-compose run --rm opensearch
+
 .PHONY: pybase-install
 pybase-install:
 	pip install wheel && \

README.md

@@ -80,6 +80,10 @@ curl -X "GET" "http://localhost:8080/collections?limit=1&token=example_token"
 ```shell
 make test
 ```
+
+```shell
+make test-opensearch
+```
 
 ## Ingest sample data
 

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic/database_logic_opensearch.py

@@ -7,8 +7,9 @@
 
 import attr
 from opensearchpy.helpers.search import Search
-
 from opensearchpy import helpers, exceptions
+from opensearchpy.exceptions import TransportError
+
 from stac_fastapi.elasticsearch import serializers
 from stac_fastapi.elasticsearch.config.config_opensearch import AsyncSearchSettings
 from stac_fastapi.elasticsearch.config.config_opensearch import (
@@ -187,10 +188,17 @@ async def create_collection_index() -> None:
 
     index = f"{COLLECTIONS_INDEX}-000001"
 
-    await client.indices.create(
-        index=index,
-        body=search_body
-    )
+    try:
+        await client.indices.create(
+            index=index,
+            body=search_body
+        )
+    except TransportError as e:
+        if e.status_code == 400:
+            pass  # Ignore 400 status codes
+        else:
+            raise e 
+        
     await client.close()
 
 
@@ -213,10 +221,17 @@ async def create_item_index(collection_id: str):
         "settings":ES_ITEMS_SETTINGS,
     }
 
-    await client.indices.create(
-        index=f"{index_by_collection_id(collection_id)}-000001",
-        body=search_body
-    )
+    try:
+        await client.indices.create(
+            index=f"{index_name}-000001",
+            body=search_body
+        )
+    except TransportError as e:
+        if e.status_code == 400:
+            pass  # Ignore 400 status codes
+        else:
+            raise e 
+        
     await client.close()