Rename Elasticsearch -> OpenSearch

Signed-off-by: Rushi Agrawal <[email protected]>

Author: rushiagr

Diff for: .ci/Dockerfile.client

@@ -1,7 +1,7 @@
 ARG PYTHON_VERSION=3.8
 FROM python:${PYTHON_VERSION}
 
-WORKDIR /code/elasticsearch-py
+WORKDIR /code/opensearch-py
 COPY dev-requirements.txt .
 RUN python -m pip install \
     -U --no-cache-dir \

Diff for: .ci/functions/imports.sh

@@ -12,13 +12,16 @@ if [[ -z $es_node_name ]]; then
   export RUNSCRIPTS=${RUNSCRIPTS-}
   export DETACH=${DETACH-false}
   export CLEANUP=${CLEANUP-false}
-  export ELASTICSEARCH_URL_EXTENSION=${ELASTICSEARCH_URL_EXTENSION-http}
+  export OPENSEARCH_URL_EXTENSION=${OPENSEARCH_URL_EXTENSION-http}
 
   export es_node_name=instance
-  export elastic_password=changeme
+  export opensearch_image=opensearchproject/opensearch
+  if [[ "$CLUSTER" == "opendistro" ]]; then
+    export opensearch_image=amazon/opendistro-for-elasticsearch
+  fi
 
-  export elasticsearch_url=$ELASTICSEARCH_URL_EXTENSION://${es_node_name}:9200
-  export external_elasticsearch_url=${elasticsearch_url/$es_node_name/localhost}
+  export opensearch_url=$OPENSEARCH_URL_EXTENSION://${opensearch_node_name}:9200
+  export external_opensearch_url=${opensearch_url/$opensearch_node_name/localhost}
 
   export network_name=search-rest-test
 

Diff for: .ci/make.sh

@@ -2,7 +2,7 @@
 
 # ------------------------------------------------------- #
 #
-# Skeleton for common build entry script for all elastic
+# Skeleton for common build entry script for all opensearch
 # clients. Needs to be adapted to individual client usage.
 #
 # Must be called: ./.ci/make.sh <target> <params>
@@ -35,7 +35,7 @@ VERSION=$2
 STACK_VERSION=$VERSION
 set -euo pipefail
 
-product="elastic/elasticsearch-py"
+product="opensearch-project/opensearch-py"
 output_folder=".ci/output"
 codegen_folder=".ci/output"
 OUTPUT_DIR="$repo/${output_folder}"
@@ -129,15 +129,15 @@ if [[ "$CMD" == "assemble" ]]; then
 
   # Build dists into .ci/output
   docker run \
-    --rm -v $repo/.ci/output:/code/elasticsearch-py/dist \
+    --rm -v $repo/.ci/output:/code/opensearch-py/dist \
     $product \
-    /bin/bash -c "python /code/elasticsearch-py/utils/build-dists.py $VERSION"
+    /bin/bash -c "python /code/opensearch-py/utils/build-dists.py $VERSION"
 
   # Verify that there are dists in .ci/output
 	if compgen -G ".ci/output/*" > /dev/null; then
 
 	  # Tarball everything up in .ci/output
-    cd $repo/.ci/output && tar -czvf elasticsearch-py-$VERSION.tar.gz * && cd -
+    cd $repo/.ci/output && tar -czvf opensearch-py-$VERSION.tar.gz * && cd -
 
 		echo -e "\033[32;1mTARGET: successfully assembled client v$VERSION\033[0m"
 		exit 0

Diff for: .ci/run-elasticsearch.sh renamed to .ci/run-opensearch.sh

@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 #
-# Launch one or more Elasticsearch nodes via the Docker image,
+# Launch one or more OpenSearch nodes via the Docker image,
 # to form a cluster suitable for running the REST API tests.
 #
 # Export the STACK_VERSION variable, eg. '8.0.0-SNAPSHOT'.
 # Export the TEST_SUITE variable, i.e. 'oss'
 # Export the NUMBER_OF_NODES variable to start more than 1 node
 
 # Version 1.4.0
-# - Initial version of the run-elasticsearch.sh script
+# - Initial version of the run-opensearch.sh script
 # - Deleting the volume should not dependent on the container still running
 # - Fixed `ES_JAVA_OPTS` config
 # - Moved to STACK_VERSION and TEST_VERSION
@@ -47,7 +47,7 @@ NUMBER_OF_NODES=${NUMBER_OF_NODES-1}
 http_port=9200
 for (( i=0; i<$NUMBER_OF_NODES; i++, http_port++ )); do
   node_name=${es_node_name}$i
-  node_url=${external_elasticsearch_url/9200/${http_port}}$i
+  node_url=${external_opensearch_url/9200/${http_port}}$i
   if [[ "$i" == "0" ]]; then node_name=$es_node_name; fi
   environment+=($(cat <<-END
     --env node.name=$node_name
@@ -56,7 +56,7 @@ END
   echo "$i: $http_port $node_url "
   volume_name=${node_name}-rest-test-data
   volumes+=($(cat <<-END
-    --volume $volume_name:/usr/share/elasticsearch/data${i}
+    --volume $volume_name:/usr/share/opensearch/data${i}
 END
 ))
 
@@ -84,7 +84,7 @@ END
     --ulimit nofile=65536:65536 \
     --ulimit memlock=-1:-1 \
     --detach="$local_detach" \
-    --health-cmd="curl -vvv -s --fail $elasticsearch_url/_cluster/health || exit 1" \
+    --health-cmd="curl -vvv -s --fail $opensearch_url/_cluster/health || exit 1" \
     --health-interval=2s \
     --health-retries=20 \
     --health-timeout=2s \

Diff for: .ci/run-repository.sh

@@ -1,43 +1,43 @@
 #!/usr/bin/env bash
 
 # Called by entry point `run-test` use this script to add your repository specific test commands
-# Once called Elasticsearch is up and running and the following parameters are available to this script
+# Once called opensearch is up and running and the following parameters are available to this script
 
-# ELASTICSEARCH_VERSION -- version e.g Major.Minor.Patch(-Prelease)
-# ELASTICSEARCH_URL -- The url at which elasticsearch is reachable
+# OPENSEARCH_VERSION -- version e.g Major.Minor.Patch(-Prelease)
+# OPENSEARCH_URL -- The url at which opensearch is reachable
 # network_name -- The docker network name
-# NODE_NAME -- The docker container name also used as Elasticsearch node name
+# NODE_NAME -- The docker container name also used as opensearch node name
 
 # When run in CI the test-matrix is used to define additional variables
 # TEST_SUITE -- defaults to `oss` in `run-tests`
 
 set -e
 
-echo -e "\033[34;1mINFO:\033[0m URL ${elasticsearch_url}\033[0m"
-echo -e "\033[34;1mINFO:\033[0m VERSION ${ELASTICSEARCH_VERSION}\033[0m"
+echo -e "\033[34;1mINFO:\033[0m URL ${opensearch_url}\033[0m"
+echo -e "\033[34;1mINFO:\033[0m VERSION ${OPENSEARCH_VERSION}\033[0m"
 echo -e "\033[34;1mINFO:\033[0m TEST_SUITE ${TEST_SUITE}\033[0m"
 echo -e "\033[34;1mINFO:\033[0m PYTHON_VERSION ${PYTHON_VERSION}\033[0m"
 echo -e "\033[34;1mINFO:\033[0m PYTHON_CONNECTION_CLASS ${PYTHON_CONNECTION_CLASS}\033[0m"
 
-echo -e "\033[1m>>>>> Build [elastic/elasticsearch-py container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
+echo -e "\033[1m>>>>> Build [opensearch-project/opensearch-py container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
 
 docker build \
        --file .ci/Dockerfile.client \
-       --tag elastic/elasticsearch-py \
+       --tag opensearch-project/opensearch-py \
        --build-arg PYTHON_VERSION=${PYTHON_VERSION} \
        .
 
-echo -e "\033[1m>>>>> Run [elastic/elasticsearch-py container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
+echo -e "\033[1m>>>>> Run [opensearch-project/opensearch-py container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
 
 mkdir -p junit
 docker run \
   --network=${network_name} \
   --env "STACK_VERSION=${STACK_VERSION}" \
-  --env "ELASTICSEARCH_URL=${elasticsearch_url}" \
+  --env "OPENSEARCH_URL=${opensearch_url}" \
   --env "TEST_SUITE=${TEST_SUITE}" \
   --env "PYTHON_CONNECTION_CLASS=${PYTHON_CONNECTION_CLASS}" \
   --env "TEST_TYPE=server" \
-  --name elasticsearch-py \
+  --name opensearch-py \
   --rm \
-  elastic/elasticsearch-py \
+  opensearch-project/opensearch-py \
   python setup.py test

Diff for: .ci/run-tests

@@ -2,21 +2,20 @@
 #
 # Version 1.1
 # - Moved to .ci folder and seperated out `run-repository.sh`
-# - Add `$RUNSCRIPTS` env var for running Elasticsearch dependent products
+# - Add `$RUNSCRIPTS` env var for running opensearch dependent products
 
 # Default environment variables
 export TEST_SUITE="${TEST_SUITE:=oss}"
 export PYTHON_VERSION="${PYTHON_VERSION:=3.9}"
 export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=Urllib3HttpConnection}"
-export ELASTICSEARCH_URL_EXTENSION="${ELASTICSEARCH_URL_EXTENSION:=http}"
+export OPENSEARCH_URL_EXTENSION="${OPENSEARCH_URL_EXTENSION:=http}"
 export CLUSTER="${1:=opensearch}"
 
 script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
 set -euo pipefail
 
-echo -e "\033[1m>>>>> Start server container >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
-DETACH=true bash .ci/run-elasticsearch.sh
+DETACH=true bash .ci/run-opensearch.sh
 
 if [[ -n "$RUNSCRIPTS" ]]; then
   for RUNSCRIPT in ${RUNSCRIPTS//,/ } ; do

Diff for: .coveragerc

@@ -5,5 +5,5 @@ omit =
     */lib_pypy/*
     */site-packages/*
     *.egg/*
-    test_elasticsearch/*
-    elasticsearch/connection/esthrift/*
+    test_opensearch/*
+    opensearch/connection/esthrift/*

Diff for: .gitignore

@@ -137,7 +137,7 @@ cython_debug/
 # Pycharm project settings
 .idea
 
-# elasticsearch files
-test_elasticsearch/cover
-test_elasticsearch/local.py
+# opensearch files
+test_opensearch/cover
+test_opensearch/local.py
 .ci/output

Diff for: MANIFEST.in

@@ -5,8 +5,8 @@ include LICENSE
 include MANIFEST.in
 include README.md
 include setup.py
-recursive-include elasticsearch* py.typed *.pyi
+recursive-include opensearch* py.typed *.pyi
 
-prune test_elasticsearch
+prune test_opensearch
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]

Diff for: Makefile

@@ -5,14 +5,14 @@ build:
 	PYTHON_VERSION=${PYTHON_VERSION} docker-compose build client
 
 pull:
-	ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION} PYTHON_VERSION=${PYTHON_VERSION} docker-compose pull
+	OPENSEARCH_VERSION=${OPENSEARCH_VERSION} PYTHON_VERSION=${PYTHON_VERSION} docker-compose pull
 
 push:
 	# requires authentication.
 	PYTHON_VERSION=${PYTHON_VERSION} docker-compose push client
 
 run_tests:
-	ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION} PYTHON_VERSION=${PYTHON_VERSION} docker-compose -p "${ELASTIC_VERSION}-${PYTHON_VERSION}" run client python setup.py test
+	OPENSEARCH_VERSION=${OPENSEARCH_VERSION} PYTHON_VERSION=${PYTHON_VERSION} docker-compose -p "${OPEN_VERSION}-${PYTHON_VERSION}" run client python setup.py test
 
-start_elasticsearch:
-	ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION} docker-compose up -d elasticsearch
+start_opensearch:
+	OPENSEARCH_VERSION=${OPENSEARCH_VERSION} docker-compose up -d opensearch

Diff for: noxfile.py

@@ -29,8 +29,8 @@
 SOURCE_FILES = (
     "setup.py",
     "noxfile.py",
-    "elasticsearch/",
-    "test_elasticsearch/",
+    "opensearch/",
+    "test_opensearch/",
     "utils/",
 )
 
@@ -68,15 +68,15 @@ def lint(session):
 
     # Run mypy on the package and then the type examples separately for
     # the two different mypy use-cases, ourselves and our users.
-    session.run("mypy", "--strict", "elasticsearch/")
-    session.run("mypy", "--strict", "test_elasticsearch/test_types/sync_types.py")
-    session.run("mypy", "--strict", "test_elasticsearch/test_types/async_types.py")
+    session.run("mypy", "--strict", "opensearch/")
+    session.run("mypy", "--strict", "test_opensearch/test_types/sync_types.py")
+    session.run("mypy", "--strict", "test_opensearch/test_types/async_types.py")
 
     # Make sure we don't require aiohttp to be installed for users to
     # receive type hint information from mypy.
     session.run("python", "-m", "pip", "uninstall", "--yes", "aiohttp")
-    session.run("mypy", "--strict", "elasticsearch/")
-    session.run("mypy", "--strict", "test_elasticsearch/test_types/sync_types.py")
+    session.run("mypy", "--strict", "opensearch/")
+    session.run("mypy", "--strict", "test_opensearch/test_types/sync_types.py")
 
 
 @nox.session()

Diff for: elasticsearch/__init__.py renamed to opensearch/__init__.py

@@ -39,10 +39,10 @@
 ]
 VERSION = __version__ = (_major, _minor, _patch)
 
-logger = logging.getLogger("elasticsearch")
+logger = logging.getLogger("opensearch")
 logger.addHandler(logging.NullHandler())
 
-from .client import Elasticsearch
+from .client import OpenSearch
 from .connection import Connection, RequestsHttpConnection, Urllib3HttpConnection
 from .connection_pool import ConnectionPool, ConnectionSelector, RoundRobinSelector
 from .exceptions import (
@@ -51,11 +51,11 @@
     ConflictError,
     ConnectionError,
     ConnectionTimeout,
-    ElasticsearchDeprecationWarning,
-    ElasticsearchException,
-    ElasticsearchWarning,
     ImproperlyConfigured,
     NotFoundError,
+    OpenSearchDeprecationWarning,
+    OpenSearchException,
+    OpenSearchWarning,
     RequestError,
     SerializationError,
     SSLError,
@@ -66,10 +66,10 @@
 
 # Only raise one warning per deprecation message so as not
 # to spam up the user if the same action is done multiple times.
-warnings.simplefilter("default", category=ElasticsearchDeprecationWarning, append=True)
+warnings.simplefilter("default", category=OpenSearchDeprecationWarning, append=True)
 
 __all__ = [
-    "Elasticsearch",
+    "OpenSearch",
     "Transport",
     "ConnectionPool",
     "ConnectionSelector",
@@ -79,7 +79,7 @@
     "RequestsHttpConnection",
     "Urllib3HttpConnection",
     "ImproperlyConfigured",
-    "ElasticsearchException",
+    "OpenSearchException",
     "SerializationError",
     "TransportError",
     "NotFoundError",
@@ -90,24 +90,24 @@
     "ConnectionTimeout",
     "AuthenticationException",
     "AuthorizationException",
-    "ElasticsearchWarning",
-    "ElasticsearchDeprecationWarning",
+    "OpenSearchWarning",
+    "OpenSearchDeprecationWarning",
 ]
 
 try:
     # Asyncio only supported on Python 3.6+
     if sys.version_info < (3, 6):
         raise ImportError
 
-    from ._async.client import AsyncElasticsearch
+    from ._async.client import AsyncOpenSearch
     from ._async.http_aiohttp import AIOHttpConnection, AsyncConnection
     from ._async.transport import AsyncTransport
 
     __all__ += [
         "AIOHttpConnection",
         "AsyncConnection",
         "AsyncTransport",
-        "AsyncElasticsearch",
+        "AsyncOpenSearch",
     ]
 except (ImportError, SyntaxError):
     pass

Diff for: elasticsearch/__init__.pyi renamed to opensearch/__init__.pyi

@@ -27,7 +27,7 @@
 import sys
 from typing import Tuple
 
-from .client import Elasticsearch as Elasticsearch
+from .client import OpenSearch as OpenSearch
 from .connection import Connection as Connection
 from .connection import RequestsHttpConnection as RequestsHttpConnection
 from .connection import Urllib3HttpConnection as Urllib3HttpConnection
@@ -39,12 +39,10 @@ from .exceptions import AuthorizationException as AuthorizationException
 from .exceptions import ConflictError as ConflictError
 from .exceptions import ConnectionError as ConnectionError
 from .exceptions import ConnectionTimeout as ConnectionTimeout
-from .exceptions import (
-    ElasticsearchDeprecationWarning as ElasticsearchDeprecationWarning,
-)
-from .exceptions import ElasticsearchException as ElasticsearchException
 from .exceptions import ImproperlyConfigured as ImproperlyConfigured
 from .exceptions import NotFoundError as NotFoundError
+from .exceptions import OpenSearchDeprecationWarning as OpenSearchDeprecationWarning
+from .exceptions import OpenSearchException as OpenSearchException
 from .exceptions import RequestError as RequestError
 from .exceptions import SerializationError as SerializationError
 from .exceptions import SSLError as SSLError
@@ -56,7 +54,7 @@ try:
     if sys.version_info < (3, 6):
         raise ImportError
 
-    from ._async.client import AsyncElasticsearch as AsyncElasticsearch
+    from ._async.client import AsyncOpenSearch as AsyncOpenSearch
     from ._async.http_aiohttp import AIOHttpConnection as AIOHttpConnection
     from ._async.transport import AsyncTransport as AsyncTransport
 except (ImportError, SyntaxError):