Removing references to elasticsearch

Author: psaiz

.gitignore

@@ -66,7 +66,5 @@ target/
 .idea/
 
 # Locally generated certificates for development
-elasticsearch-proxy/nginx.crt
-elasticsearch-proxy/nginx.key
 nginx/localhost.crt
 nginx/localhost.key

.inveniorc

@@ -13,7 +13,6 @@ export INVENIO_POSTGRESQL_DBNAME=cernopendata
 export INVENIO_POSTGRESQL_DBUSER=cernopendata
 export INVENIO_POSTGRESQL_DBPASS=dbpass123
 export INVENIO_REDIS_HOST=192.168.50.12
-export INVENIO_ELASTICSEARCH_HOST=192.168.50.13
 export INVENIO_RABBITMQ_HOST=192.168.50.14
 export INVENIO_WORKER_HOST=192.168.50.15
 # sphinxdoc-kickstart-configuration-variables-end

MANIFEST.in

@@ -9,8 +9,6 @@ include .inveniorc
 include Dockerfile
 include LICENSE
 include babel.ini
-include elasticsearch-proxy/Dockerfile
-include elasticsearch-proxy/nginx.conf
 include nginx/Dockerfile
 include pytest.ini
 include sentry/Dockerfile
@@ -45,4 +43,3 @@ recursive-include sentry *.json
 recursive-include sentry *.py
 recursive-include sentry *.sh
 recursive-include sentry *.yml
-recursive-exclude elasticsearch-proxy *

cernopendata/config.py

@@ -427,10 +427,8 @@ def _query_parser_and(qstr=None):
 CERNOPENDATA_DISABLE_DOWNLOADS = os.environ.get("CERNOPENDATA_DISABLE_DOWNLOADS", False)
 # Search
 # ======
-#: Default Elasticsearch document type.
+#: Default OpenSearch document type.
 SEARCH_DOC_TYPE_DEFAULT = None
-#: Do not map any keywords.
-SEARCH_ELASTIC_KEYWORD_MAPPING = {}
 
 # This one can be used to have multiple instances on the same cluster
 # SEARCH_INDEX_PREFIX = "opendata-dev-"
@@ -447,7 +445,7 @@ def _query_parser_and(qstr=None):
 SEARCH_UI_SEARCH_VIEW = search_legacy
 # OAI-PMH
 # =======
-#: Default Elasticsearch index.
+#: Default OpenSearch index.
 OAISERVER_RECORD_INDEX = "records"
 #: OAI ID prefix.
 OAISERVER_ID_PREFIX = "oai:opendata.cern.ch:recid/"

cernopendata/mappings/os-v2/__init__.py

@@ -22,4 +22,4 @@
 # waive the privileges and immunities granted to it by virtue of its status
 # as an Intergovernmental Organization or submit itself to any jurisdiction.
 
-"""CERN Open Data Elasticsearch v7 Mappings."""
+"""CERN Open Data OpenSearch v7 Mappings."""

cernopendata/modules/records/serializers/basic_json.py

@@ -53,7 +53,7 @@ def serialize_search(
         """Serialize a search result.
 
         :param pid_fetcher: Persistent identifier fetcher.
-        :param search_result: Elasticsearch search result.
+        :param search_result: OpenSearch search result.
         :param links: Dictionary of links to add to response.
         """
         total = search_result["hits"]["total"]["value"]

elasticsearch-proxy/.htpasswd

@@ -50,7 +50,6 @@ celery==5.0.4
 certifi==2021.5.30
     # via
     #   dulwich
-    #   elasticsearch
     #   requests
 cffi==1.14.5
     # via cryptography
@@ -308,7 +307,7 @@ invenio-rest[cors]==1.2.1
     #   invenio-accounts
     #   invenio-files-rest
     #   invenio-records-rest
-invenio-search[elasticsearch7]==1.4.1
+invenio-search[opensearch2]==1.4.1
     # via cernopendata (setup.py)
 invenio-search-ui==2.0.1
     # via cernopendata (setup.py)
@@ -456,7 +455,6 @@ python-dateutil==2.8.2
     # via
     #   alembic
     #   arrow
-    #   elasticsearch-dsl
     #   invenio-records-rest
     #   jupyter-client
 python-editor==1.0.4
@@ -493,7 +491,6 @@ six==1.16.0
     #   base32-lib
     #   bleach
     #   click-repl
-    #   elasticsearch-dsl
     #   flask-breadcrumbs
     #   flask-cors
     #   flask-kvsession-invenio
@@ -555,7 +552,6 @@ uritools==3.0.2
 urllib3==1.26.6
     # via
     #   dulwich
-    #   elasticsearch
     #   requests
 uwsgi==2.0.21
     # via cernopendata (setup.py)

elasticsearch-proxy/Dockerfile

@@ -1,12 +1,6 @@
 #!/bin/bash
 #
 # Helper script for developers to generate certificates for running CERN Open Data portal locally.
-
-openssl req -x509 -out ./elasticsearch-proxy/nginx.crt -keyout ./elasticsearch-proxy/nginx.key \
-  -newkey rsa:2048 -nodes -sha256 \
-  -subj '/CN=localhost' -extensions EXT -config <( \
-   printf "[dn]\nCN=localhost\n[req]\ndistinguished_name = dn\n[EXT]\nsubjectAltName=DNS:localhost\nkeyUsage=digitalSignature\nextendedKeyUsage=serverAuth")
-
 openssl req -x509 -out ./nginx/localhost.crt -keyout ./nginx/localhost.key \
   -newkey rsa:2048 -nodes -sha256 \
   -subj '/CN=localhost' -extensions EXT -config <( \

elasticsearch-proxy/nginx.conf

@@ -10,6 +10,3 @@ ACCOUNTS_SESSION_REDIS_URL='redis://{{ environ('INVENIO_REDIS_HOST') }}:6379/1'
 BROKER_URL='amqp://guest:guest@{{ environ('INVENIO_RABBITMQ_HOST') }}:5672/'  # Celery 3
 CELERY_BROKER_URL='amqp://guest:guest@{{ environ('INVENIO_RABBITMQ_HOST') }}:5672/'  # Celery 4
 CELERY_RESULT_BACKEND='redis://{{ environ('INVENIO_REDIS_HOST') }}:6379/2'
-
-# Elasticsearch
-SEARCH_ELASTIC_HOSTS='{{ environ('INVENIO_ELASTICSEARCH_HOST') }}'

requirements-production.txt

@@ -35,7 +35,6 @@ universal = 1
 
 [check-manifest]
 ignore =
-    elasticsearch-*
     .github
     .github/*