logstash-output-elasticsearch 7.3.2-java → 7.3.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42a74efb39e22b7169dc0ff278c364b1b6b8f282
-  data.tar.gz: 703b6a84b574bd8db99dd8dabb1fa16c77b34eb3
+  metadata.gz: dc9b9269ae5cb7c813b4285f847b8ccd8f05ac36
+  data.tar.gz: 7d35c24ff12143617a196b8ac58533b792bfea84
 SHA512:
-  metadata.gz: f0bc0d68d637ee45d5b2a4243f03f72ce367dc34c81f4366b16c46ee9da3034d7d42799d90b518663ee894eb5bf59110a9530d8a35ab259bab047335ac3200f4
-  data.tar.gz: 5d6d9edc56c353d3ea1350a54ff1142d0af0242c587d54a6a26b646b9fd54bfef939f8925d346e0e25e0d78c0ab487df6419c899c6b7e2ed410e21233099c27e
+  metadata.gz: e47d9eb0b7b17c372374f0b326f3e22c5969c496364b0a735c7909a7afb4f085723bb356bbc5f5866b85992d3fe7c2f90dcb28082ba1414621a213dce87597c6
+  data.tar.gz: 154d3cee1472d12d47fe39b21eb17403618b19d2a5f515805b7625e3198879f06738fd751b449ebc4e3c3e0bf141d5069db867c3265226c4b1375b27042b554b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 7.3.3
+ - Fix JRuby 9k incompatibilities and use new URI class that is JRuby 9k compatible
+
 ## 7.3.2
  - Fix error where a 429 would cause this output to crash
  - Wait for all inflight requests to complete before stopping

data/Gemfile

@@ -2,9 +2,10 @@ source 'https://rubygems.org'
 
 gemspec
 
-logstash_path = "../../logstash"
+logstash_path = ENV["LOGSTASH_PATH"] || "../../logstash"
+use_logstash_source = ENV["LOGSTASH_SOURCE"] && ENV["LOGSTASH_SOURCE"].to_s == "1"
 
-if Dir.exist?(logstash_path) && ENV["LOGSTASH_SOURCE"] == 1
+if Dir.exist?(logstash_path) && use_logstash_source
   gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
   gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
 end

data/lib/logstash/outputs/elasticsearch/http_client/manticore_adapter.rb

@@ -84,19 +84,19 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
     end
 
     def format_url(url, path=nil)
-
-      request_uri = url.uri
+      request_uri = url.clone
 
       if path
         # Combine the paths using the minimal # of /s
         # First, we make sure the path is relative so URI.join does
         # the right thing
         relative_path = path && path.start_with?("/") ? path[1..-1] : path
-        # because URI.join obliterates the query parameter, we need to save it
-        # and restore it after this operation
-        query = request_uri.query
-        request_uri = URI.join(request_uri, relative_path)
-        request_uri.query = query if query
+
+        if !request_uri.path
+          request_uri.path = path
+        else
+          request_uri.path = "#{request_uri.path}/#{relative_path}"
+        end
       else
         request_uri = request_uri.clone
       end
@@ -106,8 +106,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       request_uri.user = nil
       request_uri.password = nil
 
-      # Wrap this with a safe URI defensively against careless handling later
-      ::LogStash::Util::SafeURI.new(request_uri)
+      request_uri
     end
 
     def close

data/logstash-output-elasticsearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '7.3.2'
+  s.version         = '7.3.3'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch"
   s.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"

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

@@ -19,15 +19,19 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::ManticoreAdapter do
   describe "auth" do
     let(:user) { "myuser" }
     let(:password) { "mypassword" }
-    let(:noauth_uri) { clone = uri.uri.clone;clone.user=nil; clone.password=nil; clone.to_s }
+    let(:noauth_uri) { clone = uri.clone; clone.user=nil; clone.password=nil; clone }
     let(:uri) { ::LogStash::Util::SafeURI.new("http://#{user}:#{password}@localhost:9200") }
     
     it "should convert the auth to params" do
       resp = double("response")
       allow(resp).to receive(:call)
       allow(resp).to receive(:code).and_return(200)
+      
+      expected_uri = noauth_uri.clone
+      expected_uri.path = "/"
+      
       expect(subject.manticore).to receive(:get).
-        with(noauth_uri, {
+        with(expected_uri.to_s, {
           :headers => {"Content-Type" => "application/json"},
           :auth => {
             :user => user,
@@ -46,7 +50,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::ManticoreAdapter do
     subject { described_class.new(double("logger"), {}) }
 
     it "should add the path argument to the uri's path" do
-      expect(subject.format_url(url, path).path).to eq("/path/_bulk")
+      expect(subject.format_url(url, path).path).to eq("/path//_bulk")
     end
 
     context "when uri contains query parameters" do
@@ -59,7 +63,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::ManticoreAdapter do
     end
 
     context "when uri contains credentials" do
-      let(:url) { ::LogStash::Util::SafeURI.new("http://user:pass@localhost:9200") }
+      let(:url) { ::LogStash::Util::SafeURI.new("http://myuser:mypass@localhost:9200") }
 
       it "should remove credentials after format" do
         expect(subject.format_url(url, path).user).to be_nil

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

@@ -32,7 +32,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
     
     shared_examples("proper host handling") do
       it "should properly transform a host:port string to a URL" do
-        expect(subject.host_to_url(hostname_port_uri)).to eq(http_hostname_port)
+        expect(subject.host_to_url(hostname_port_uri).to_s).to eq(http_hostname_port.to_s + "/")
       end
 
       it "should not raise an error with a / for a path" do
@@ -40,7 +40,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
       end
 
       it "should parse full URLs correctly" do
-        expect(subject.host_to_url(http_hostname_port)).to eq(http_hostname_port)
+        expect(subject.host_to_url(http_hostname_port).to_s).to eq(http_hostname_port.to_s + "/")
       end
 
       describe "ssl" do
@@ -70,7 +70,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
           let(:base_options) { super.merge(:hosts => [https_hostname_port]) }
           it "should handle an ssl url correctly when SSL is nil" do
             subject
-            expect(subject.host_to_url(https_hostname_port)).to eq(https_hostname_port)
+            expect(subject.host_to_url(https_hostname_port).to_s).to eq(https_hostname_port.to_s + "/")
           end
         end       
       end
@@ -99,7 +99,9 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
           
           
           it "should automatically insert a / in front of path overlays" do
-            expect(subject.host_to_url(url)).to eq(LogStash::Util::SafeURI.new(url + "/otherpath"))
+            expected = url.clone
+            expected.path = url.path + "/otherpath"
+            expect(subject.host_to_url(url)).to eq(expected)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 7.3.2
+  version: 7.3.3
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement