elastic-enterprise-search 7.15.0 → 7.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ebc1dd416a61d523f8de08fe29e3308539cce59a55a9edcbffc7997c85910d5
-  data.tar.gz: 2dd11f3198ee70cea2d7f9d76f4d411ee47160b5e4d0ba1a32080cc830301b5d
+  metadata.gz: af43f95c32828fa2a4c5d44f12f430ebaf6ca3ec3fee1f1d6c48b02348e15bee
+  data.tar.gz: eb3df761787c3e537cff53bb50c2a44eedacb4dc99c4c609b303bd1ef3734c3d
 SHA512:
-  metadata.gz: d9d5499b123c3d026d2c2dbde6a0a9952321c3b2befd12cd42199d3d032d26f65a02e371bc32ceb9a9f3bcb3c085e83aed2ad5b292b43aeed6bdf5db37878744
-  data.tar.gz: d212455f5c39d99eea502669241b4dbd848615e0de15109b764465d124b003696d0dd0737a276f294ac0ee9a17b56027dd711c6e1f1cd615aec09005bf30dadd
+  metadata.gz: 50e6b28a6b395d26ea2bde7a00211b381d85d3483cda75b6d254d53b14f076c07f88306e2dea718a409ad8412faedfd2dd59062e4a75712bd5071ea6fba0901a
+  data.tar.gz: 8a38e574a9a7877afa2aa7bcc1ca377ebff4d71c122dec2c8b43bf9e441ef89f908a42055b42f111e9bfa1db24423819e4da867f8575f74350f7adf91d2dc810

data/.github/compatibility/Gemfile

@@ -0,0 +1,23 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'elasticsearch', ENV['es-version']
+gem 'elastic-enterprise-search', path: File.expand_path('../../', __dir__)

data/.github/workflows/compatibility.yml

@@ -0,0 +1,20 @@
+name: Compatibility with Elasticsearch
+on: [push, pull_request]
+
+jobs:
+  elasticsearch:
+    env:
+      ES_VERSION: ${{ matrix.es_version }}
+    strategy:
+      matrix:
+        es_version: [ 7.11, 7.12, 7.13, 7.14, 7.15 ]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.0
+    - name: Build Gemfile with Elasticsearch gem
+      run: |
+        ruby -v
+        cd ./.github/compatibility/ && bundle

data/docs/guide/release_notes/714.asciidoc

@@ -1,4 +1,16 @@
 [[release_notes_714]]
+=== 7.14 Release notes
+
+[discrete]
+[[release_notes_7141]]
+=== 7.14.1 Release notes
+
+==== Dependency fix
+
+Updates dependency on `elasticsearch-transport` to be more open. At least 7.11 is required, but this way it can be used with different versions of the `elasticsearch` gem (bigger than or equal to `7.11`) in the same project, without a conflict in `elasticsearch-transport`. When instantiating transport, we now check if version is `< 7.14` so we use the right class.
+
+[discrete]
+[[release_notes_7140]]
 === 7.14.0 Release notes
 
 [discrete]

data/docs/guide/release_notes/715.asciidoc

@@ -1,4 +1,16 @@
 [[release_notes_715]]
+=== 7.15 Release notes
+
+[discrete]
+[[release_notes_7151]]
+=== 7.15.1 Release notes
+
+==== Dependency fix
+
+Updates dependency on `elasticsearch-transport` to be more open. At least 7.11 is required, but this way it can be used with different versions of the `elasticsearch` gem (bigger than or equal to `7.11`) in the same project, without a conflict in `elasticsearch-transport`. When instantiating transport, we now check if version is `< 7.14` so we use the right class.
+
+[discrete]
+[[release_notes_7150]]
 === 7.15.0 Release notes
 
 [discrete]

data/elastic-enterprise-search.gemspec

@@ -47,7 +47,7 @@ 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 'elasticsearch-transport', '~> 7.13.0'
+  s.add_dependency 'elasticsearch-transport', '>= 7.11'
   s.add_runtime_dependency 'jwt', '>= 1.5', '< 3.0'
   s.add_development_dependency 'awesome_print'
   s.add_development_dependency 'byebug' unless defined?(JRUBY_VERSION)

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

@@ -67,7 +67,7 @@ module Elastic
 
       def transport
         @options[:transport] ||
-          Elasticsearch::Client.new(
+          transport_klass.new(
             host: host,
             log: log,
             logger: logger,
@@ -110,6 +110,17 @@ module Elastic
 
         @options[:host]
       end
+
+      private
+
+      def transport_klass
+        case Elasticsearch::Transport::VERSION
+        when /7\.1[123]/
+          Elasticsearch::Client
+        else
+          Elasticsearch::Transport::Client
+        end
+      end
     end
   end
 end

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

@@ -19,6 +19,6 @@
 
 module Elastic
   module EnterpriseSearch
-    VERSION = '7.15.0'
+    VERSION = '7.15.1'
   end
 end

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

@@ -66,7 +66,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
       engine_name = 'update-engine'
       body = { name: key_name, type: 'private', read: true, write: true, access_all_engines: true }
       client.create_api_key(body: body)
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
 
       body = { name: key_name, type: 'private', read: true, write: true, engines: [engine_name] }
       attempts = 0

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

@@ -25,7 +25,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:api_key_name) { 'logs-api-key' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
       # Create API Key Client to log events:
       body = { name: api_key_name, type: 'private', read: true, write: true, access_all_engines: true }
       api_key = client.create_api_key(body: body).body['key']

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

@@ -18,6 +18,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'logger'
 
 # App Search Integration tests Client Configuration
 def client
@@ -34,6 +35,17 @@ def delete_engines
   engines = client.list_engines.body['results']
   engines.each do |engine|
     client.delete_engine(engine['name'])
+    # Gives time to the server to sync:
+    sleep 2
   end
-  sleep 1
+end
+
+def create_engine(name)
+  client.create_engine(name: name)
+rescue Elasticsearch::Transport::Transport::Errors::BadRequest => e
+  raise e unless e.message.match(/Name is already taken/)
+
+  Logger.new($stdout).info("Engine '#{name}' had already been created, giving time for the server to sync.")
+  sleep 5
+  client.create_engine(name: name)
 end

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

@@ -23,7 +23,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:engine_name) { 'count-analytics' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
       sleep 1
     end
 

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

@@ -25,7 +25,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:name) { 'https://www.elastic.co' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
       body = { name: name }
       response = client.create_crawler_domain(engine_name, body: body)
       @domain = response.body

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

@@ -25,7 +25,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:name) { 'https://www.elastic.co' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
       body = { name: name }
       response = client.create_crawler_domain(engine_name, body: body)
       @domain = response.body

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

@@ -25,7 +25,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:name) { 'https://www.elastic.co' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
     end
 
     after do

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

@@ -25,26 +25,14 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:name) { 'https://www.elastic.co' }
 
     before do
-      attempts = 0
-      loop do
-        attempts += 1
-        client.create_engine(name: engine_name)
-        break if attempts > 9
-      rescue Elasticsearch::Transport::Transport::Errors::BadRequest => e
-        if e.message.match?(/Name is already taken/)
-          sleep 1
-          next
-        end
-      else
-        break
-      end
+      create_engine(engine_name)
       body = { name: name }
       response = client.create_crawler_domain(engine_name, body: body)
       @domain = response.body
     end
 
     after do
-      client.delete_engine(engine_name)
+      delete_engines
     end
 
     it 'creates an entry point' do

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

@@ -25,7 +25,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:name) { 'https://www.elastic.co' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
       body = { name: name }
       response = client.create_crawler_domain(engine_name, body: body)
       @domain = response.body

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

@@ -25,7 +25,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:name) { 'https://www.elastic.co' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
       body = { name: name }
       response = client.create_crawler_domain(engine_name, body: body)
       @domain = response.body

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

@@ -25,7 +25,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:name) { 'https://www.elastic.co' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
       body = { name: name }
       response = client.create_crawler_domain(engine_name, body: body)
       @domain = response.body

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

@@ -25,7 +25,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:name) { 'https://www.elastic.co' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
       body = { name: name }
       response = client.create_crawler_domain(engine_name, body: body)
       @domain = response.body

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

@@ -26,26 +26,14 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:name) { 'https://www.elastic.co' }
 
     before do
-      attempts = 0
-      loop do
-        attempts += 1
-        client.create_engine(name: engine_name)
-        break if attempts > 9
-      rescue Elasticsearch::Transport::Transport::Errors::BadRequest => e
-        if e.message.match?(/Name is already taken/)
-          sleep 1
-          next
-        end
-      else
-        break
-      end
+      create_engine(engine_name)
       body = { name: name }
       response = client.create_crawler_domain(engine_name, body: body)
       @domain = response.body
     end
 
     after do
-      client.delete_engine(engine_name)
+      delete_engines
     end
 
     it 'sets a crawl schedule' do

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

@@ -25,7 +25,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:name) { 'https://www.elastic.co' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
       body = { name: name }
       response = client.create_crawler_domain(engine_name, body: body)
       @domain = response.body

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

@@ -25,7 +25,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:name) { 'https://www.elastic.co' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
       body = { name: name }
       response = client.create_crawler_domain(engine_name, body: body)
       @domain = response.body

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

@@ -24,7 +24,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:engine_name) { 'books' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
       documents = [
         { title: 'Jungle Tales', author: 'Horacio Quiroga' },
         { title: 'The Jungle Book', author: 'Rudyard Kipling' }

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

@@ -32,7 +32,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     end
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
     end
 
     after do

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

@@ -58,9 +58,9 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     end
 
     it 'retrieves an engine by name' do
+      engine_name = 'retrieve-engine'
       client.create_engine(name: engine_name)
       response = client.engine(engine_name)
-
       expect(response.status).to eq 200
       expect(response.body).to eq(
         { 'name' => engine_name, 'type' => 'default', 'language' => nil, 'document_count' => 0 }
@@ -68,6 +68,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     end
 
     it 'deletes an engine' do
+      engine_name = 'delete-engine'
       client.create_engine(name: engine_name)
       response = client.delete_engine(engine_name)
       expect(response.status).to eq 200

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

@@ -24,7 +24,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:engine_name) { 'videogames' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
     end
 
     after do

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

@@ -24,7 +24,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:engine_name) { 'query-suggestions' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
     end
 
     after do

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

@@ -23,7 +23,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
   let(:engine_name) { 'schema' }
 
   before do
-    client.create_engine(name: engine_name)
+    create_engine(engine_name)
     client.index_documents(engine_name, documents: [{ title: 'test', director: 'someone' }])
   end
 

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

@@ -33,7 +33,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
   end
 
   before do
-    client.create_engine(name: engine_name)
+    create_engine(engine_name)
     client.index_documents(engine_name, documents: documents)
     sleep 1
   end

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

@@ -23,7 +23,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
   let(:engine_name) { 'search-settings' }
 
   before do
-    client.create_engine(name: engine_name)
+    create_engine(engine_name)
   end
 
   after do

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

@@ -23,7 +23,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
   let(:engine_name) { 'synonyms' }
 
   before do
-    client.create_engine(name: engine_name)
+    create_engine(engine_name)
   end
 
   after do

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

@@ -24,7 +24,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     let(:engine_name) { 'top-clicks-analytics' }
 
     before do
-      client.create_engine(name: engine_name)
+      create_engine(engine_name)
     end
 
     after do

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

@@ -23,7 +23,7 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
   let(:engine_name) { 'top-queries-analytics' }
 
   before do
-    client.create_engine(name: engine_name)
+    create_engine(engine_name)
   end
 
   after do

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: elastic-enterprise-search
 version: !ruby/object:Gem::Version
-  version: 7.15.0
+  version: 7.15.1
 platform: ruby
 authors:
 - Fernando Briano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.13.0
+        version: '7.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.13.0
+        version: '7.11'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,9 @@ files:
 - ".ci/run-tests"
 - ".ci/test-matrix.yml"
 - ".github/check_license_headers.rb"
+- ".github/compatibility/Gemfile"
 - ".github/license-header.txt"
+- ".github/workflows/compatibility.yml"
 - ".github/workflows/license.yml"
 - ".github/workflows/rubocop.yml"
 - ".github/workflows/testing.yml"