elastic-enterprise-search 8.4.0 → 8.6.0

data/spec/spec_helper.rb

@@ -32,6 +32,10 @@ RSpec.configure do |config|
 
   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'
@@ -39,3 +43,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.4.0
+  version: 8.6.0
 platform: ruby
 authors:
 - Fernando Briano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2023-01-12 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
@@ -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
@@ -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.
 
   '
@@ -151,6 +207,24 @@ 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-tests.sh"
+- ".ci/.env"
 - ".ci/.gitignore"
 - ".ci/Dockerfile"
 - ".ci/certs/README.md"
@@ -160,22 +234,24 @@ files:
 - ".ci/certs/testnode.key"
 - ".ci/certs/testnode_no_san.crt"
 - ".ci/certs/testnode_no_san.key"
+- ".ci/docker-compose.yml"
 - ".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.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+8.5.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-kibana.sh"
 - ".ci/run-local.sh"
 - ".ci/run-repository.sh"
+- ".ci/run-stack.sh"
 - ".ci/run-tests"
 - ".ci/test-matrix.yml"
 - ".github/check_license_headers.rb"
@@ -213,6 +289,8 @@ files:
 - 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/86.asciidoc
 - docs/guide/release_notes/index.asciidoc
 - docs/guide/workplace-search-api.asciidoc
 - elastic-enterprise-search.gemspec

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.)