[7.13] Start using the Elastic Artifacts API for YAML REST tests

Author: sethmlarson

.ci/functions/imports.sh

@@ -18,7 +18,7 @@ require_stack_version
 if [[ -z $es_node_name ]]; then
   # only set these once
   set -euo pipefail
-  export TEST_SUITE=${TEST_SUITE-free}
+  export TEST_SUITE=${TEST_SUITE-platinum}
   export RUNSCRIPTS=${RUNSCRIPTS-}
   export DETACH=${DETACH-false}
   export CLEANUP=${CLEANUP-false}

.ci/run-elasticsearch.sh

@@ -7,14 +7,16 @@
 # Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
 # Export the NUMBER_OF_NODES variable to start more than 1 node
 
-# Version 1.2.0
+# Version 1.3.0
 # - Initial version of the run-elasticsearch.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
 # - Refactored into functions and imports
 # - Support NUMBER_OF_NODES
 # - Added 5 retries on docker pull for fixing transient network errors
+# - Added flags to make local CCR configurations work
+# - Added action.destructive_requires_name=false as the default will be true in v8
 
 script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
@@ -37,6 +39,7 @@ environment=($(cat <<-END
   --env node.attr.testattr=test
   --env path.repo=/tmp
   --env repositories.url.allowed_urls=http://snapshot.test*
+  --env action.destructive_requires_name=false
 END
 ))
 if [[ "$TEST_SUITE" == "platinum" ]]; then
@@ -45,11 +48,11 @@ if [[ "$TEST_SUITE" == "platinum" ]]; then
     --env xpack.license.self_generated.type=trial
     --env xpack.security.enabled=true
     --env xpack.security.http.ssl.enabled=true
-    --env xpack.security.http.ssl.verification_mode=certificate
     --env xpack.security.http.ssl.key=certs/testnode.key
     --env xpack.security.http.ssl.certificate=certs/testnode.crt
     --env xpack.security.http.ssl.certificate_authorities=certs/ca.crt
     --env xpack.security.transport.ssl.enabled=true
+    --env xpack.security.transport.ssl.verification_mode=certificate
     --env xpack.security.transport.ssl.key=certs/testnode.key
     --env xpack.security.transport.ssl.certificate=certs/testnode.crt
     --env xpack.security.transport.ssl.certificate_authorities=certs/ca.crt
@@ -104,7 +107,7 @@ END
   docker run \
     --name "$node_name" \
     --network "$network_name" \
-    --env "ES_JAVA_OPTS=-Xms1g -Xmx1g" \
+    --env "ES_JAVA_OPTS=-Xms1g -Xmx1g -da:org.elasticsearch.xpack.ccr.index.engine.FollowingEngineAssertions" \
     "${environment[@]}" \
     "${volumes[@]}" \
     --publish "$http_port":9200 \

.ci/run-repository.sh

@@ -34,6 +34,7 @@ echo -e "\033[1m>>>>> Run [elastic/elasticsearch-py container] >>>>>>>>>>>>>>>>>
 mkdir -p junit
 docker run \
   --network=${network_name} \
+  --env "STACK_VERSION=${STACK_VERSION}" \
   --env "ELASTICSEARCH_URL=${elasticsearch_url}" \
   --env "TEST_SUITE=${TEST_SUITE}" \
   --env "PYTHON_CONNECTION_CLASS=${PYTHON_CONNECTION_CLASS}" \

.ci/run-tests

@@ -6,7 +6,7 @@
 
 # Default environment variables
 export STACK_VERSION="${STACK_VERSION:=8.0.0-SNAPSHOT}"
-export TEST_SUITE="${TEST_SUITE:=free}"
+export TEST_SUITE="${TEST_SUITE:=platinum}"
 export PYTHON_VERSION="${PYTHON_VERSION:=3.9}"
 export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=Urllib3HttpConnection}"
 

.ci/test-matrix.yml

@@ -2,7 +2,6 @@ STACK_VERSION:
   - 7.x-SNAPSHOT
 
 TEST_SUITE:
-  - free
   - platinum
 
 PYTHON_VERSION:

CONTRIBUTING.md

@@ -23,9 +23,6 @@ There are several environment variables that control integration tests:
   the same as tags of `docker.elastic.co/elasticsearch/elasticsearch`
   such as `8.0.0-SNAPSHOT`, `7.x-SNAPSHOT`, etc. Defaults to the
   same `*-SNAPSHOT` version as the branch.
-- `TEST_SUITE`: Determines how to configure Elasticsearch either by running
-  without any non-free features or by beginning a Platinum license. Possible options
-  are `free` and `platinum`. Defaults to `free` as there are fewer test cases.
 
 **NOTE: You don't need to run the live integration tests for all changes. If
 you don't have Elasticsearch running locally the integration tests will be skipped.**

elasticsearch/_async/helpers.py

@@ -267,7 +267,9 @@ async def async_bulk(
 
     # make streaming_bulk yield successful results so we can count them
     kwargs["yield_ok"] = True
-    async for ok, item in async_streaming_bulk(client, actions, *args, **kwargs):
+    async for ok, item in async_streaming_bulk(
+        client, actions, ignore_status=ignore_status, *args, **kwargs
+    ):
         # go through request-response pairs and detect failures
         if not ok:
             if not stats_only:

elasticsearch/helpers/test.py

@@ -26,10 +26,8 @@
 
 if "ELASTICSEARCH_URL" in os.environ:
     ELASTICSEARCH_URL = os.environ["ELASTICSEARCH_URL"]
-elif os.environ.get("TEST_SUITE") == "platinum":
-    ELASTICSEARCH_URL = "https://elastic:changeme@localhost:9200"
 else:
-    ELASTICSEARCH_URL = "http://localhost:9200"
+    ELASTICSEARCH_URL = "https://elastic:changeme@localhost:9200"
 
 
 def get_test_client(nowait=False, **kwargs):

test_elasticsearch/test_async/test_server/test_rest_api_spec.py

@@ -33,7 +33,6 @@
     PARAMS_RENAMES,
     RUN_ASYNC_REST_API_TESTS,
     YAML_TEST_SPECS,
-    InvalidActionType,
     YamlRunner,
 )
 
@@ -85,7 +84,7 @@ async def run_code(self, test):
             if hasattr(self, "run_" + action_type):
                 await await_if_coro(getattr(self, "run_" + action_type)(action))
             else:
-                raise InvalidActionType(action_type)
+                raise RuntimeError("Invalid action type %r" % (action_type,))
 
     async def run_do(self, action):
         api = self.client
@@ -95,6 +94,16 @@ async def run_do(self, action):
         allowed_warnings = action.pop("allowed_warnings", ())
         assert len(action) == 1
 
+        # Remove the x_pack_rest_user authentication
+        # if it's given via headers. We're already authenticated
+        # via the 'elastic' user.
+        if (
+            headers
+            and headers.get("Authorization", None)
+            == "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA=="
+        ):
+            headers.pop("Authorization")
+
         method, args = list(action.items())[0]
         args["headers"] = headers
 
@@ -135,6 +144,18 @@ async def run_do(self, action):
             and str(w.message) not in allowed_warnings
         ]
 
+        # This warning can show up in many places but isn't accounted for
+        # in tests, so we remove it to make sure things pass.
+        include_type_name_warning = (
+            "[types removal] Using include_type_name in create index requests is deprecated. "
+            "The parameter will be removed in the next major version."
+        )
+        if (
+            include_type_name_warning in caught_warnings
+            and include_type_name_warning not in warn
+        ):
+            caught_warnings.remove(include_type_name_warning)
+
         # Sorting removes the issue with order raised. We only care about
         # if all warnings are raised in the single API call.
         if warn and sorted(warn) != sorted(caught_warnings):

test_elasticsearch/test_server/conftest.py

@@ -25,11 +25,19 @@
 
 from ..utils import wipe_cluster
 
+# Information about the Elasticsearch instance running, if any
+# Used for
+ELASTICSEARCH_VERSION = ""
+ELASTICSEARCH_BUILD_HASH = ""
+ELASTICSEARCH_REST_API_TESTS = []
 
-@pytest.fixture(scope="function")
-def sync_client():
+
+@pytest.fixture(scope="session")
+def sync_client_factory():
     client = None
     try:
+        # Configure the client with certificates and optionally
+        # an HTTP conn class depending on 'PYTHON_CONNECTION_CLASS' envvar
         kw = {"timeout": 3, "ca_certs": ".ci/certs/ca.pem"}
         if "PYTHON_CONNECTION_CLASS" in os.environ:
             from elasticsearch import connection
@@ -40,20 +48,26 @@ def sync_client():
 
         client = elasticsearch.Elasticsearch(ELASTICSEARCH_URL, **kw)
 
-        # wait for yellow status
+        # Wait for the cluster to report a status of 'yellow'
         for _ in range(100):
             try:
                 client.cluster.health(wait_for_status="yellow")
                 break
             except ConnectionError:
                 time.sleep(0.1)
         else:
-            # timeout
-            pytest.skip("Elasticsearch failed to start.")
+            pytest.skip("Elasticsearch wasn't running at %r" % (ELASTICSEARCH_URL,))
 
+        wipe_cluster(client)
         yield client
-
     finally:
         if client:
-            wipe_cluster(client)
             client.close()
+
+
+@pytest.fixture(scope="function")
+def sync_client(sync_client_factory):
+    try:
+        yield sync_client_factory
+    finally:
+        wipe_cluster(sync_client_factory)