logstash-core 6.6.0-java → 6.6.1-java

data/spec/logstash/util/safe_uri_spec.rb

@@ -32,5 +32,45 @@ module LogStash module Util
         end
       end
     end
+
+    describe "#initialize" do
+      context 'when host is required' do
+        MALFORMED_URIS = ['http:/user:pass@localhost:9600', 'http:/localhost', 'http:/localhost:9600', 'h;localhost', 'http:://localhost']
+
+        context 'malformed uris via string' do
+          MALFORMED_URIS.each do |arg|
+            it "#{arg}: should raise an error" do
+              expect{LogStash::Util::SafeURI.new(arg)}.to raise_error(ArgumentError)
+            end
+          end
+        end
+
+        context 'malformed uris via java.net.URI' do
+          MALFORMED_URIS.each do |arg|
+            it "#{arg}: should raise an error" do
+              java_uri = java.net.URI.new(arg)
+              expect{LogStash::Util::SafeURI.new(java_uri)}.to raise_error(ArgumentError)
+            end
+          end
+        end
+
+        context 'malformed uris via Ruby URI' do
+          MALFORMED_URIS.each do |arg|
+            it "#{arg}: should raise an error" do
+              ruby_uri = URI.parse(arg)
+              expect{LogStash::Util::SafeURI.new(ruby_uri)}.to raise_error(ArgumentError)
+            end
+          end
+        end
+
+        context 'uris with a valid host' do
+          ['http://user:pass@notlocalhost:9600', 'http://notlocalhost', 'https://notlocalhost:9600', '//notlocalhost', 'notlocalhost', 'notlocalhost:9200'].each do |arg|
+            it "#{arg}: should resolve host correctly" do
+              expect(LogStash::Util::SafeURI.new(arg).host).to eq('notlocalhost')
+            end
+          end
+        end
+      end
+    end
   end
 end end

data/spec/support/matchers.rb

@@ -51,44 +51,50 @@ end
 
 RSpec::Matchers.define :have_pipeline? do |pipeline_config|
   match do |agent|
-    pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
-    expect(pipeline).to_not be_nil
+    pipeline = nil
+    try(30) do
+      pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
+      expect(pipeline).to_not be_nil
+    end
     expect(pipeline.config_str).to eq(pipeline_config.config_string)
+    expect(agent.running_pipelines.keys.map(&:to_s)).to include(pipeline_config.pipeline_id.to_s)
   end
 
   match_when_negated do |agent|
-    pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
-    pipeline.nil? || pipeline.config_str != pipeline_config.config_string
+    pipeline = nil
+    try(30) do
+      pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
+      expect(pipeline).to_not be_nil
+    end
+    # either the pipeline_id is not in the running pipelines OR it is but have different configurations
+    expect(!agent.running_pipelines.keys.map(&:to_s).include?(pipeline_config.pipeline_id.to_s) ||  pipeline.config_str != pipeline_config.config_string).to be_truthy
   end
 end
 
 RSpec::Matchers.define :have_running_pipeline? do |pipeline_config|
   match do |agent|
-    Stud.try(10.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+    pipeline = nil
+    try(30) do
       pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
       expect(pipeline).to_not be_nil
-      expect(pipeline.config_str).to eq(pipeline_config.config_string)
-      expect(pipeline.running?).to be_truthy
     end
+    expect(pipeline.config_str).to eq(pipeline_config.config_string)
+    expect(pipeline.running?).to be_truthy
+    expect(agent.running_pipelines.keys.map(&:to_s)).to include(pipeline_config.pipeline_id.to_s)
   end
 
   failure_message do |agent|
     pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
 
     if pipeline.nil?
-      "Expected pipeline to exist and running, be we cannot find `#{pipeline_config.pipeline_id}` in the running pipelines `#{agent.pipelines.keys.join(",")}`"
-      else
-        if pipeline.running? == false
-          "Found `#{pipeline_config.pipeline_id}` in the list of pipelines but its not running"
-        elsif pipeline.config_str != pipeline_config.config_string
-          "Found `#{pipeline_config.pipeline_id}` in the list of pipelines and running, but the config_string doesn't match,
-Expected:
-#{pipeline_config.config_string}
-
-got:
-#{pipeline.config_str}"
-        end
+      "Expected pipeline to exist and running, be we cannot find '#{pipeline_config.pipeline_id.to_s}' in the running pipelines '#{agent.running_pipelines.keys.join(",")}'"
+    else
+      if !pipeline.running?
+        "Found '#{pipeline_config.pipeline_id.to_s}' in the list of pipelines but its not running"
+      elsif pipeline.config_str != pipeline_config.config_string
+        "Found '#{pipeline_config.pipeline_id.to_s}' in the list of pipelines and running, but the config_string doesn't match,\nExpected:\n#{pipeline_config.config_string}\n\ngot:\n#{pipeline.config_str}"
       end
+    end
   end
 
   match_when_negated do

data/spec/support/shared_contexts.rb

@@ -26,12 +26,12 @@ shared_context "api setup" do
     @agent.execute
     pipeline_config = mock_pipeline_config(:main, "input { generator { id => '123' } } output { null {} }")
     pipeline_creator =  LogStash::PipelineAction::Create.new(pipeline_config, @agent.metric)
-    @pipelines = java.util.concurrent.ConcurrentHashMap.new
-    expect(pipeline_creator.execute(@agent, @pipelines)).to be_truthy
+    @pipelines_registry = LogStash::PipelinesRegistry.new
+    expect(pipeline_creator.execute(@agent, @pipelines_registry)).to be_truthy
   end
 
   after :all do
-    @pipelines.each do |_, pipeline|
+    @pipelines_registry.running_pipelines.each do |_, pipeline|
       pipeline.shutdown
       pipeline.thread.join
     end

data/versions-gem-copy.yml

@@ -1,6 +1,6 @@
 ---
-logstash: 6.6.0
-logstash-core: 6.6.0
+logstash: 6.6.1
+logstash-core: 6.6.1
 logstash-core-plugin-api: 2.1.16
 
 # jruby must reference a *released* version of jruby which can be downloaded from the official download url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 6.6.0
+  version: 6.6.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -429,6 +429,7 @@ files:
 - lib/logstash/pipeline_action/stop.rb
 - lib/logstash/pipeline_reporter.rb
 - lib/logstash/pipeline_settings.rb
+- lib/logstash/pipelines_registry.rb
 - lib/logstash/plugin.rb
 - lib/logstash/plugins.rb
 - lib/logstash/plugins/builtin.rb
@@ -542,6 +543,7 @@ files:
 - spec/logstash/pipeline_pq_file_spec.rb
 - spec/logstash/pipeline_reporter_spec.rb
 - spec/logstash/pipeline_spec.rb
+- spec/logstash/pipelines_registry_spec.rb
 - spec/logstash/plugin_spec.rb
 - spec/logstash/plugins/builtin/pipeline_input_output_spec.rb
 - spec/logstash/plugins/hooks_registry_spec.rb
@@ -681,6 +683,7 @@ test_files:
 - spec/logstash/pipeline_pq_file_spec.rb
 - spec/logstash/pipeline_reporter_spec.rb
 - spec/logstash/pipeline_spec.rb
+- spec/logstash/pipelines_registry_spec.rb
 - spec/logstash/plugin_spec.rb
 - spec/logstash/plugins/builtin/pipeline_input_output_spec.rb
 - spec/logstash/plugins/hooks_registry_spec.rb