elastic-enterprise-search 8.4.0 → 8.6.0

data/.buildkite/run-enterprise-search.sh

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+#
+# Launch one App Search node 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'.
+
+# Version 1.1.0
+# - Initial version of the run-app-search.sh script
+# - Refactored .ci version
+
+script_path=$(dirname $(realpath -s $0))
+source $script_path/functions/imports.sh
+set -euo pipefail
+
+CONTAINER_NAME=${CONTAINER_NAME-enterprise-search}
+APP_SEARCH_SECRET_SESSION_KEY=${APP_SEARCH_SECRET_SESSION_KEY-int_test_secret}
+
+echo -e "\033[34;1mINFO:\033[0m Take down node if called twice with the same arguments (DETACH=true) or on seperate terminals \033[0m"
+cleanup_node $CONTAINER_NAME
+
+http_port=3002
+url=http://127.0.0.1:${http_port}
+
+# Pull the container, retry on failures up to 5 times with
+# short delays between each attempt. Fixes most transient network errors.
+docker_pull_attempts=0
+until [ "$docker_pull_attempts" -ge 5 ]
+do
+   docker pull docker.elastic.co/enterprise-search/enterprise-search:"$STACK_VERSION" && break
+   docker_pull_attempts=$((docker_pull_attempts+1))
+   echo "Failed to pull image, retrying in 10 seconds (retry $docker_pull_attempts/5)..."
+   sleep 10
+done
+
+echo -e "\033[34;1mINFO:\033[0m Starting container $CONTAINER_NAME \033[0m"
+set -x
+docker run \
+  --name "$CONTAINER_NAME" \
+  --network "$network_name" \
+  --env "elasticsearch.host=$elasticsearch_url" \
+  --env "elasticsearch.username=elastic" \
+  --env "elasticsearch.password=$elastic_password" \
+  --env "ENT_SEARCH_DEFAULT_PASSWORD=$elastic_password" \
+  --env "secret_management.encryption_keys=[$APP_SEARCH_SECRET_SESSION_KEY]" \
+  --env "enterprise_search.listen_port=$http_port" \
+  --env "log_level=info" \
+  --env "hide_version_info=false" \
+  --env "worker.threads=2" \
+  --env "allow_es_settings_modification=true" \
+  --env "JAVA_OPTS=-Xms1g -Xmx2g" \
+  --env "elasticsearch.ssl.enabled=true" \
+  --env "elasticsearch.ssl.verify=true" \
+  --env "elasticsearch.ssl.certificate=/usr/share/app-search/config/certs/testnode.crt" \
+  --env "elasticsearch.ssl.certificate_authority=/usr/share/app-search/config/certs/ca.crt" \
+  --env "elasticsearch.ssl.key=/usr/share/app-search/config/certs/testnode.key" \
+  --env "ELASTICSEARCH_SEARCH_API=true" \
+  --volume $ssl_cert:/usr/share/app-search/config/certs/testnode.crt \
+  --volume $ssl_key:/usr/share/app-search/config/certs/testnode.key \
+  --volume $ssl_ca:/usr/share/app-search/config/certs/ca.crt \
+  --publish "$http_port":3002 \
+  --detach="$DETACH" \
+  --health-cmd="curl --insecure --fail ${url} || exit 1" \
+  --health-interval=30s \
+  --health-retries=50 \
+  --health-timeout=10s \
+  --rm \
+  docker.elastic.co/enterprise-search/enterprise-search:"$STACK_VERSION";
+
+if wait_for_container "$CONTAINER_NAME" "$network_name"; then
+  echo -e "\033[32;1mSUCCESS:\033[0m Running on: ${url}\033[0m"
+fi

data/.buildkite/run-tests.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+#
+# Script to run Enterprise Search container and Enterprise Search client integration tests on Buildkite
+#
+# Version 0.1
+#
+export TEST_SUITE=platinum
+export CONTAINER_NAME=enterprise-search
+
+script_path=$(dirname $(realpath -s $0))
+source $script_path/functions/imports.sh
+set -euo pipefail
+
+echo "--- Create the elastic network"
+docker network create elastic
+
+echo "--- :elasticsearch: Starting Elasticsearch"
+DETACH=true bash $script_path/run-elasticsearch.sh
+
+echo "--- :elastic-enterprise-search: Starting Enterprise Search"
+DETACH=true bash $script_path/run-enterprise-search.sh
+
+echo "+++ :ruby: Run Client"
+bash $script_path/run-client.sh

data/.ci/.env

@@ -0,0 +1,9 @@
+ELASTIC_PASSWORD=changeme
+KIBANA_PASSWORD=changeme
+ES_PORT=9200
+CLUSTER_NAME=es-cluster
+LICENSE=trial
+MEM_LIMIT=1073741824
+KIBANA_PORT=5601
+ENTERPRISE_SEARCH_PORT=3002
+ENCRYPTION_KEYS=secret

data/.ci/docker-compose.yml

@@ -0,0 +1,166 @@
+
+version: "2.2"
+
+services:
+  setup:
+    image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
+    volumes:
+      - certs:/usr/share/elasticsearch/config/certs
+    user: "0"
+    command: >
+      bash -c '
+        if [ x${ELASTIC_PASSWORD} == x ]; then
+          echo "Set the ELASTIC_PASSWORD environment variable in the .env file";
+          exit 1;
+        elif [ x${KIBANA_PASSWORD} == x ]; then
+          echo "Set the KIBANA_PASSWORD environment variable in the .env file";
+          exit 1;
+        fi;
+        if [ ! -f certs/ca.zip ]; then
+          echo "Creating CA";
+          bin/elasticsearch-certutil ca --silent --pem -out config/certs/ca.zip;
+          unzip config/certs/ca.zip -d config/certs;
+        fi;
+        if [ ! -f certs/certs.zip ]; then
+          echo "Creating certs";
+          echo -ne \
+          "instances:\n"\
+          "  - name: es01\n"\
+          "    dns:\n"\
+          "      - es01\n"\
+          "      - localhost\n"\
+          "    ip:\n"\
+          "      - 127.0.0.1\n"\
+          > config/certs/instances.yml;
+          bin/elasticsearch-certutil cert --silent --pem -out config/certs/certs.zip --in config/certs/instances.yml --ca-cert config/certs/ca/ca.crt --ca-key config/certs/ca/ca.key;
+          unzip config/certs/certs.zip -d config/certs;
+        fi;
+        echo "Setting file permissions"
+        chown -R root:root config/certs;
+        find . -type d -exec chmod 750 \{\} \;;
+        find . -type f -exec chmod 640 \{\} \;;
+        echo "Waiting for Elasticsearch availability";
+        until curl -s --cacert config/certs/ca/ca.crt https://es01:9200 | grep -q "missing authentication credentials"; do sleep 30; done;
+        echo "Setting kibana_system password";
+        until curl -s -X POST --cacert config/certs/ca/ca.crt -u elastic:${ELASTIC_PASSWORD} -H "Content-Type: application/json" https://es01:9200/_security/user/kibana_system/_password -d "{\"password\":\"${KIBANA_PASSWORD}\"}" | grep -q "^{}"; do sleep 10; done;
+        echo "All done!";
+      '
+    healthcheck:
+      test: ["CMD-SHELL", "[ -f config/certs/es01/es01.crt ]"]
+      interval: 1s
+      timeout: 5s
+      retries: 120
+
+  es01:
+    depends_on:
+      setup:
+        condition: service_healthy
+    image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
+    volumes:
+      - certs:/usr/share/elasticsearch/config/certs
+      - esdata01:/usr/share/elasticsearch/data
+    ports:
+      - ${ES_PORT}:9200
+    environment:
+      - node.name=es01
+      - cluster.name=${CLUSTER_NAME}
+      - cluster.initial_master_nodes=es01
+      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
+      - bootstrap.memory_lock=true
+      - xpack.security.enabled=true
+      - xpack.security.http.ssl.enabled=true
+      - xpack.security.http.ssl.key=certs/es01/es01.key
+      - xpack.security.http.ssl.certificate=certs/es01/es01.crt
+      - xpack.security.http.ssl.certificate_authorities=certs/ca/ca.crt
+      - xpack.security.http.ssl.verification_mode=certificate
+      - xpack.security.transport.ssl.enabled=true
+      - xpack.security.transport.ssl.key=certs/es01/es01.key
+      - xpack.security.transport.ssl.certificate=certs/es01/es01.crt
+      - xpack.security.transport.ssl.certificate_authorities=certs/ca/ca.crt
+      - xpack.security.transport.ssl.verification_mode=certificate
+      - xpack.license.self_generated.type=trial
+    mem_limit: ${MEM_LIMIT}
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+    healthcheck:
+      test:
+        [
+            "CMD-SHELL",
+            "curl -s --cacert config/certs/ca/ca.crt https://localhost:9200 | grep -q 'missing authentication credentials'",
+        ]
+      interval: 10s
+      timeout: 10s
+      retries: 120
+
+  kibana:
+    depends_on:
+      es01:
+        condition: service_healthy
+    image: docker.elastic.co/kibana/kibana:${STACK_VERSION}
+    volumes:
+      - certs:/usr/share/kibana/config/certs
+      - kibanadata:/usr/share/kibana/data
+    ports:
+      - ${KIBANA_PORT}:5601
+    environment:
+      - SERVERNAME=kibana
+      - ELASTICSEARCH_HOSTS=https://es01:9200
+      - ELASTICSEARCH_USERNAME=kibana_system
+      - ELASTICSEARCH_PASSWORD=${KIBANA_PASSWORD}
+      - ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES=config/certs/ca/ca.crt
+      - ENTERPRISESEARCH_HOST=http://enterprisesearch:${ENTERPRISE_SEARCH_PORT}
+    mem_limit: ${MEM_LIMIT}
+    healthcheck:
+      test:
+        [
+            "CMD-SHELL",
+            "curl -s -I http://localhost:5601 | grep -q 'HTTP/1.1 302 Found'",
+        ]
+      interval: 10s
+      timeout: 10s
+      retries: 120
+
+  enterprisesearch:
+    depends_on:
+      es01:
+        condition: service_healthy
+      kibana:
+        condition: service_healthy
+    image: docker.elastic.co/enterprise-search/enterprise-search:${STACK_VERSION}
+    volumes:
+      - certs:/usr/share/enterprise-search/config/certs
+      - enterprisesearchdata:/usr/share/enterprise-search/config
+    ports:
+      - ${ENTERPRISE_SEARCH_PORT}:3002
+    environment:
+      - SERVERNAME=enterprisesearch
+      - secret_management.encryption_keys=[${ENCRYPTION_KEYS}]
+      - allow_es_settings_modification=true
+      - elasticsearch.host=https://es01:9200
+      - elasticsearch.username=elastic
+      - elasticsearch.password=${ELASTIC_PASSWORD}
+      - elasticsearch.ssl.enabled=true
+      - elasticsearch.ssl.certificate_authority=/usr/share/enterprise-search/config/certs/ca/ca.crt
+      - kibana.external_url=http://kibana:5601
+    mem_limit: ${MEM_LIMIT}
+    healthcheck:
+      test:
+        [
+            "CMD-SHELL",
+            "curl -s -I http://localhost:3002 | grep -q 'HTTP/1.1 302 Found'",
+        ]
+      interval: 10s
+      timeout: 10s
+      retries: 120
+
+volumes:
+  certs:
+    driver: local
+  enterprisesearchdata:
+    driver: local
+  esdata01:
+    driver: local
+  kibanadata:
+    driver: local

data/.ci/jobs/{elastic+enterprise-search-ruby+8.0.yml → elastic+enterprise-search-ruby+8.4.yml}

@@ -1,12 +1,12 @@
 ---
 - job:
-    name: elastic+enterprise-search-ruby+8.0
-    display-name: 'elastic / enterprise-search-ruby # 8.0'
-    description: Testing the enterprise-search-ruby 8.0 branch.
+    name: elastic+enterprise-search-ruby+8.4
+    display-name: 'elastic / enterprise-search-ruby # 8.4'
+    description: Testing the enterprise-search-ruby 8.4 branch.
     junit_results: "*-junit.xml"
     parameters:
     - string:
         name: branch_specifier
-        default: refs/heads/8.0
+        default: refs/heads/8.4
         description: the Git branch specifier to build (<branchName>, <tagName>,
           <commitId>, etc.)

data/.ci/jobs/{elastic+enterprise-search-ruby+8.1.yml → elastic+enterprise-search-ruby+8.5.yml}

@@ -1,12 +1,12 @@
 ---
 - job:
-    name: elastic+enterprise-search-ruby+8.1
-    display-name: 'elastic / enterprise-search-ruby # 8.1'
-    description: Testing the enterprise-search-ruby 8.1 branch.
+    name: elastic+enterprise-search-ruby+8.5
+    display-name: 'elastic / enterprise-search-ruby # 8.5'
+    description: Testing the enterprise-search-ruby 8.5 branch.
     junit_results: "*-junit.xml"
     parameters:
     - string:
         name: branch_specifier
-        default: refs/heads/8.1
+        default: refs/heads/8.5
         description: the Git branch specifier to build (<branchName>, <tagName>,
           <commitId>, etc.)

data/.ci/run-kibana.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+script_path=$(dirname $(realpath -s $0))
+source $script_path/functions/imports.sh
+set -euo pipefail
+
+docker run \
+       --name "kibana" \
+       --network "$network_name" \
+       --publish "5601:5601" \
+       --interactive \
+       --tty \
+       --rm \
+       --env "ENTERPRISESEARCH_HOST=http://localhost:3002" \
+       "docker.elastic.co/kibana/kibana:${STACK_VERSION}"
+
+# --volume $ssl_ca:/usr/share/elasticsearch/config/certs/ca.crt \
+
+# --env "ELASTICSEARCH_HOSTS=${elasticsearch_url}" \
+  # --env "ELASTICSEARCH_USERNAME=enterprise_search" \
+  # --env "ELASTICSEARCH_PASSWORD=${elastic_password}" \
+  # --env "ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES=${ssl_ca}" \

data/.ci/run-stack.sh

@@ -0,0 +1 @@
+STACK_VERSION=${STACK_VERSION} docker-compose up --remove-orphans

data/.ci/test-matrix.yml

@@ -5,7 +5,7 @@ RUBY_VERSION:
   - 2.7
 
 STACK_VERSION:
-  - 8.4.0-SNAPSHOT
+  - 8.6-SNAPSHOT
 
 SERVICE:
   - appsearch

data/.github/workflows/rubocop.yml

@@ -11,5 +11,5 @@ jobs:
         ruby-version: 2.7
     - name: Run Rubocop
       run: |
-        bundle install
-        bundle exec rubocop
+        gem install rubocop
+        rubocop

data/.github/workflows/testing.yml

@@ -16,6 +16,8 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
     - name: Build and test with Rake
       run: |
+        sudo apt-get update
+        sudo apt-get install libcurl4-openssl-dev
         ruby -v
         bundle install
         bundle exec rake spec:client
@@ -25,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ jruby-9.3 ]
+        ruby: [ jruby-9.3, jruby-9.4 ]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

data/.gitignore

@@ -11,4 +11,5 @@ doc
 .#*
 *junit.xml
 .byebug_history
-coverage
+coverage
+tmp

data/README.md

@@ -20,7 +20,7 @@ Or add it to your project's Gemfile:
 gem 'elastic-enterprise-search', 'VERSION'
 ```
 
-The Enterprise Search client is implemented with [`elastic-transport`](https://github.com/elastic/elastic-transport-ruby/) as the HTTP layer, which uses [Faraday](https://rubygems.org/gems/faraday). Faraday supports several [adapters](https://lostisland.github.io/faraday/adapters/) and will use `Net::HTTP` by default. For optimal performance with the Enterprise Search API, we suggest using an HTTP library which supports persistent ("keep-alive") connections. For the standard Ruby implementation, this could be https://github.com/drbrain/net-http-persistent[Net::HTTP::Persistent], [patron](https://github.com/toland/patron) or [Typhoeus](https://github.com/typhoeus/typhoeus). For JRuby, [Manticore](https://github.com/cheald/manticore) is a great option as well. Require the library for the adapter in your code and then pass in the `:adapter` parameter to the client when you initialize it:
+The Enterprise Search client is implemented with [`elastic-transport`](https://github.com/elastic/elastic-transport-ruby/) as the HTTP layer, which uses [Faraday](https://rubygems.org/gems/faraday). Faraday supports several [adapters](https://lostisland.github.io/faraday/adapters/) and will use `Net::HTTP` by default. For optimal performance with the Enterprise Search API, we suggest using an HTTP library which supports persistent ("keep-alive") connections. For the standard Ruby implementation, this could be [Net::HTTP::Persistent](https://github.com/drbrain/net-http-persistent), [patron](https://github.com/toland/patron) or [Typhoeus](https://github.com/typhoeus/typhoeus). For JRuby, [Manticore](https://github.com/cheald/manticore) is a great option as well. Require the library for the adapter in your code and then pass in the `:adapter` parameter to the client when you initialize it:
 
 ```ruby
 require 'elastic-enterprise-search'

data/docs/guide/release_notes/717.asciidoc

@@ -1,6 +1,18 @@
 [[release_notes_717]]
 === 7.17 Release notes
 
+[discrete]
+[[release_notes_7171]]
+=== 7.17.1 Release notes
+
+- Updates in Documentation: CHANGELOG, CODE_OF_CONDUCT, CONTRIBUTING, NOTICE, README
+- Adds the option to specify an adapter for Faraday when initializing a client. See https://github.com/elastic/enterprise-search-ruby/blob/main/README.md#elastic-enterprise-search-client[README]
+- Fixes typo in meta data for CLIENT_NAME.
+
+[discrete]
+[[release_notes_7170]]
+=== 7.17.0 Release notes
+
 [discrete]
 ==== General
 

data/docs/guide/release_notes/85.asciidoc

@@ -0,0 +1,40 @@
+[[release_notes_85]]
+=== 8.5 Release notes
+
+[discrete]
+[[release_notes_850]]
+=== 8.5.0 Release notes
+
+==== Client
+- Updates dependency on `elastic-transport`.  With the latest release of `elastic-transport` - `v8.1.0` - this gem now supports Faraday v2. When you upgrade your gems, `8.1.0` will be installed. This supports both Faraday v1 and Faraday v2. The main change on dependencies when using Faraday v2 is all adapters, except for the default `net_http` one, have been moved out of Faraday into separate gems. This means if you're not using the default adapter and you migrate to Faraday v2, you'll need to add the adapter gems to your Gemfile.
+
+These are the gems required for the different adapters with Faraday 2, instead of the libraries on which they were based:
+
+[source,rb]
+----------------------------
+# HTTPCLient
+gem 'faraday-httpclient'
+# NetHTTPPersistent
+gem 'faraday-net_http_persistent'
+# Patron
+gem 'faraday-patron'
+# Typhoeus
+gem 'faraday-typhoeus'
+----------------------------
+
+Things should work fine if you migrate to Faraday 2 as long as you include the adapter (unless you're using the default one `net-http`), but worst case scenario, you can always lock the version of Faraday in your project to 1.x:
+`gem 'faraday', '~> 1'`
+
+*Troubleshooting*
+
+If you see a message like:
+`:adapter is not registered on Faraday::Adapter (Faraday::Error)`
+Then you probably need to include the adapter library in your gemfile and require it.
+
+Please https://github.com/elastic/enterprise-search-ruby/issues[submit an issue] if you encounter any problems.
+
+[discrete]
+==== App Search
+
+- Adds `precision_enabled` (Boolean) to `put_search_settings`. See https://www.elastic.co/guide/en/app-search/current/search-settings.html#search-settings-update[here] for more information.
+- `search_es_search` and `search_explain` changed the path to `api/as/v1` instead of `v0` and are now GA with version `8.5` of the stack.

data/docs/guide/release_notes/86.asciidoc

@@ -0,0 +1,9 @@
+[[release_notes_86]]
+=== 8.6 Release notes
+
+[discrete]
+[[release_notes_860]]
+=== 8.6.0 Release notes
+
+- Tested versions of Ruby for 8.6.0: Ruby (MRI) 2.7, 3.0 and 3.1, JRuby 9.3 and JRuby 9.4.
+- Updated for compatibility with Elastic Enterprise Search 8.6's API.

data/docs/guide/release_notes/index.asciidoc

@@ -4,6 +4,8 @@
 [discrete]
 === 8.x
 
+* <<release_notes_86, 8.6.0 Release Notes>>
+* <<release_notes_85, 8.5.0 Release Notes>>
 * <<release_notes_84, 8.4.0 Release Notes>>
 * <<release_notes_83, 8.3.0 Release Notes>>
 * <<release_notes_82, 8.2.0 Release Notes>>
@@ -22,6 +24,8 @@
 * <<release_notes_711, 7.11.0 Release Notes>>
 * <<release_notes_710, 7.10.0.beta.1 Release Notes>>
 
+include::86.asciidoc[]
+include::85.asciidoc[]
 include::84.asciidoc[]
 include::83.asciidoc[]
 include::82.asciidoc[]

data/elastic-enterprise-search.gemspec

@@ -47,14 +47,19 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'elastic-transport', '~> 8'
+  s.add_dependency 'elastic-transport', '~> 8.1'
   s.add_runtime_dependency 'jwt', '>= 1.5', '< 3.0'
   s.add_development_dependency 'awesome_print'
   s.add_development_dependency 'byebug' unless defined?(JRUBY_VERSION)
   s.add_development_dependency 'rspec', '~> 3.9.0'
   s.add_development_dependency 'rspec_junit_formatter'
   s.add_development_dependency 'rubocop', '~> 1'
-  s.add_development_dependency 'vcr', '~> 3.0.3'
+  s.add_development_dependency 'vcr'
   s.add_development_dependency 'webmock'
+  # Adapters
+  s.add_development_dependency 'faraday-httpclient'
+  s.add_development_dependency 'faraday-net_http_persistent'
+  s.add_development_dependency 'faraday-patron' unless defined? JRUBY_VERSION
+  s.add_development_dependency 'faraday-typhoeus'
 end
 # rubocop:enable Metrics/BlockLength

data/lib/elastic/app-search/api/put_search_settings.rb

@@ -31,6 +31,7 @@ module Elastic
         # @option body :search_fields
         # @option body :result_fields
         # @option body [integer] :precision
+        # @option body [boolean] :precision_enabled
         # @option arguments [Hash] :headers optional HTTP headers to send with the request
         #
         # @see https://www.elastic.co/guide/en/app-search/current/search-settings.html#search-settings-update

data/lib/elastic/app-search/api/search_es_search.rb

@@ -27,6 +27,7 @@ module Elastic
         # @param [String] engine_name Name of the engine (*Required*)
         # @param [Hash] arguments endpoint arguments
         # @option arguments [Hash] :body Query parameters to be passed to Elasticsearch _search API
+        # @option arguments [Object] :es_search_query_params Query parameters to be passed to Elasticsearch _search API
         # @option arguments [Hash] :headers optional HTTP headers to send with the request
         # @option headers [String] :X-Enterprise-Search-Analytics The search query associated with this request when recording search analytics
         # @option headers [String] :X-Enterprise-Search-Analytics-Tags Analytics tags to be applied with this search request
@@ -40,7 +41,7 @@ module Elastic
           headers = arguments.delete(:headers) || {}
           request(
             :post,
-            "api/as/v0/engines/#{engine_name}/elasticsearch/_search/",
+            "api/as/v1/engines/#{engine_name}/elasticsearch/_search/",
             arguments,
             body,
             headers

data/lib/elastic/app-search/api/search_explain.rb

@@ -49,7 +49,7 @@ module Elastic
           headers = arguments.delete(:headers) || {}
           request(
             :post,
-            "api/as/v0/engines/#{engine_name}/search_explain/",
+            "api/as/v1/engines/#{engine_name}/search_explain/",
             arguments,
             body,
             headers

data/lib/elastic/enterprise-search/version.rb

@@ -19,6 +19,6 @@
 
 module Elastic
   module EnterpriseSearch
-    VERSION = '8.4.0'
+    VERSION = '8.6.0'
   end
 end

data/spec/app-search/client_spec.rb

@@ -86,32 +86,5 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     end
   end
 
-  context 'adapters' do
-    let(:client) { described_class.new }
-    let(:adapter) { client.transport.transport.connections.all.first.connection.builder.adapter }
-
-    context 'when no adapter is specified' do
-      it 'uses Faraday NetHttp' do
-        expect(adapter).to eq Faraday::Adapter::NetHttp
-      end
-    end
-
-    context 'when the adapter is patron' do
-      let(:client) { described_class.new(adapter: :patron) }
-
-      it 'uses Faraday with the adapter' do
-        expect(adapter).to eq Faraday::Adapter::Patron
-      end
-    end
-
-    unless defined?(JRUBY_VERSION)
-      context 'when the adapter is typhoeus' do
-        let(:client) { described_class.new(adapter: :patron) }
-
-        it 'uses Faraday with the adapter' do
-          expect(adapter).to eq Faraday::Adapter::Patron
-        end
-      end
-    end
-  end
+  include_examples 'adapters compatibility'
 end

data/spec/enterprise-search/client_spec.rb

@@ -96,7 +96,7 @@ describe Elastic::EnterpriseSearch::Client do
   context 'meta-header' do
     let(:transport) { Elastic::EnterpriseSearch::Client.new.instance_variable_get('@transport') }
     let(:subject) { transport.transport.connections.first.connection.headers }
-    let(:regexp) { /^[a-z]{1,}=[a-z0-9.\-]{1,}(?:,[a-z]{1,}=[a-z0-9._-]+)*$/ }
+    let(:regexp) { /^[a-z]{1,}=[a-z0-9.-]{1,}(?:,[a-z]{1,}=[a-z0-9._-]+)*$/ }
 
     it 'sends the correct meta header to transport' do
       expect(subject['x-elastic-client-meta']).to match(regexp)
@@ -104,32 +104,5 @@ describe Elastic::EnterpriseSearch::Client do
     end
   end
 
-  context 'adapters' do
-    let(:client) { described_class.new }
-    let(:adapter) { client.transport.transport.connections.all.first.connection.builder.adapter }
-
-    context 'when no adapter is specified' do
-      it 'uses Faraday NetHttp' do
-        expect(adapter).to eq Faraday::Adapter::NetHttp
-      end
-    end
-
-    context 'when the adapter is patron' do
-      let(:client) { described_class.new(adapter: :patron) }
-
-      it 'uses Faraday with the adapter' do
-        expect(adapter).to eq Faraday::Adapter::Patron
-      end
-    end
-
-    unless defined?(JRUBY_VERSION)
-      context 'when the adapter is typhoeus' do
-        let(:client) { described_class.new(adapter: :patron) }
-
-        it 'uses Faraday with the adapter' do
-          expect(adapter).to eq Faraday::Adapter::Patron
-        end
-      end
-    end
-  end
+  include_examples 'adapters compatibility'
 end