makefile fixes

Author: jonhealy1

Dockerfile.deploy.os

@@ -13,7 +13,7 @@ WORKDIR /app
 COPY . /app
 
 RUN pip install --no-cache-dir -e ./stac_fastapi/core
-RUN pip install --no-cache-dir ./stac_fastapi/elasticsearch[server]
+RUN pip install --no-cache-dir ./stac_fastapi/opensearch[server]
 
 EXPOSE 8080
 

Makefile

@@ -1,14 +1,13 @@
 #!make
 APP_HOST ?= 0.0.0.0
-ES_APP_PORT ?= 8080
 EXTERNAL_APP_PORT ?= ${APP_PORT}
 
 ES_APP_PORT ?= 8080
 ES_HOST ?= docker.for.mac.localhost
 ES_PORT ?= 9200
 
 OS_APP_PORT ?= 8082
-ES_HOST ?= docker.for.mac.localhost
+OS_HOST ?= docker.for.mac.localhost
 OS_PORT ?= 9202
 
 run_es = docker-compose \
@@ -29,11 +28,11 @@ run_os = docker-compose \
 
 .PHONY: image-deploy-es
 image-deploy-es:
-	docker build -f Dockerfile.deploy.es -t stac-fastapi-elasticsearch:latest .
+	docker build -f Dockerfile.dev.es -t stac-fastapi-elasticsearch:latest .
 
 .PHONY: image-deploy-os
 image-deploy-os:
-	docker build -f Dockerfile.deploy.os -t stac-fastapi-opensearch:latest .
+	docker build -f Dockerfile.dev.os -t stac-fastapi-opensearch:latest .
 
 .PHONY: run-deploy-locally
 run-deploy-locally:
@@ -53,33 +52,33 @@ docker-run-es: image-dev
 	$(run_es)
 
 .PHONY: docker-run-os
-docker-run-es: image-dev
+docker-run-os: image-dev
 	$(run_os)
 
 .PHONY: docker-shell-es
-docker-shell:
+docker-shell-es:
 	$(run_es) /bin/bash
 
 .PHONY: docker-shell-os
-docker-shell:
+docker-shell-os:
 	$(run_os) /bin/bash
 
 .PHONY: test-elasticsearch
-test:
-	-$(run_es) /bin/bash -c 'export && ./scripts/wait-for-it-es.sh elasticsearch:9200 && cd /app/stac_fastapi/elasticsearch/tests/ && pytest'
+test-elasticsearch:
+	-$(run_es) /bin/bash -c 'export && ./scripts/wait-for-it-es.sh elasticsearch:9200 && cd stac_fastapi/tests/ && pytest'
 	docker-compose down
 
 .PHONY: test-opensearch
 test-opensearch:
-	-$(run_os) /bin/bash -c 'export && ./scripts/wait-for-it-es.sh opensearch:9202 && cd /app/stac_fastapi/opensearch/tests/ && pytest'
+	-$(run_os) /bin/bash -c 'export && ./scripts/wait-for-it-es.sh opensearch:9202 && cd stac_fastapi/tests/ && pytest'
 	docker-compose down
 
 .PHONY: test
 test:
-	-$(run_es) /bin/bash -c 'export && ./scripts/wait-for-it-es.sh elasticsearch:9200 && cd /app/stac_fastapi/elasticsearch/tests/ && pytest'
+	-$(run_es) /bin/bash -c 'export && ./scripts/wait-for-it-es.sh elasticsearch:9200 && cd stac_fastapi/tests/ && pytest'
 	docker-compose down
 
-	-$(run_os) /bin/bash -c 'export && ./scripts/wait-for-it-es.sh opensearch:9202 && cd /app/stac_fastapi/opensearch/tests/ && pytest'
+	-$(run_os) /bin/bash -c 'export && ./scripts/wait-for-it-es.sh opensearch:9202 && cd stac_fastapi/tests/ && pytest'
 	docker-compose down
 
 .PHONY: run-database-es

stac_fastapi/opensearch/setup.py

@@ -48,4 +48,8 @@
     packages=find_namespace_packages(),
     zip_safe=False,
     install_requires=install_requires,
+    extras_require=extra_reqs,
+    entry_points={
+        "console_scripts": ["stac-fastapi-opensearch=stac_fastapi.opensearch.app:run"]
+    },
 )

stac_fastapi/tests/resources/test_item.py

@@ -14,11 +14,17 @@
 
 from stac_fastapi.core.core import CoreClient
 from stac_fastapi.core.datetime_utils import now_to_rfc3339_str
-from stac_fastapi.elasticsearch.database_logic import DatabaseLogic
+
+# from stac_fastapi.core.base_database_logic import BaseDatabaseLogic
 from stac_fastapi.types.core import LandingPageMixin
 
 from ..conftest import create_item, refresh_indices
 
+if os.getenv("BACKEND", "elasticsearch").lower() == "opensearch":
+    from stac_fastapi.opensearch.database_logic import DatabaseLogic
+else:
+    from stac_fastapi.elasticsearch.database_logic import DatabaseLogic
+
 
 def rfc3339_str_to_datetime(s: str) -> datetime:
     return ciso8601.parse_rfc3339(s)