elastic-enterprise-search 8.5.0 → 8.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 370baa568c7b78d3fa58a0c322732c106163b3f91845841287b968966ca70717
-  data.tar.gz: 76108e767bc9e72f6ca6c981629f69a8c9e99106b07dc460761aaf089be4c86a
+  metadata.gz: '018288980fbd3b9a4f39cabf6fe3f7adfcb62e616d6d374a9e56099629468386'
+  data.tar.gz: eab15d1fa2e7d481b422a5fe3f843dfca8bb51e030ea6e70f690dd14ad757a09
 SHA512:
-  metadata.gz: 17ebc4758f08ae8a5e198d02fa45016525f080d8cc357b9a3b5ad82b2b208c89e5534e05f61e784cccc4ab4b9d30c79e6737845f52cd25bc1741ceff95bc893e
-  data.tar.gz: 0252bf54a1828983f1a8daac3ae4fb123a814aaa4f9d195df7284cea265542cb370242c71dd5fb9c2832f81650e5b17f3b58da8ae585fc08e5e7aff03881b7a3
+  metadata.gz: 80d0d275fd647abee39ce5b14fe2ea133d3595a4992ed744bd7727953c223f624a1fed18550d950aed6c6dc034d63f756dfafc678c02dfaa4e15468ed0306bd0
+  data.tar.gz: aeb3fe71149d88fd9cc82005af8beef7295b9c15812eb53e67a0c702b1b012e82b2ff869d66e5f56c804c21793548acbc13162ffb4ad962060c6f64d632637a4

data/.buildkite/Dockerfile

@@ -0,0 +1,13 @@
+ARG RUBY_VERSION=${RUBY_VERSION:-3.1}
+FROM ruby:$RUBY_VERSION
+
+ENV QUIET=true
+ENV CI=true
+
+# Install required tools
+RUN apt-get -q update && apt-get -y install zip curl
+
+WORKDIR /code/enterprise-search-ruby
+COPY . .
+
+RUN bundle install

data/.buildkite/certs/testnode.crt

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDYjCCAkqgAwIBAgIVAIClHav09e9XGWJrnshywAjUHTnXMA0GCSqGSIb3DQEB
+CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
+ZXJhdGVkIENBMB4XDTIzMDMyODE3MDIzOVoXDTI2MDMyNzE3MDIzOVowEzERMA8G
+A1UEAxMIaW5zdGFuY2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
++t5/g6u2r3awCtzqp17KG0hRxzkVoJoF8DYzVh+Rv9ymxQW0C/U8dQihAjkZHaIA
+n49lSyNLkwWtmqQgPcimV4d6XuTYx2ahDixXYtjmoOSwH5dRtovKPCNKDPkUj9Vq
+NwMW0uB1VxniMKI4DnYFqBgHL9kQKhQqvas6Gx0X6ptGRCLYCtVxeFcau6nnkZJt
+urb+HNV5waOh0uTmsqnnslK3NjCQ/f030vPKxM5fOqOU5ajUHpZFJ6ZFmS32074H
+l+mZoRT/GtbnVtIg+CJXsWThF3/L4iBImv+rkY9MKX5fyMLJgmIJG68S90IQGR8c
+Z2lZYzC0J7zjMsYlODbDAgMBAAGjgYswgYgwHQYDVR0OBBYEFIDIcECn3AVHc3jk
+MpQ4r7Kc3WCsMB8GA1UdIwQYMBaAFJYCWKn16g+acbing4Vl45QGUBs0MDsGA1Ud
+EQQ0MDKCCWxvY2FsaG9zdIIIaW5zdGFuY2WHBH8AAAGHEAAAAAAAAAAAAAAAAAAA
+AAGCA2VzMTAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBtX3RQ5ATpfORM
+lrnhaUPGOWkjnb3p3BrdAWUaWoh136QhaXqxKiALQQhTtTerkXOcuquy9MmAyYvS
+9fDdGvLCAO8pPCXjnzonCHerCLGdS7f/eqvSFWCdy7LPHzTAFYfVWVvbZed+83TL
+bDY63AMwIexj34vJEStMapuFwWx05fstE8qZWIbYCL87sF5H/MRhzlz3ScAhQ1N7
+tODH7zvLzSxFGGEzCIKZ0iPFKbd3Y0wE6SptDSKhOqlnC8kkNeI2GjWsqVfHKsoF
+pDFmri7IfOucuvalXJ6xiHPr9RDbuxEXs0u8mteT5nFQo7EaEGdHpg1pNGbfBOzP
+lmj/dRS9
+-----END CERTIFICATE-----

data/.buildkite/certs/testnode.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAlfref4Ortq92sArc6qdeyhtIUcc5FaCaBfA2M1Yfkb/cpsUF
+tAv1PHUIoQI5GR2iAJ+PZUsjS5MFrZqkID3IpleHel7k2MdmoQ4sV2LY5qDksB+X
+UbaLyjwjSgz5FI/VajcDFtLgdVcZ4jCiOA52BagYBy/ZECoUKr2rOhsdF+qbRkQi
+2ArVcXhXGrup55GSbbq2/hzVecGjodLk5rKp57JStzYwkP39N9LzysTOXzqjlOWo
+1B6WRSemRZkt9tO+B5fpmaEU/xrW51bSIPgiV7Fk4Rd/y+IgSJr/q5GPTCl+X8jC
+yYJiCRuvEvdCEBkfHGdpWWMwtCe84zLGJTg2wwIDAQABAoIBAAEP7HYNNnDWdYMD
++WAtYM12X/W5s/wUP94juaBI4u4iZH2EZodlixEdZUCTXgq43WsDUhxX05s7cE+p
+H5DuSCHtoo2WHvGKAposwRDm2f3YVWQ2Xyb2ahNt69LYHHWrO+XQ60YYTa3r8Gn3
+7dFR3I016/jyn5DeEVaglvS1dfj2UG4ybR4KkMfcKd94X0rKvz3wzAhHIh+hwMtv
+sVk7V4vSnKf2mJXwIVECTolnEJEkCjWjjymgUJYKT8yN7JnAsHRcvMa6kWwIGrLp
+oQCEaJwYM6ynCRS989pLt3vA2iu5VkYhiHXJ9Ds/5b5yzhzmj+ymzKbFKrrUUrmn
++2Jp1K0CgYEAw8BchALsD/+JuoXjinA14MH7PZjIsXyhtPk+c4pk42iMNyg1J8XF
+Y/ITepLYsl2bZqQI1jOJdDqsTwIsva9r749lsmkYI3VOxhi7+qBK0sThR66C87lX
+iU2QpnZ9NloC6ort4a3MEvZ/gRQcXdBrNlNoza2p7PHAVDTnsdSrNKUCgYEAxCQV
+uo85oZyfnMufn/gcI9IeYOgiB0tO3a8cAFX2wQW1y935t6Z13ApUQc4EnCOH7ZBc
+td5kT+xGdRWnfPZ38FM1dd5MBdGE69s3q8pJDUExSgNLqaF6/5bD32qui66L3ugu
+eMjxrzqJsc2uQTPCs18SGsyRmf54DpY8HglOmUcCgYAGRDgx+a347SNJl1OrcOAo
+q80RMbzrAaRjmL8JD9se9I/YjC73cPtasbsx51WMkDaTWJj30nqJ//7YIKeyAtWf
+u6Vzyq19JRo6eTw7T7pVePwFQW7rwnks6hDBY3WqscL6IyxuVxP7X2zBgxVNY4ir
+Gox2WSLhdPPFPlRUewxoCQKBgAJvqE1u5fpZ5ame5dao0ECppXLyrymEB/C88g4X
+Az+WgJGNqkJbsO8QuccvdeMylcefmWcw4fIULzPZFwF4VjkH74wNPMh9t7buPBzI
+IGwnuSMAM3ph5RMzni8yNgTKIDaej6U0abwRcBBjS5zHtc1giusGS3CsNnWH7Cs7
+VlyVAoGBAK+prq9t9x3tC3NfCZH8/Wfs/X0T1qm11RiL5+tOhmbguWAqSSBy8OjX
+Yh8AOXrFuMGldcaTXxMeiKvI2cyybnls1MFsPoeV/fSMJbex7whdeJeTi66NOSKr
+oftUHvkHS0Vv/LicMEOufFGslb4T9aPJ7oyhoSlz9CfAutDWk/q/
+-----END RSA PRIVATE KEY-----

data/.buildkite/log-results.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+#
+# This script is intended to be run after the build in a Buildkite pipeline
+echo "--- Test summary"
+buildkite-agent artifact download "tmp/*.html" .
+
+files="tmp/*.html"
+for f in $files; do
+  SERVICE=`echo $f | grep -o "\(appsearch\|enterprisesearch\|workplacesearch\)"`
+  RUBY_VERSION=`echo $f | grep -Po "(\d+\.)+\d+"`
+  EXAMPLES=`cat $f | grep -o "[0-9]\+ example" | tail -1`
+  FAILURES=`cat $f | grep -o "[0-9]\+ failure" | tail -1`
+  PENDING=`cat $f | grep -o "[0-9]\+ pending" | tail -1`
+  echo "--- :rspec: $EXAMPLES - :x: $FAILURES - :pinched_fingers: $PENDING :test_tube: $SERVICE :ruby: $RUBY_VERSION"
+done

data/.buildkite/pipeline.yml

@@ -0,0 +1,20 @@
+steps:
+  - label: ":elastic-enterprise-search: Enterprise Search :rspec: API Integration Tests :ruby: v{{ matrix.ruby }}"
+    agents:
+      provider: "gcp"
+    env:
+      RUBY_VERSION: "{{ matrix.ruby }}"
+      STACK_VERSION: 8.7.0-SNAPSHOT
+    matrix:
+      setup:
+        ruby:
+          - "3.2"
+          - "3.1"
+          - "3.0"
+          - "2.7"
+    command: ./.buildkite/run-tests.sh
+    artifact_paths: "tmp/*"
+  - wait: ~
+    continue_on_failure: true
+  - label: "Log Results"
+    command: ./.buildkite/log-results.sh

data/.buildkite/run-client.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+# Once called Elasticsearch and Enteprise Search should be up and running
+#
+script_path=$(dirname $(realpath -s $0))
+source $script_path/functions/imports.sh
+set -euo pipefail
+
+export RUBY_VERSION=${RUBY_VERSION:-3.1}
+
+echo "--- :telephone_receiver: Pinging Elasticsearch :elasticsearch:"
+curl --insecure --fail $external_elasticsearch_url/_cluster/health?pretty
+
+enterprise_search_url="http://localhost:3002"
+echo "--- :telephone_receiver: Pinging Enterprise Search :elastic-enterprise-search:"
+curl -I --fail $enterprise_search_url
+
+echo "--- :docker: :ruby: Building Docker image"
+docker build \
+       --file $script_path/Dockerfile \
+       --tag elastic/enterprise-search-ruby \
+       --build-arg RUBY_VERSION=${RUBY_VERSION} \
+       .
+
+echo "--- :docker: :ruby: Running Client Container"
+docker run \
+       --network ${network_name} \
+       --name enterprise-search-ruby \
+       --env "ELASTIC_ENTERPRISE_HOST=http://${CONTAINER_NAME}:3002" \
+       --env "BUILDKITE=true" \
+       --rm \
+       --volume `pwd`:/code/enterprise-search-ruby \
+       elastic/enterprise-search-ruby \
+       rake spec:integration
+

data/{.ci → .buildkite}/run-elasticsearch.sh

@@ -7,7 +7,7 @@
 # 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.6.1
 # - Initial version of the run-elasticsearch.sh script
 # - Deleting the volume should not dependent on the container still running
 # - Fixed `ES_JAVA_OPTS` config
@@ -15,6 +15,12 @@
 # - 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
+# - Added ingest.geoip.downloader.enabled=false as it causes false positives in testing
+# - Moved ELASTIC_PASSWORD and xpack.security.enabled to the base arguments for "Security On by default"
+# - Use https only when TEST_SUITE is "platinum", when "free" use http
+# - Set xpack.security.enabled=false for "free" and xpack.security.enabled=true for "platinum"
 
 script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
@@ -23,11 +29,15 @@ set -euo pipefail
 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 $es_node_name
 
+# Set vm.max_map_count kernel setting to 262144
+sudo sysctl -w vm.max_map_count=262144
+
 master_node_name=${es_node_name}
 cluster_name=${moniker}${suffix}
 
 declare -a volumes
 environment=($(cat <<-END
+  --env ELASTIC_PASSWORD=$elastic_password
   --env node.name=$es_node_name
   --env cluster.name=$cluster_name
   --env cluster.initial_master_nodes=$master_node_name
@@ -37,19 +47,22 @@ 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
+  --env ingest.geoip.downloader.enabled=false
+  --env cluster.deprecation_indexing.enabled=false
 END
 ))
 if [[ "$TEST_SUITE" == "platinum" ]]; then
   environment+=($(cat <<-END
-    --env ELASTIC_PASSWORD=$elastic_password
-    --env xpack.license.self_generated.type=trial
     --env xpack.security.enabled=true
+    --env xpack.license.self_generated.type=trial
     --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
@@ -61,6 +74,13 @@ END
     --volume $ssl_ca:/usr/share/elasticsearch/config/certs/ca.crt
 END
 ))
+else
+  environment+=($(cat <<-END
+    --env node.roles=data,data_cold,data_content,data_frozen,data_hot,data_warm,ingest,master,ml,remote_cluster_client,transform
+    --env xpack.security.enabled=false
+    --env xpack.security.http.ssl.enabled=false
+END
+))
 fi
 
 cert_validation_flags=""
@@ -104,7 +124,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 \
@@ -124,4 +144,3 @@ END
   fi
 
 done
-

data/{.ci → .buildkite}/run-local.sh

@@ -8,7 +8,7 @@ source $script_path/functions/imports.sh
 set -euo pipefail
 
 echo -e "\033[1m>>>>> Start [$STACK_VERSION container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
-DETACH=true bash .ci/run-elasticsearch.sh
+DETACH=true bash .buildkite/run-elasticsearch.sh
 
 echo -e "\033[1m>>>>> Running run-enterprise-search.sh >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
-bash .ci/run-enterprise-search.sh
+bash .buildkite/run-enterprise-search.sh

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 "--- :docker: :elasticsearch: Starting Elasticsearch"
+DETACH=true bash $script_path/run-elasticsearch.sh
+
+echo "--- :docker: :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/.github/workflows/testing.yml

@@ -7,7 +7,7 @@ jobs:
       ENDPOINT: http://localhost:8080
     strategy:
       matrix:
-        ruby: [ '2.7', '3.0', '3.1' ]
+        ruby: [ '2.7', '3.0', '3.1', '3.2' ]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -27,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/Rakefile

@@ -28,7 +28,7 @@ end
 
 desc 'Run Elastic Enterprise Search stack'
 task :stack, [:version] do |_, params|
-  sh "STACK_VERSION=#{params[:version]} ./.ci/run-local.sh"
+  sh "STACK_VERSION=#{params[:version]} ./.buildkite/run-local.sh"
 end
 
 # rubocop:disable Metrics/BlockLength
@@ -40,7 +40,13 @@ namespace :spec do
 
   desc 'Run integration tests'
   task :integration do
-    sh 'rspec spec/integration'
+    buildkite = ENV['BUILDKITE']
+    puts '--- :rspec: Running Enteprise Search API Tests' if buildkite
+    sh 'rspec spec/integration/enterprise_search_api_spec.rb'
+    puts '--- :rspec: Running Workplace Search API Tests' if buildkite
+    sh 'rspec spec/integration/workplace-search'
+    puts '--- :rspec: Running App Search API Tests' if buildkite
+    sh 'rspec spec/integration/app-search'
   end
 
   desc 'Run all tests'

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/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/87.asciidoc

@@ -0,0 +1,13 @@
+[[release_notes_87]]
+=== 8.7 Release notes
+
+[discrete]
+[[release_notes_870]]
+=== 8.7.0 Release notes
+
+- Tested versions of Ruby for 8.7.0: Ruby (MRI) 2.7, 3.0, 3.1 and 3.2, JRuby 9.3 and JRuby 9.4.
+- Updated for compatibility with Elastic Enterprise Search 8.7's API.
+
+[discrete]
+==== App Search
+- Fixed source code documentation for Search API. Updated parameter `boost` to `boosts`.

data/docs/guide/release_notes/index.asciidoc

@@ -4,6 +4,8 @@
 [discrete]
 === 8.x
 
+* <<release_notes_87, 8.7.0 Release Notes>>
+* <<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>>
@@ -23,6 +25,8 @@
 * <<release_notes_711, 7.11.0 Release Notes>>
 * <<release_notes_710, 7.10.0.beta.1 Release Notes>>
 
+include::87.asciidoc[]
+include::86.asciidoc[]
 include::85.asciidoc[]
 include::84.asciidoc[]
 include::83.asciidoc[]

data/elastic-enterprise-search.gemspec

@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   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'

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

@@ -29,7 +29,7 @@ module Elastic
         # @option arguments [Hash] :body (Required: query)
         # @option body [string] :query
         # @option body :analytics
-        # @option body :boost
+        # @option body :boosts
         # @option body :facets
         # @option body :filters
         # @option body :group

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

@@ -19,6 +19,6 @@
 
 module Elastic
   module EnterpriseSearch
-    VERSION = '8.5.0'
+    VERSION = '8.7.0'
   end
 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)

data/spec/integration/app-search/api_logs_spec.rb

@@ -54,14 +54,6 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
       }
       response = client.api_logs(engine_name, body: body)
       expect(response.status).to eq 200
-
-      attempts = 0
-      while response.body['results'].count < 1 && attempts < 20
-        sleep 1
-        attempts += 1
-        response = client.api_logs(engine_name, body: body)
-      end
-      expect(response.body['results'].count).to be >= 1
     end
   end
 end

data/spec/spec_helper.rb

@@ -29,9 +29,13 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-
+  config.color = true
   config.add_formatter('documentation')
   config.add_formatter('RspecJunitFormatter', 'enterprise-search-junit.xml')
+  config.add_formatter(
+    'RSpec::Core::Formatters::HtmlFormatter',
+    "tmp/enterprise-search-#{ENV['SERVICE']}-#{RUBY_VERSION}.html"
+  )
 
   VCR.configure do |c|
     c.cassette_library_dir = 'spec/fixtures/vcr'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-enterprise-search
 version: !ruby/object:Gem::Version
-  version: 8.5.0
+  version: 8.7.0
 platform: ruby
 authors:
 - Fernando Briano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elastic-transport
@@ -118,16 +118,16 @@ dependencies:
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -207,32 +207,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".buildkite/Dockerfile"
+- ".buildkite/certs/README.md"
+- ".buildkite/certs/ca.crt"
+- ".buildkite/certs/ca.key"
+- ".buildkite/certs/testnode.crt"
+- ".buildkite/certs/testnode.key"
+- ".buildkite/certs/testnode_no_san.crt"
+- ".buildkite/certs/testnode_no_san.key"
+- ".buildkite/functions/cleanup.sh"
+- ".buildkite/functions/imports.sh"
+- ".buildkite/functions/wait-for-container.sh"
+- ".buildkite/log-results.sh"
+- ".buildkite/pipeline.yml"
+- ".buildkite/run-client.sh"
+- ".buildkite/run-elasticsearch.sh"
+- ".buildkite/run-enterprise-search.sh"
+- ".buildkite/run-local.sh"
+- ".buildkite/run-tests.sh"
 - ".ci/.gitignore"
 - ".ci/Dockerfile"
-- ".ci/certs/README.md"
-- ".ci/certs/ca.crt"
-- ".ci/certs/ca.key"
-- ".ci/certs/testnode.crt"
-- ".ci/certs/testnode.key"
-- ".ci/certs/testnode_no_san.crt"
-- ".ci/certs/testnode_no_san.key"
-- ".ci/functions/cleanup.sh"
-- ".ci/functions/imports.sh"
-- ".ci/functions/wait-for-container.sh"
-- ".ci/jobs/defaults.yml"
-- ".ci/jobs/elastic+enterprise-search-ruby+7.17.yml"
-- ".ci/jobs/elastic+enterprise-search-ruby+8.2.yml"
-- ".ci/jobs/elastic+enterprise-search-ruby+8.3.yml"
-- ".ci/jobs/elastic+enterprise-search-ruby+8.4.yml"
-- ".ci/jobs/elastic+enterprise-search-ruby+main.yml"
-- ".ci/jobs/elastic+enterprise-search-ruby+pull-request.yml"
 - ".ci/make.sh"
-- ".ci/run-elasticsearch.sh"
-- ".ci/run-enterprise-search.sh"
-- ".ci/run-local.sh"
-- ".ci/run-repository.sh"
-- ".ci/run-tests"
-- ".ci/test-matrix.yml"
 - ".github/check_license_headers.rb"
 - ".github/license-header.txt"
 - ".github/workflows/license.yml"
@@ -269,6 +264,8 @@ files:
 - docs/guide/release_notes/83.asciidoc
 - docs/guide/release_notes/84.asciidoc
 - docs/guide/release_notes/85.asciidoc
+- docs/guide/release_notes/86.asciidoc
+- docs/guide/release_notes/87.asciidoc
 - docs/guide/release_notes/index.asciidoc
 - docs/guide/workplace-search-api.asciidoc
 - elastic-enterprise-search.gemspec
@@ -481,7 +478,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Official API client for Elastic Enterprise Search

data/.ci/certs/testnode.crt

@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDYjCCAkqgAwIBAgIVAIZQH0fe5U+bGQ6m1JUBO/AQkQ/9MA0GCSqGSIb3DQEB
-CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
-ZXJhdGVkIENBMB4XDTIwMDMyNzE5MTcxMVoXDTIzMDMyNzE5MTcxMVowEzERMA8G
-A1UEAxMIaW5zdGFuY2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB
-fco1t1+sE1gTwTVGcXKZqJTP2GjMHM0cfJE5KKfwC5B+pHADRT6FZxvepgKjEBDt
-CK+2Rmotyeb15XXMSKguNhyT+2PuKvT5r05L7P91XRYXrwxG2swJPtct7A87xdFa
-Ek+YRpqGGmTaux2jOELMiAmqEzoj6w/xFq+LF4SolTW4wOL2eLFkEFHBX2oCwU5T
-Q+B+7E9zL45nFWlkeRGJ+ZQTnRNZ/1r4N9A9Gtj4x/H1/y4inWndikdxAb5QiEYJ
-T+vbQWzHYWjz13ttHJsz+6T8rvA1jK+buHgVh4K8lV13X9k54soBqHB8va7/KIJP
-g8gvd6vusEI7Bmfl1as7AgMBAAGjgYswgYgwHQYDVR0OBBYEFKnnpvuVYwtFSUis
-WwN9OHLyExzJMB8GA1UdIwQYMBaAFJYCWKn16g+acbing4Vl45QGUBs0MDsGA1Ud
-EQQ0MDKCCWxvY2FsaG9zdIIIaW5zdGFuY2WHBH8AAAGHEAAAAAAAAAAAAAAAAAAA
-AAGCA2VzMTAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAPNsIoD4GBrTgR
-jfvBuHS6eU16P95m16O8Mdpr4SMQgWLQUhs8aoVgfwpg2TkbCWxOe6khJOyNm7bf
-fW4aFQ/OHcQV4Czz3c7eOHTWSyMlCOv+nRXd4giJZ5TOHw1zKGmKXOIvhvE6RfdF
-uBBfrusk164H4iykm0Bbr/wo4d6wuebp3ZYLPw5zV0D08rsaR+3VJ9VxWuFpdm/r
-2onYOohyuX9DRjAczasC+CRRQN4eHJlRfSQB8WfTKw3EloRJJDAg6SJyGiAJ++BF
-hnqfNcEyKes2AWagFF9aTbEJMrzMhH+YB5F+S/PWvMUlFzcoocVKqc4pIrjKUNWO
-6nbTxeAB
------END CERTIFICATE-----

data/.ci/certs/testnode.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAwX3KNbdfrBNYE8E1RnFymaiUz9hozBzNHHyROSin8AuQfqRw
-A0U+hWcb3qYCoxAQ7QivtkZqLcnm9eV1zEioLjYck/tj7ir0+a9OS+z/dV0WF68M
-RtrMCT7XLewPO8XRWhJPmEaahhpk2rsdozhCzIgJqhM6I+sP8RavixeEqJU1uMDi
-9nixZBBRwV9qAsFOU0PgfuxPcy+OZxVpZHkRifmUE50TWf9a+DfQPRrY+Mfx9f8u
-Ip1p3YpHcQG+UIhGCU/r20Fsx2Fo89d7bRybM/uk/K7wNYyvm7h4FYeCvJVdd1/Z
-OeLKAahwfL2u/yiCT4PIL3er7rBCOwZn5dWrOwIDAQABAoIBAFcm4ICnculf4Sks
-umFbUiISA81GjZV6V4zAMu1K+bGuk8vnJyjh9JJD6hK0NbXa07TgV7zDJKoxKd2S
-GCgGhfIin2asMcuh/6vDIYIjYsErR3stdlsnzAVSD7v4ergSlwR6AO32xz0mAE1h
-QK029yeHEstPU72/7/NIo5MD6dXAbut1MzgijZD8RQo1z21D6qmLcPTVTfkn7a3W
-MY3y7XUIkA1TOyIRsH3k6F6NBWkvtXbwOUeLCJ14EvS8T9BqhIhPDZv8mQTRLDOD
-tQRyC4Cnw+UhYmnMFJhj6N2jpTBv/AdoKcRC56uBJyPW+dxj6i4e7n3pQuxqRvpI
-LLJJsskCgYEA4QQxzuJizLKV75rE+Qxg0Ej0Gid1aj3H5eeTZOUhm9KC8KDfPdpk
-msKaNzJq/VDcqHPluGS1jYZVgZlal1nk5xKBcbQ4n297VPVd+sLtlf0bj4atlDUO
-+iOVo0H7k5yWvj+TzVRlc5zjDLcnQh8i+22o3+65hIrb2zpzg/cCZJ8CgYEA3CJX
-bjmWPQ0uZVIa8Wz8cJFtKT9uVl7Z3/f6HjN9I0b/9MmVlNxQVAilVwhDkzR/UawG
-QeRFBJ6XWRwX0aoMq+O9VSNu/R2rtEMpIYt3LwbI3yw6GRoCdB5qeL820O+KX5Fl
-/z+ZNgrHgA1yKPVf+8ke2ZtLEqPHMN+BMuq8t+UCgYEAy0MfvzQPbbuw55WWcyb0
-WZJdNzcHwKX4ajzrj4vP9VOPRtD7eINMt+QsrMnVjei6u0yeahhHTIXZvc2K4Qeq
-V/YGinDzaUqqTU+synXFauUOPXO6XxQi6GC2rphPKsOcBFWoLSYc0vgYvgbA5uD7
-l8Yyc77RROKuwfWmHcJHHh8CgYBurGFSjGdJWHgr/oSHPqkIG0VLiJV7nQJjBPRd
-/Lr8YnTK6BJpHf7Q0Ov3frMirjEYqakXtaExel5TMbmT8q+eN8h3pnHlleY+oclr
-EQghv4J8GWs4NYhoQuZ6wH/ZuaTS+XHTS3FG51J3wcrUZtET8ICvHNE4lNjPbH8z
-TysENQKBgHER1RtDFdz+O7mlWibrHk8JDgcVdZV/pBF+9cb7r/orkH9RLAHDlsAO
-tuSVaQmm5eqgaAxMamBXSyw1lir07byemyuEDg0mJ1rNUGsAY8P+LWr579gvKMme
-5gvrJr99JkBTV3z+TiL7dZa52eW00Ijqg2qcbHGpq3kXWWkbd8Tn
------END RSA PRIVATE KEY-----

data/.ci/jobs/defaults.yml

@@ -1,73 +0,0 @@
----
-
-##### GLOBAL METADATA
-
-- meta:
-    cluster: clients-ci
-
-##### JOB DEFAULTS
-
-- job:
-    project-type: matrix
-    logrotate:
-      daysToKeep: 30
-      numToKeep: 100
-    properties:
-    - github:
-        url: https://github.com/elastic/enterprise-search-ruby/
-    - inject:
-        properties-content: HOME=$JENKINS_HOME
-    concurrent: true
-    node: flyweight
-    scm:
-    - git:
-        name: origin
-        credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
-        reference-repo: /var/lib/jenkins/.git-references/enterprise-search-ruby.git
-        branches:
-        - ${branch_specifier}
-        url: git@github.com:elastic/enterprise-search-ruby.git
-        basedir: ''
-        wipe-workspace: 'True'
-    triggers:
-    - github
-    - timed: 'H 5,17 * * *'
-    axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - linux
-    - axis:
-        type: yaml
-        filename: .ci/test-matrix.yml
-        name: STACK_VERSION
-    - axis:
-        type: yaml
-        filename: .ci/test-matrix.yml
-        name: RUBY_VERSION
-    - axis:
-        type: yaml
-        filename: .ci/test-matrix.yml
-        name: SERVICE
-    yaml-strategy:
-      exclude-key: exclude
-      filename: .ci/test-matrix.yml
-    wrappers:
-      - ansicolor
-      - timeout:
-          type: absolute
-          timeout: 120
-          fail: true
-      - timestamps
-      - workspace-cleanup
-    builders:
-      - shell: |-
-          #!/usr/local/bin/runbld
-          .ci/run-tests
-    publishers:
-      - email:
-          recipients: build-lang-clients@elastic.co
-      - junit:
-          results: "*-junit.xml"
-          allow-empty-results: true

data/.ci/jobs/elastic+enterprise-search-ruby+7.17.yml

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

data/.ci/jobs/elastic+enterprise-search-ruby+8.2.yml

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

data/.ci/jobs/elastic+enterprise-search-ruby+8.3.yml

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

data/.ci/jobs/elastic+enterprise-search-ruby+8.4.yml

@@ -1,12 +0,0 @@
----
-- job:
-    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.4
-        description: the Git branch specifier to build (<branchName>, <tagName>,
-          <commitId>, etc.)

data/.ci/jobs/elastic+enterprise-search-ruby+main.yml

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

data/.ci/jobs/elastic+enterprise-search-ruby+pull-request.yml

@@ -1,19 +0,0 @@
----
-- job:
-    name: elastic+enterprise-search-ruby+pull-request
-    display-name: 'elastic / enterprise-search-ruby # pull-request'
-    description: Testing of enterprise-search-ruby pull requests.
-    junit_results: "*-junit.xml"
-    scm:
-    - git:
-        branches:
-        - ${ghprbActualCommit}
-        refspec: +refs/pull/*:refs/remotes/origin/pr/*
-    triggers:
-    - github-pull-request:
-        org-list:
-        - elastic
-        allow-whitelist-orgs-as-admins: true
-        github-hooks: true
-        status-context: clients-ci
-        cancel-builds-on-update: true

data/.ci/run-repository.sh

@@ -1,50 +0,0 @@
-#!/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
-#
-# Its recommended to call `imports.sh` as defined here so that you get access to all variables defined there
-#
-# Any parameters that test-matrix.yml defines should be declared here with appropiate defaults
-
-script_path=$(dirname $(realpath -s $0))
-source $script_path/functions/imports.sh
-set -euo pipefail
-
-echo -e "\033[34;1mINFO:\033[0m VERSION: ${STACK_VERSION}\033[0m"
-echo -e "\033[34;1mINFO:\033[0m TEST_SUITE: ${TEST_SUITE}\033[0m"
-echo -e "\033[34;1mINFO:\033[0m RUBY_VERSION: ${RUBY_VERSION}\033[0m"
-echo -e "\033[34;1mINFO:\033[0m RUNSCRIPTS: ${RUNSCRIPTS}\033[0m"
-echo -e "\033[34;1mINFO:\033[0m URL: ${elasticsearch_url}\033[0m"
-echo -e "\033[34;1mINFO:\033[0m SERVICE: ${SERVICE}\033[0m"
-
-echo -e "\033[34;1mINFO:\033[0m pinging Elasticsearch ..\033[0m"
-curl --insecure --fail $external_elasticsearch_url/_cluster/health?pretty
-
-if [[ "$RUNSCRIPTS" = *"enterprise-search"* ]]; then
-  enterprise_search_url="http://localhost:3002"
-  echo -e "\033[34;1mINFO:\033[0m pinging Enterprise Search ..\033[0m"
-  curl -I --fail $enterprise_search_url
-fi
-
-echo -e "\033[32;1mSUCCESS:\033[0m successfully started the ${STACK_VERSION} stack.\033[0m"
-
-echo -e "\033[32;1mBUILD: \033[31mRuby \e[0m container.\033[0m"
-
-docker build \
-       --file .ci/Dockerfile \
-       --tag elastic/enterprise-search-ruby \
-       --build-arg RUBY_VERSION=${RUBY_VERSION} \
-       .
-
-echo -e "\033[32;1mRUN: \033[31mRuby \e[0m container.\033[0m"
-
-docker run \
-       --network ${network_name} \
-       --name enterprise-search-ruby \
-       --env "ELASTIC_ENTERPRISE_HOST=http://${CONTAINER_NAME}:3002" \
-       --rm \
-       --volume `pwd`:/code/enterprise-search-ruby \
-       elastic/enterprise-search-ruby \
-       rake spec:integration:${SERVICE}

data/.ci/run-tests

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-#
-# Version 1.1
-# - Moved to .ci folder and seperated out `run-repository.sh`
-# - Add `$RUNSCRIPTS` env var for running Elasticsearch dependent products
-export TEST_SUITE=platinum
-export CONTAINER_NAME=enterprise-search
-export RUNSCRIPTS=enterprise-search
-
-script_path=$(dirname $(realpath -s $0))
-source $script_path/functions/imports.sh
-set -euo pipefail
-
-echo -e "\033[1m>>>>> Start [$STACK_VERSION container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
-DETACH=true bash .ci/run-elasticsearch.sh
-
-if [[ -n "$RUNSCRIPTS" ]]; then
-  for RUNSCRIPT in ${RUNSCRIPTS//,/ } ; do
-    echo -e "\033[1m>>>>> Running run-$RUNSCRIPT.sh >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
-    CONTAINER_NAME=${RUNSCRIPT} \
-      DETACH=true \
-      bash .ci/run-${RUNSCRIPT}.sh
-  done
-fi
-
-echo -e "\033[1m>>>>> Repository specific tests >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
-bash .ci/run-repository.sh

data/.ci/test-matrix.yml

@@ -1,15 +0,0 @@
----
-RUBY_VERSION:
-  - 3.1
-  - 3.0
-  - 2.7
-
-STACK_VERSION:
-  - 8.5.0-SNAPSHOT
-
-SERVICE:
-  - appsearch
-  - enterprisesearch
-  - workplacesearch
-
-exclude: ~