elasticsearch 8.4.0 → 8.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf0248457756f0d1f0f54d9519082a68ef61167ef36bca2d97cf6023881c2247
-  data.tar.gz: fe6b2bae3ace5e5909eb7d3beccd5ce9dd5bb448dcdff2ca425bce906966a0ab
+  metadata.gz: d59206ff2dab0663aec31ad0c64ef8dd7c2044d885299d201b41e187ecfa4245
+  data.tar.gz: 5d34b264085c2d0ba2dd57d85b60e1685fc2985bdf4fccb55ebd9dfece865067
 SHA512:
-  metadata.gz: f50c8a33678f42d9a050462b37143c3dc7cc518a2d74bb6e31331ae2ef4255de4ed3dc12f5451ec411bca87f2a93503b8841f79899c15d3b6f966a2aed9bf0aa
-  data.tar.gz: 3e7d964328006c792c9e4f71d859ee0ffd7b10f14f508c6fc693e51e9ddfaa4f166013b557d99410c160d60d3405b24732b15337e8fd464b3a0b7b8fa6051f50
+  metadata.gz: 40248c01429f3464b1582a27f5cfde5a701ddbc2aa15fd224610b681e5221f5e7a341129757e86470688fced7fe5e66d96406b0d30b1686b0b9396f209e3a763
+  data.tar.gz: e26757d22fccdbed3cf140c375760d85d585432a3f083c298d3371795c311f405fdd49aa181e4139027399b94c95e0c02faec5a2429933f53d4578b18b9fa546

data/elasticsearch.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.5'
 
   s.add_dependency 'elastic-transport', '~> 8'
-  s.add_dependency 'elasticsearch-api', '8.4.0'
+  s.add_dependency 'elasticsearch-api', '8.5.1'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'byebug' unless defined?(JRUBY_VERSION) || defined?(Rubinius)

data/lib/elasticsearch/version.rb

@@ -16,5 +16,5 @@
 # under the License.
 
 module Elasticsearch
-  VERSION = '8.4.0'.freeze
+  VERSION = '8.5.1'.freeze
 end

data/lib/elasticsearch.rb

@@ -144,9 +144,8 @@ module Elasticsearch
       if (headers = arguments.dig(:transport_options, :headers))
         headers.merge!(authorization)
       else
-        arguments[:transport_options] = {
-          headers: authorization
-        }
+        arguments[:transport_options] ||= {}
+        arguments[:transport_options].merge!({ headers: authorization })
       end
     end
 

data/spec/unit/api_key_spec.rb

@@ -57,7 +57,7 @@ describe Elasticsearch::Client do
       end
     end
 
-    context 'when other headers where specified' do
+    context 'when other headers were specified' do
       let(:client) do
         described_class.new(
           api_key: 'elasticsearch_api_key',
@@ -72,6 +72,42 @@ describe Elasticsearch::Client do
       end
     end
 
+    context 'when sending transport_options but no headers were specified' do
+      let(:client) do
+        described_class.new(
+          api_key: 'elasticsearch_api_key',
+          transport_options: { ssl: { verify: false } }
+        )
+      end
+
+      it 'Adds the ApiKey header to the connection and keeps the options' do
+        header = client.transport.connections.first.connection.headers
+        expect(header['Authorization']).to eq('ApiKey elasticsearch_api_key')
+        expect(client.transport.options[:transport_options]).to include({ ssl: { verify: false } })
+        expect(client.transport.options[:transport_options][:headers]).to include('Authorization' => 'ApiKey elasticsearch_api_key')
+      end
+    end
+
+    context 'when other headers and options were specified' do
+      let(:client) do
+        described_class.new(
+          api_key: 'elasticsearch_api_key',
+          transport_options: {
+            headers: { 'x-test-header' => 'test' },
+            ssl: { verify: false }
+          }
+        )
+      end
+
+      it 'Adds the ApiKey header to the connection and keeps the header' do
+        header = client.transport.connections.first.connection.headers
+        expect(header['X-Test-Header']).to eq('test')
+        expect(header['Authorization']).to eq('ApiKey elasticsearch_api_key')
+        expect(client.transport.options[:transport_options]).to include({ ssl: { verify: false } })
+        expect(client.transport.options[:transport_options][:headers]).to include('Authorization' => 'ApiKey elasticsearch_api_key')
+      end
+    end
+
     context 'Metaheader' do
       let(:adapter_code) { "nh=#{defined?(Net::HTTP::VERSION) ? Net::HTTP::VERSION : Net::HTTP::HTTPVersion}" }
       let(:meta_header) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 8.4.0
+  version: 8.5.1
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elastic-transport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.4.0
+        version: 8.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.4.0
+        version: 8.5.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement