logstash-output-elasticsearch 7.4.0-java → 7.4.1-java

data/spec/unit/outputs/elasticsearch/http_client/pool_spec.rb

@@ -21,6 +21,9 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
 
     allow(::Manticore::Client).to receive(:new).and_return(manticore_double)
 
+    allow(subject).to receive(:connected_es_versions).with(any_args).and_return(["0.0.0"])
+    allow(subject).to receive(:get_es_version).with(any_args).and_return("0.0.0")
+
     subject.start
   end
 

data/spec/unit/outputs/elasticsearch/http_client_spec.rb

@@ -132,7 +132,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
     }
 
     it "returns the hash response" do
-      expect(subject.pool).to receive(:get).with(path, nil).and_return([nil, get_response])
+      expect(subject.pool).to receive(:get).with(path, nil).and_return(get_response)
       expect(subject.get(path)["body"]).to eq(body)
     end
   end

data/spec/unit/outputs/elasticsearch/template_manager_spec.rb

@@ -6,32 +6,21 @@ require "json"
 describe LogStash::Outputs::ElasticSearch::TemplateManager do
 
   describe ".get_es_major_version" do
-    let(:es_1x_version) { '{ "number" : "1.7.0", "build_hash" : "929b9739cae115e73c346cb5f9a6f24ba735a743", "build_timestamp" : "2015-07-16T14:31:07Z", "build_snapshot" : false, "lucene_version" : "4.10.4" }' }
-    let(:es_2x_version) { '{ "number" : "2.3.4", "build_hash" : "e455fd0c13dceca8dbbdbb1665d068ae55dabe3f", "build_timestamp" : "2016-06-30T11:24:31Z", "build_snapshot" : false, "lucene_version" : "5.5.0" }' }
-    let(:es_5x_version) { '{ "number" : "5.0.0-alpha4", "build_hash" : "b0da471", "build_date" : "2016-06-22T12:33:48.164Z", "build_snapshot" : false, "lucene_version" : "6.1.0" }' }
     let(:client) { double("client") }
-    context "elasticsearch 1.x" do
-      before(:each) do
-        allow(client).to receive(:get_version).and_return(JSON.parse(es_1x_version))
-      end
-      it "detects major version is 1" do
-        expect(described_class.get_es_major_version(client)).to eq("1")
-      end
+
+    before(:each) do
+      allow(client).to receive(:connected_es_versions).and_return(["5.3.0"])
     end
-    context "elasticsearch 2.x" do
-      before(:each) do
-        allow(client).to receive(:get_version).and_return(JSON.parse(es_2x_version))
-      end
-      it "detects major version is 2" do
-        expect(described_class.get_es_major_version(client)).to eq("2")
-      end
+
+    it "picks the largest major version" do
+      expect(described_class.get_es_major_version(client)).to eq(5)
     end
-    context "elasticsearch 5.x" do
+    context "if there are nodes with multiple major versions" do
       before(:each) do
-        allow(client).to receive(:get_version).and_return(JSON.parse(es_5x_version))
+        allow(client).to receive(:connected_es_versions).and_return(["5.3.0", "6.0.0"])
       end
-      it "detects major version is 5" do
-        expect(described_class.get_es_major_version(client)).to eq("5")
+      it "picks the largest major version" do
+        expect(described_class.get_es_major_version(client)).to eq(6)
       end
     end
   end
@@ -39,19 +28,18 @@ describe LogStash::Outputs::ElasticSearch::TemplateManager do
   describe ".default_template_path" do
     context "elasticsearch 1.x" do
       it "chooses the 2x template" do
-        expect(described_class.default_template_path("1")).to match(/elasticsearch-template-es2x.json/)
+        expect(described_class.default_template_path(1)).to match(/elasticsearch-template-es2x.json/)
       end
     end
     context "elasticsearch 2.x" do
       it "chooses the 2x template" do
-        expect(described_class.default_template_path("2")).to match(/elasticsearch-template-es2x.json/)
+        expect(described_class.default_template_path(2)).to match(/elasticsearch-template-es2x.json/)
       end
     end
     context "elasticsearch 5.x" do
       it "chooses the 5x template" do
-        expect(described_class.default_template_path("5")).to match(/elasticsearch-template-es5x.json/)
+        expect(described_class.default_template_path(5)).to match(/elasticsearch-template-es5x.json/)
       end
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.4.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -196,9 +196,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This gem is a Logstash plugin required to be installed on top of the
-  Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This
-  gem is not a stand-alone program
+description: This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
@@ -282,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Logstash Output to Elasticsearch