elastic-enterprise-search 8.3.0 → 8.5.0

data/lib/elastic/workplace-search/api/delete_documents.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # Documents - Deletes a list of documents from a custom content source
         # Remove documents from a Custom API Source

data/lib/elastic/workplace-search/api/delete_documents_by_query.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # Documents - Deletes documents by query in a custom content source
         # Deletes documents by query in a custom content source

data/lib/elastic/workplace-search/api/delete_external_identity.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # ExternalIdentities - Deletes an external identity
         # Deletes an external identity

data/lib/elastic/workplace-search/api/delete_synonym_set.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # Synonyms - Delete a synonym set
         # Delete a synonym set

data/lib/elastic/workplace-search/api/document.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # Documents - Retrieves a document by ID from the specified content source
         # Retrieves a document by ID from the specified content source

data/lib/elastic/workplace-search/api/external_identity.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # ExternalIdentities - Retrieves an external identity
         # Retrieves an external identity

data/lib/elastic/workplace-search/api/index_documents.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # Documents - Indexes one or more new documents into a custom content source, or updates one or more existing documents
         # Indexes one or more new documents into a custom content source, or updates one or more existing documents

data/lib/elastic/workplace-search/api/list_content_sources.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # ContentSources - Retrieves all content sources
         # Retrieves all content sources

data/lib/elastic/workplace-search/api/list_documents.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # Documents - Lists documents from a custom content source
         # Lists documents from a custom content source

data/lib/elastic/workplace-search/api/list_external_identities.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # ExternalIdentities - Retrieves all external identities
         # Retrieves all external identities

data/lib/elastic/workplace-search/api/list_synonym_sets.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # Synonyms - Retrieves all synonym sets
         # Retrieve a list of synonym sets

data/lib/elastic/workplace-search/api/put_content_source.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # ContentSources - Update a content source
         # Update a content source

data/lib/elastic/workplace-search/api/put_content_source_icons.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # ContentSources - Upload content source icons
         # Upload content source icons

data/lib/elastic/workplace-search/api/put_external_identity.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # ExternalIdentities - Updates an external identity
         # Updates an external identity

data/lib/elastic/workplace-search/api/put_synonym_set.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # Synonyms - Update a synonym set
         # Update a synonym set

data/lib/elastic/workplace-search/api/put_triggers_blocklist.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # putTriggersBlocklist - Update current triggers blocklist
         # Update current triggers blocklist

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

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # Search - Search across available sources with various query tuning options
         # Issue a Search Query

data/lib/elastic/workplace-search/api/synonym_set.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # Synonyms - Retrieve a synonym set by ID
         # Retrieve a synonym set by ID

data/lib/elastic/workplace-search/api/triggers_blocklist.rb

@@ -20,7 +20,6 @@
 module Elastic
   module EnterpriseSearch
     module WorkplaceSearch
-      # Generated from build hash 835a1a87f357f7b7cfd3453b5c5a937c47995772
       module Actions
         # getTriggersBlocklist - Get current triggers blocklist
         # Get current triggers blocklist

data/rake_tasks/unified_release_tasks.rake

@@ -17,6 +17,7 @@
 
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/BlockLength
 namespace :unified_release do
   desc <<-DESC
   Update Rubygems versions in version.rb and *.gemspec files
@@ -43,4 +44,24 @@ namespace :unified_release do
   rescue StandardError => e
     abort "[!!!] #{e.class} : #{e.message}"
   end
+
+  desc 'Update Stack Versions in test matrices (.github/workflows and .ci/test-matrix.yml)'
+  task :update_matrices, :version do |_, args|
+    @version = args[:version]
+    error = 'Error: version must be passed in and needs to be a version format: 9.1.0, 8.7.15.'
+    raise ArgumentError, error unless @version&.match?(/[0-9.]/)
+
+    # Replace in test-matrix.yml
+    file = File.expand_path('./.ci/test-matrix.yml')
+    regex = /(STACK_VERSION:\s+- )([0-9.]+(-SNAPSHOT)?)/
+    replace_version(regex, file)
+  end
+
+  def replace_version(regex, file)
+    content = File.read(file)
+    match = content.match(regex)
+    content = content.gsub(regex, "#{match[1]}#{@version}")
+    File.open(file, 'w') { |f| f.puts content }
+  end
 end
+# rubocop:enable Metrics/BlockLength

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

@@ -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

data/spec/fixtures/vcr/workplace_search/create_analytics_event.yml

@@ -10,7 +10,7 @@ http_interactions:
       X-Elastic-Client-Meta:
       - es=7.11.0.pre.1,rb=2.7.2,t=7.11.0.pre.1,fd=1.3.0,nh=1.1
       User-Agent:
-      - 'elastic-enteprise-search-ruby/7.11.0.pre (RUBY_VERSION: 2.7.2; linux x86_64;
+      - 'elastic-enterprise-search-ruby/7.11.0.pre (RUBY_VERSION: 2.7.2; linux x86_64;
         elasticsearch-transport: 7.11.0.pre.1)'
       Content-Type:
       - application/json

data/spec/fixtures/vcr/workplace_search/oauth_request_token.yml

@@ -10,7 +10,7 @@ http_interactions:
       X-Elastic-Client-Meta:
       - es=7.11.0.pre.1,rb=2.7.2,t=7.11.0.pre.1,fd=1.3.0,nh=1.1
       User-Agent:
-      - 'elastic-enteprise-search-ruby/7.11.0.pre (RUBY_VERSION: 2.7.2; linux x86_64;
+      - 'elastic-enterprise-search-ruby/7.11.0.pre (RUBY_VERSION: 2.7.2; linux x86_64;
         elasticsearch-transport: 7.11.0.pre.1)'
       Content-Type:
       - application/json

data/spec/fixtures/vcr/workplace_search/search_request.yml

@@ -10,7 +10,7 @@ http_interactions:
       X-Elastic-Client-Meta:
       - es=7.11.0.pre.1,rb=2.7.2,t=7.11.0.pre.1,fd=1.3.0,nh=1.1
       User-Agent:
-      - 'elastic-enteprise-search-ruby/7.11.0.pre (RUBY_VERSION: 2.7.2; linux x86_64;
+      - 'elastic-enterprise-search-ruby/7.11.0.pre (RUBY_VERSION: 2.7.2; linux x86_64;
         elasticsearch-transport: 7.11.0.pre.1)'
       Content-Type:
       - application/json

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

@@ -51,12 +51,26 @@ describe Elastic::EnterpriseSearch::AppSearch::Client do
     end
 
     it 'performs an ES search' do
-      es_request = { body: { query: { bool: { must: { term: { author: 'panciroli' } } } } } }
-      response = client.search_es_search(engine_name, body: { request: es_request })
+      es_request = { query: { bool: { must: { term: { author: 'panciroli' } } } } }
+      response = client.search_es_search(engine_name, body: es_request)
       expect(response.status).to eq 200
       expect(response.body['hits']['hits'].count).to eq 2
       expect do
-        response.body['hits']['hits'].map { |a| a['_source']['author'] } == ['Elsa Panciroli', 'Dr. Elsa Panciroli']
+        response.body['hits']['hits'].map do |a|
+          a['_source']['author']
+        end == ['Elsa Panciroli', 'Dr. Elsa Panciroli']
+      end
+    end
+
+    it 'performs an ES search with query parameters' do
+      es_request = { query: { bool: { must: { term: { author: 'panciroli' } } } } }
+      response = client.search_es_search(engine_name, body: es_request, sort: "{ 'author': 'desc' }")
+      expect(response.status).to eq 200
+      expect(response.body['hits']['hits'].count).to eq 2
+      expect do
+        response.body['hits']['hits'].map do |a|
+          a['_source']['author']
+        end == ['Dr. Elsa Panciroli', 'Elsa Panciroli']
       end
     end
   end

data/spec/spec_helper.rb

@@ -39,3 +39,37 @@ RSpec.configure do |config|
     c.allow_http_connections_when_no_cassette = true
   end
 end
+
+def is_faraday2?
+  return false unless defined?(Faraday::VERSION)
+
+  Gem::Version.new(Faraday::VERSION) >= Gem::Version.new(2)
+end
+
+def hide_constants
+  hide_const('Faraday::Adapter::Patron')
+  hide_const('Patron')
+  hide_const('Faraday::Adapter::Typhoeus')
+  hide_const('Typhoeus')
+end
+
+shared_examples 'adapters compatibility' do
+  let(:transport_client) { instance_double(Elastic::Transport::Client) }
+  let(:adapter) { client.transport.transport.connections.all.first.connection.builder.adapter }
+  let(:client) { described_class.new }
+
+  context 'default ' do
+    it 'uses default NetHttp Faraday adapter' do
+      hide_constants
+      expect(adapter).to eq Faraday::Adapter::NetHttp
+    end
+  end
+
+  context 'selecting adapter' do
+    it 'uses Typhoeus when specified' do
+      allow(Elastic::Transport::Client).to receive(:new).and_return({})
+      described_class.new(adapter: :typhoeus)
+      expect(Elastic::Transport::Client).to have_received(:new).with(hash_including(adapter: :typhoeus))
+    end
+  end
+end

data/spec/workplace-search/client_spec.rb

@@ -105,32 +105,5 @@ describe Elastic::EnterpriseSearch::WorkplaceSearch::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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-enterprise-search
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.5.0
 platform: ruby
 authors:
 - Fernando Briano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elastic-transport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-net_http_persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-patron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Official API client for Elastic Enterprise Search APIs.
 
   '
@@ -165,9 +221,9 @@ files:
 - ".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.0.yml"
-- ".ci/jobs/elastic+enterprise-search-ruby+8.1.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"
@@ -210,6 +266,9 @@ files:
 - docs/guide/release_notes/80.asciidoc
 - docs/guide/release_notes/81.asciidoc
 - docs/guide/release_notes/82.asciidoc
+- docs/guide/release_notes/83.asciidoc
+- docs/guide/release_notes/84.asciidoc
+- docs/guide/release_notes/85.asciidoc
 - docs/guide/release_notes/index.asciidoc
 - docs/guide/workplace-search-api.asciidoc
 - elastic-enterprise-search.gemspec