fix: the elasticsearch.bulk :body_stats msg was moved outside of body

marcosgz · Nov 27, 2023 · 23c5a1c · 23c5a1c
1 parent df13590
commit 23c5a1c
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 15 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    esse (0.2.5)
+    esse (0.2.6)
       multi_json
       thor (>= 0.19)
 

diff --git a/esse.gemspec b/esse.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors = ['Marcos G. Zimmermann']
   spec.email = ['[email protected]']
 
-  spec.summary = %[Pure Ruby and framework-agnostic ElasticSearch/OpenSearch toolkit for building indexers and searchers]
+  spec.summary = %(Pure Ruby and framework-agnostic ElasticSearch/OpenSearch toolkit for building indexers and searchers)
   spec.description = 'With all elegance of Ruby and ElasticSearch flexibility this gem brings to you the best of both ' \
                      'worlds. Provides a solid architecture allowing to easily Extract, Transform, Enrich and Load ' \
                      'data from any data source into ElasticSearch/OpenSearch and also to search it. It is framework-agnostic, ' \

diff --git a/gemfiles/Gemfile.elasticsearch-1.x.lock b/gemfiles/Gemfile.elasticsearch-1.x.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse (0.2.5)
+    esse (0.2.6)
       multi_json
       thor (>= 0.19)
 

diff --git a/gemfiles/Gemfile.elasticsearch-2.x.lock b/gemfiles/Gemfile.elasticsearch-2.x.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse (0.2.5)
+    esse (0.2.6)
       multi_json
       thor (>= 0.19)
 

diff --git a/gemfiles/Gemfile.elasticsearch-5.x.lock b/gemfiles/Gemfile.elasticsearch-5.x.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse (0.2.5)
+    esse (0.2.6)
       multi_json
       thor (>= 0.19)
 

diff --git a/gemfiles/Gemfile.elasticsearch-6.x.lock b/gemfiles/Gemfile.elasticsearch-6.x.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse (0.2.5)
+    esse (0.2.6)
       multi_json
       thor (>= 0.19)
 

diff --git a/gemfiles/Gemfile.elasticsearch-7.x.lock b/gemfiles/Gemfile.elasticsearch-7.x.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse (0.2.5)
+    esse (0.2.6)
       multi_json
       thor (>= 0.19)
 

diff --git a/gemfiles/Gemfile.elasticsearch-8.x.lock b/gemfiles/Gemfile.elasticsearch-8.x.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse (0.2.5)
+    esse (0.2.6)
       multi_json
       thor (>= 0.19)
 

diff --git a/gemfiles/Gemfile.opensearch-1.x.lock b/gemfiles/Gemfile.opensearch-1.x.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse (0.2.5)
+    esse (0.2.6)
       multi_json
       thor (>= 0.19)
 

diff --git a/gemfiles/Gemfile.opensearch-2.x.lock b/gemfiles/Gemfile.opensearch-2.x.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse (0.2.5)
+    esse (0.2.6)
       multi_json
       thor (>= 0.19)
 

diff --git a/lib/esse/cli/event_listener.rb b/lib/esse/cli/event_listener.rb
@@ -90,7 +90,7 @@ def elasticsearch_bulk(event)
           type: (event[:request][:type] ? " for type #{colorize(event[:request][:type], :bold)}" : ''),
           wait_interval: (event[:wait_interval].nonzero? ? " (wait interval #{event[:wait_interval]}s)" : ''),
           newline: false,)
-        stats = event[:request][:body_stats].select { |_, v| v.nonzero? }.map do |type, count|
+        stats = event[:body_stats].select { |_, v| v.nonzero? }.map do |type, count|
           "#{colorize(type, :bold)}: #{count} docs"
         end
         print_message(stats.join(', ') + '.')

diff --git a/lib/esse/version.rb b/lib/esse/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Esse
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end
diff --git a/spec/esse/cli/event_listener_spec.rb b/spec/esse/cli/event_listener_spec.rb
@@ -109,9 +109,9 @@
       {
         runtime: 1.32,
         wait_interval: wait_interval,
+        body_stats: body_stats,
         request: {
           index: 'index_name',
-          body_stats: body_stats
         }
       }
     end
@@ -144,10 +144,10 @@
         {
           runtime: 1.32,
           wait_interval: 0.0,
+          body_stats: {},
           request: {
             index: 'index_name',
             type: 'document_type',
-            body_stats: [],
           }
         }
       end

diff --git a/spec/esse/integrations/elasticsearch-7/index/search_spec.rb b/spec/esse/integrations/elasticsearch-7/index/search_spec.rb
@@ -6,7 +6,6 @@
     reset_config!
     stub_index(:geos) do
       repository :country do
-
       end
     end
   end
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
         reset_config!
         stub_index(:geos) do
           repository :country do
           end
         end
       end
@@ Expand Down @@