elasticsearch 8.13.0 → 8.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81edddb9e4103d40bc3b06bb4fd1db49e8a62f17fab3fa914d737069d681d526
-  data.tar.gz: 29f8aa207a8e7e5a446a0fa0c6bc1bdb408f49020c53fbdaeba0066d4807306f
+  metadata.gz: e91dd04380e4aec75fe156542e45de7cae72e84fc62fb79fd31b3b1dac134be3
+  data.tar.gz: 01ff5e017053fcbb9177d6bac006857872e568a0bdf09b0d1e24a20b1731bc28
 SHA512:
-  metadata.gz: 00e2fd8d54aa598c24e5b3e8f1452b117f65c951e30988b1927e8e504eda77027557d5963bdbec22d3e747c53f32eec3aae8a44e7a6b4f37edb336d894c01ce1
-  data.tar.gz: aa738720a203ddf228ce4835e2aaa3ad5b1bf2ed7380d7ba6f451630b831219cd7dfd17b016489350d12a7e62f2bad456a3a82368fbb53fa27720f92f79f4945
+  metadata.gz: 353baeb8c69b35714acd44ca1d94c87ca4c0a895482a874061ea523b41ff27cfd46464e49a014b584ab1a68a3dd8a0d2176d69a883599679f17dc8a4fa1acf54
+  data.tar.gz: b8755ed3e109e62dc1611c64f80e3833d7fe7e8cf07623bd7b718d345546921eb67465eac4b537d07b3ae2ead4301ccd5b728cc323dd07c5a43ef3e0b80482eb

data/elasticsearch.gemspec

@@ -46,8 +46,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.5'
 
   s.add_dependency 'elastic-transport', '~> 8.3'
-  s.add_dependency 'elasticsearch-api', '8.13.0'
-  
+  s.add_dependency 'elasticsearch-api', '8.15.0'
+
   s.add_development_dependency 'base64'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'debug' unless defined?(JRUBY_VERSION)

data/lib/elasticsearch/helpers/bulk_helper.rb

@@ -48,7 +48,9 @@ module Elasticsearch
       def ingest(docs, params = {}, body = {}, &block)
         ingest_docs = docs.map { |doc| { index: { _index: @index, data: doc} } }
         if (slice = params.delete(:slice))
-          ingest_docs.each_slice(slice) { |items| ingest(items, params, &block) }
+          ingest_docs.each_slice(slice) do |items|
+            ingest(items.map { |item| item[:index][:data] }, params, &block)
+          end
         else
           bulk_request(ingest_docs, params, &block)
         end

data/lib/elasticsearch/helpers/esql_helper.rb

@@ -57,11 +57,12 @@ module Elasticsearch
       #
       def self.query(client, query, params = {}, parser: {})
         response = client.esql.query({ body: { query: query }, format: 'json' }.merge(params))
+
         columns = response['columns']
         response['values'].map do |value|
           (value.length - 1).downto(0).map do |index|
             key = columns[index]['name']
-            value[index] = parser[key].call value[index] if parser[key]
+            value[index] = parser[key].call(value[index]) if value[index] && parser[key]
             { key => value[index] }
           end.reduce({}, :merge)
         end

data/lib/elasticsearch/version.rb

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

data/spec/integration/characters_escaping_spec.rb

@@ -14,10 +14,12 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
-raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
 
 require 'spec_helper'
+require 'uri'
+
+ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
+raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
 
 context 'Elasticsearch client' do
   let(:client) do

data/spec/integration/client_integration_spec.rb

@@ -19,6 +19,7 @@ raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.
 
 require 'spec_helper'
 require 'logger'
+require 'uri'
 
 context 'Elasticsearch client' do
   let(:logger) { Logger.new($stderr) }

data/spec/integration/helpers/bulk_helper_spec.rb

@@ -21,6 +21,7 @@ require 'tempfile'
 context 'Elasticsearch client helpers' do
   context 'Bulk helper' do
     let(:index) { 'bulk_animals' }
+    let(:index_slice) { 'bulk_animals_slice' }
     let(:params) { { refresh: 'wait_for' } }
     let(:bulk_helper) { Elasticsearch::Helpers::BulkHelper.new(client, index, params) }
     let(:docs) do
@@ -40,6 +41,7 @@ context 'Elasticsearch client helpers' do
 
     after do
       client.indices.delete(index: index, ignore: 404)
+      client.indices.delete(index: index_slice, ignore: 404)
     end
 
     it 'Ingests documents' do
@@ -76,10 +78,13 @@ context 'Elasticsearch client helpers' do
 
     it 'Ingests documents and yields response and docs' do
       slice = 2
+      bulk_helper = Elasticsearch::Helpers::BulkHelper.new(client, index_slice, params)
       response = bulk_helper.ingest(docs, {slice: slice}) do |response, docs|
         expect(response).to be_an_instance_of Elasticsearch::API::Response
         expect(docs.count).to eq slice
       end
+      response = client.search(index: index_slice, size: 200)
+      expect(response['hits']['hits'].map { |a| a['_source'].transform_keys(&:to_sym) }).to eq docs
     end
 
     context 'JSON File helper' do

data/spec/integration/helpers/esql_helper_spec.rb

@@ -16,6 +16,7 @@
 # under the License.
 require_relative 'helpers_spec_helper'
 require 'elasticsearch/helpers/esql_helper'
+require 'ipaddr'
 
 context 'Elasticsearch client helpers' do
   let(:index) { 'esql_helper_test' }
@@ -76,8 +77,6 @@ context 'Elasticsearch client helpers' do
   end
 
   it 'parses iterated objects when procs are passed in' do
-    require 'ipaddr'
-
     parser = {
       '@timestamp' => Proc.new { |t| DateTime.parse(t) },
       'client.ip' => Proc.new { |i| IPAddr.new(i) },
@@ -91,4 +90,29 @@ context 'Elasticsearch client helpers' do
       expect(r['event.duration']).to be_a String
     end
   end
+
+  it 'parser does not error when value is nil, leaves nil' do
+    client.index(
+      index: index,
+      body: {
+        '@timestamp' => nil,
+        'client.ip' => nil,
+        message: 'Connected to 10.1.0.1',
+        'event.duration' => 1756465
+      },
+      refresh: true
+    )
+    parser = {
+      '@timestamp' => Proc.new { |t| DateTime.parse(t) },
+      'client.ip' => Proc.new { |i| IPAddr.new(i) },
+      'event.duration' => Proc.new { |d| d.to_s }
+    }
+    response = esql_helper.query(client, query, parser: parser)
+    response.each do |r|
+      expect [DateTime, NilClass].include?(r['@timestamp'].class)
+      expect [IPAddr, NilClass].include?(r['client.ip'].class)
+      expect(r['message']).to be_a String
+      expect(r['event.duration']).to be_a String
+    end
+  end
 end

data/spec/integration/opentelemetry_spec.rb

@@ -36,12 +36,12 @@ if ENV['TEST_WITH_OTEL'] == 'true'
     end
 
     after do
-     client.delete(index: 'myindex', id: 1); rescue
+      client.delete(index: 'myindex', id: 1); rescue
     end
 
     context 'when a request is instrumented' do
       it 'sets the span name to the endpoint id' do
-        client.search(body: { query: { match: {a: 1} } })
+        client.search(body: { query: { match: { a: 1 } } })
         expect(span.name).to eq 'search'
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 8.13.0
+  version: 8.15.0
 platform: ruby
 authors:
 - Elastic Client Library Maintainers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-08-13 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.13.0
+        version: 8.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.13.0
+        version: 8.15.0
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Ruby integrations for Elasticsearch