Update makefile etc

.github/workflows/cicd.yml

@@ -1,5 +1,4 @@
-name: stac-fastapi-elasticsearch
-on:
+name: stac-fastapi-mongo
   push:
     branches:
       - main
@@ -8,123 +7,123 @@ on:
       - main
       - features/**
 
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
+# jobs:
+#   test:
+#     runs-on: ubuntu-latest
+#     timeout-minutes: 10
 
-    services:
+#     services:
 
-      elasticsearch_8_svc:
-        image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0
-        env:
-          cluster.name: stac-cluster
-          node.name: es01
-          network.host: 0.0.0.0
-          transport.host: 0.0.0.0
-          discovery.type: single-node
-          http.port: 9200
-          xpack.license.self_generated.type: basic
-          xpack.security.enabled: false
-          xpack.security.transport.ssl.enabled: false
-          ES_JAVA_OPTS: -Xms512m -Xmx1g
-        ports:
-          - 9200:9200
+#       elasticsearch_8_svc:
+#         image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0
+#         env:
+#           cluster.name: stac-cluster
+#           node.name: es01
+#           network.host: 0.0.0.0
+#           transport.host: 0.0.0.0
+#           discovery.type: single-node
+#           http.port: 9200
+#           xpack.license.self_generated.type: basic
+#           xpack.security.enabled: false
+#           xpack.security.transport.ssl.enabled: false
+#           ES_JAVA_OPTS: -Xms512m -Xmx1g
+#         ports:
+#           - 9200:9200
 
-      elasticsearch_7_svc:
-        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
-        env:
-          cluster.name: stac-cluster
-          node.name: es01
-          network.host: 0.0.0.0
-          transport.host: 0.0.0.0
-          discovery.type: single-node
-          http.port: 9400
-          xpack.license.self_generated.type: basic
-          xpack.security.enabled: false
-          xpack.security.transport.ssl.enabled: false
-          ES_JAVA_OPTS: -Xms512m -Xmx1g
-        ports:
-          - 9400:9400
+#       elasticsearch_7_svc:
+#         image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
+#         env:
+#           cluster.name: stac-cluster
+#           node.name: es01
+#           network.host: 0.0.0.0
+#           transport.host: 0.0.0.0
+#           discovery.type: single-node
+#           http.port: 9400
+#           xpack.license.self_generated.type: basic
+#           xpack.security.enabled: false
+#           xpack.security.transport.ssl.enabled: false
+#           ES_JAVA_OPTS: -Xms512m -Xmx1g
+#         ports:
+#           - 9400:9400
 
-      opensearch_2_11:
-        image: opensearchproject/opensearch:2.11.1
-        env:
-          cluster.name: stac-cluster
-          node.name: os01
-          network.host: 0.0.0.0
-          transport.host: 0.0.0.0
-          discovery.type: single-node
-          http.port: 9202
-          http.cors.enabled: true
-          plugins.security.disabled: true
-          plugins.security.ssl.http.enabled: true
-          OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
-        ports:
-          - 9202:9202
-    strategy:
-      matrix:
-        python-version: [ "3.8", "3.9", "3.10", "3.11"]
+#       opensearch_2_11:
+#         image: opensearchproject/opensearch:2.11.1
+#         env:
+#           cluster.name: stac-cluster
+#           node.name: os01
+#           network.host: 0.0.0.0
+#           transport.host: 0.0.0.0
+#           discovery.type: single-node
+#           http.port: 9202
+#           http.cors.enabled: true
+#           plugins.security.disabled: true
+#           plugins.security.ssl.http.enabled: true
+#           OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
+#         ports:
+#           - 9202:9202
+#     strategy:
+#       matrix:
+#         python-version: [ "3.8", "3.9", "3.10", "3.11"]
 
-    name: Python ${{ matrix.python-version }} testing
+#     name: Python ${{ matrix.python-version }} testing
 
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
+#     steps:
+#       - name: Check out repository code
+#         uses: actions/checkout@v4
 
-      # Setup Python (faster than using Python container)
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Lint code
-        uses: pre-commit/action@v3.0.1
+#       # Setup Python (faster than using Python container)
+#       - name: Setup Python
+#         uses: actions/setup-python@v5
+#         with:
+#           python-version: ${{ matrix.python-version }}
+#       - name: Lint code
+#         uses: pre-commit/action@v3.0.1
 
-      - name: Install pipenv
-        run: |
-          python -m pip install --upgrade pipenv wheel
+#       - name: Install pipenv
+#         run: |
+#           python -m pip install --upgrade pipenv wheel
 
-      - name: Install elasticsearch stac-fastapi
-        run: |
-          pip install ./stac_fastapi/elasticsearch[dev,server]
+#       - name: Install elasticsearch stac-fastapi
+#         run: |
+#           pip install ./stac_fastapi/elasticsearch[dev,server]
 
-      - name: Install opensearch stac-fastapi
-        run: |
-          pip install ./stac_fastapi/opensearch[dev,server]
+#       - name: Install opensearch stac-fastapi
+#         run: |
+#           pip install ./stac_fastapi/opensearch[dev,server]
 
-      - name: Install core library stac-fastapi
-        run: |
-          pip install ./stac_fastapi/core
+#       - name: Install core library stac-fastapi
+#         run: |
+#           pip install ./stac_fastapi/core
 
-      - name: Run test suite against Elasticsearch 7.x
-        run: |
-          pipenv run pytest -svvv
-        env:
-          ENVIRONMENT: testing
-          ES_PORT: 9200
-          ES_HOST: 172.17.0.1
-          ES_USE_SSL: false
-          ES_VERIFY_CERTS: false
-          BACKEND: elasticsearch
+#       - name: Run test suite against Elasticsearch 7.x
+#         run: |
+#           pipenv run pytest -svvv
+#         env:
+#           ENVIRONMENT: testing
+#           ES_PORT: 9200
+#           ES_HOST: 172.17.0.1
+#           ES_USE_SSL: false
+#           ES_VERIFY_CERTS: false
+#           BACKEND: elasticsearch
 
-      - name: Run test suite against Elasticsearch 8.x
-        run: |
-          pipenv run pytest -svvv
-        env:
-          ENVIRONMENT: testing
-          ES_PORT: 9400
-          ES_HOST: 172.17.0.1
-          ES_USE_SSL: false
-          ES_VERIFY_CERTS: false
-          BACKEND: elasticsearch
+#       - name: Run test suite against Elasticsearch 8.x
+#         run: |
+#           pipenv run pytest -svvv
+#         env:
+#           ENVIRONMENT: testing
+#           ES_PORT: 9400
+#           ES_HOST: 172.17.0.1
+#           ES_USE_SSL: false
+#           ES_VERIFY_CERTS: false
+#           BACKEND: elasticsearch
 
-      - name: Run test suite against OpenSearch 2.11.1
-        run: |
-          pipenv run pytest -svvv
-        env:
-          ENVIRONMENT: testing
-          ES_PORT: 9202
-          ES_HOST: 172.17.0.1
-          ES_USE_SSL: false
-          ES_VERIFY_CERTS: false
-          BACKEND: opensearch
+#       - name: Run test suite against OpenSearch 2.11.1
+#         run: |
+#           pipenv run pytest -svvv
+#         env:
+#           ENVIRONMENT: testing
+#           ES_PORT: 9202
+#           ES_HOST: 172.17.0.1
+#           ES_USE_SSL: false
+#           ES_VERIFY_CERTS: false
+#           BACKEND: opensearch

CHANGELOG.md

@@ -5,133 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
-
-### Added
-
-- Added explicit mapping for ID in `ES_COLLECTIONS_MAPPINGS` [#198](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/198)
-
-### Changed
-
-- Removed database logic from core.py all_collections [#196](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/196)
-- Changed OpenSearch config ssl_version to SSLv23 [#200](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/200)
-
-### Fixed
-
-## [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
-
-- Allow additional top-level properties on collections [#191](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/191)
-
-## [v1.1.0]
-
-### Added
-
-- Advanced comparison (LIKE, IN, BETWEEN) operators to the Filter extension [#178](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/178)
-- Collection update endpoint no longer delete all sub items [#177](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/177)
-- OpenSearch 2.11.1 support [#188](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/188)
-
-### Changed
 
-- Elasticsearch drivers from 7.17.9 to 8.11.0 [#169](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/169)
-- Collection update endpoint no longer delete all sub items [#177](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/177)
-
-### Fixed
-
-- Exclude unset fields in search response [#166](https://github.com/stac-utils/stac-fastapi-elasticsearch/issues/166)
-- Upgrade stac-fastapi to v2.4.9 [#172](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/172)
-- Set correct default filter-lang for GET /search requests [#179](https://github.com/stac-utils/stac-fastapi-elasticsearch/issues/179)
-
-## [v1.0.0]
+## [Unreleased]
 
 ### Added
 
-- Collection-level Assets to the CollectionSerializer [#148](https://github.com/stac-utils/stac-fastapi-elasticsearch/issues/148)
-- Pagination for /collections - GET all collections - route [#164](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/164)
-- Examples folder with example docker setup for running sfes from pip [#147](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/147)
-- GET /search filter extension queries [#163](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/163)
-- Added support for GET /search intersection queries [#158](https://github.com/stac-utils/stac-fastapi-elasticsearch/issues/158)
-
 ### Changed
 
-- Update elasticsearch version from 8.1.3 to 8.10.4 in cicd, gh actions [#164](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/164)
-- Updated core stac-fastapi libraries to 2.4.8 from 2.4.3 [#151](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/151)
-- Use aliases on Elasticsearch indices, add number suffix in index name. [#152](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/152)
-
 ### Fixed
 
-- Corrected the closing of client connections in ES index management functions [#132](https://github.com/stac-utils/stac-fastapi-elasticsearch/issues/132)
-- Corrected the automatic converstion of float values to int when building Filter Clauses [#135](https://github.com/stac-utils/stac-fastapi-elasticsearch/issues/135)
-- Do not index `proj:geometry` field as geo_shape [#154](https://github.com/stac-utils/stac-fastapi-elasticsearch/issues/154)
-- Remove unsupported characters from Elasticsearch index names [#153](https://github.com/stac-utils/stac-fastapi-elasticsearch/issues/153)
-- Fixed GET /search sortby requests [#25](https://github.com/stac-utils/stac-fastapi-elasticsearch/issues/25)
 
-
-## [v0.3.0]
+## [v2.0.0]
 
 ### Added
 
-- Added bbox and datetime parameters and functionality to item_collection [#127](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/127)
-- Added collection_id parameter to create_item function [#127](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/127)
-- Added item_id and collection_id to update_item [#127](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/127)
-- The default Collection objects index can be overridden by the `STAC_COLLECTIONS_INDEX` environment variable [#128](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/128)
-- The default Item objects index prefix can be overridden by the `STAC_ITEMS_INDEX_PREFIX` environment variable [#128](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/128)
-- Fields Extension [#129](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/129)
-- Support for Python 3.11 [#131](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/131)
-
 ### Changed
 
-- Updated core stac-fastapi libraries to 2.4.3 from 2.3.0 [#127](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/127)
-
-
-## [v0.2.0]
-
-### Added
-
-- Filter Extension as GET with CQL2-Text and POST with CQL2-JSON,
-  supporting the Basic CQL2 and Basic Spatial Operators conformance classes.
-- Added Elasticsearch local config to support snapshot/restore to local filesystem
-
 ### Fixed
 
-- Fixed search intersects query.
-- Corrected the Sort and Query conformance class URIs.
-
-### Changed
-
-- Default to Python 3.10
-- Default to Elasticsearch 8.x
-- Collection objects are now stored in `collections` index rather than `stac_collections` index
-- Item objects are no longer stored in `stac_items`, but in indices per collection named `items_{collection_id}`
-- When using bulk ingest, items will continue to be ingested if any of them fail. Previously, the call would fail
-  immediately if any items failed.
-
-
-## [v0.1.0]
-
-### Changed
-
-- Elasticsearch index mappings updated to be more thorough.
-- Endpoints that return items (e.g., /search) now sort the results by 'properties.datetime,id,collection'.
-  Previously, there was no sort order defined.
-- Db_to_stac serializer moved to core.py for consistency as it existed in both core and database_logic previously.
-- Use genexp in execute_search and get_all_collections to return results.
-- Added db_to_stac serializer to item_collection method in core.py.
-
 
 [Unreleased]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v2.0.0...main>
-[v2.0.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v1.1.0...v2.0.0>
-[v1.1.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v1.0.0...v1.1.0>
-[v1.0.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v0.3.0...v1.0.0>
-[v0.3.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v0.2.0...v0.3.0>
-[v0.2.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v0.1.0...v0.2.0>
-[v0.1.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v0.1.0>
+[v2.0.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v2.0.0>