logstash-core 6.0.0.alpha1-java → 6.0.0.alpha2-java

data/spec/{api/lib/commands/stats.rb → logstash/api/commands/stats_spec.rb}

@@ -1,10 +1,15 @@
 # encoding: utf-8
-require_relative "../../spec_helper"
+require "spec_helper"
 
 describe LogStash::Api::Commands::Stats do
+  include_context "api setup"
 
   let(:report_method) { :run }
-  subject(:report) { report_class.new.send(report_method) }
+  subject(:report) do
+    factory = ::LogStash::Api::CommandFactory.new(LogStash::Api::Service.new(@agent))
+   
+    factory.build(:stats).send(report_method)
+  end
 
   let(:report_class) { described_class }
 

data/spec/{api/lib → logstash/api}/errors_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require_relative "../spec_helper"
+require "spec_helper"
 require "logstash/api/errors"
 
 describe LogStash::Api::ApiError do

data/spec/{api/lib/api → logstash/api/modules}/logging_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require_relative "../../spec_helper"
+require "spec_helper"
 require "sinatra"
 require "logstash/api/modules/logging"
 require "logstash/json"
@@ -10,15 +10,6 @@ describe LogStash::Api::Modules::Logging do
   describe "#logging" do
 
     context "when setting a logger's log level" do
-      before(:all) do
-        @runner = LogStashRunner.new
-        @runner.start
-      end
-
-      after(:all) do
-        @runner.stop
-      end
-
       it "should return a positive acknowledgement on success" do
         put '/', '{"logger.logstash": "ERROR"}'
         payload = LogStash::Json.load(last_response.body)

data/spec/{api/lib/api → logstash/api/modules}/node_plugins_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
-require_relative "../../../support/shared_examples"
-require_relative "../../spec_helper"
+require "spec_helper"
 require "sinatra"
 require "logstash/api/modules/plugins"
 require "logstash/json"

data/spec/{api/lib/api → logstash/api/modules}/node_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
-require_relative "../../spec_helper"
-require_relative "../../../support/shared_examples"
+require "spec_helper"
 require "sinatra"
 require "logstash/api/modules/node"
 require "logstash/json"
@@ -110,12 +109,14 @@ describe LogStash::Api::Modules::Node do
       extend ResourceDSLMethods
 
       root_structure = {
-        "pipeline" => {
-          "workers" => Numeric,
-          "batch_size" => Numeric,
-          "batch_delay" => Numeric,
-          "config_reload_automatic" => Boolean,
-          "config_reload_interval" => Numeric
+        "pipelines" => {
+          "main" => {
+            "workers" => Numeric,
+            "batch_size" => Numeric,
+            "batch_delay" => Numeric,
+            "config_reload_automatic" => Boolean,
+            "config_reload_interval" => Numeric
+          }
         },
         "os" => {
           "name" => String,

data/spec/{api/lib/api → logstash/api/modules}/node_stats_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-require_relative "../../spec_helper"
-require_relative "../../../support/shared_examples"
+require "spec_helper"
+
 require "sinatra"
 require "logstash/api/modules/node_stats"
 require "logstash/json"
@@ -73,13 +73,15 @@ describe LogStash::Api::Modules::NodeStats do
         "load_average" => { "1m" => Numeric }
       }
     },
-   "pipeline" => {
-     "events" => {
-        "duration_in_millis" => Numeric,
-        "in" => Numeric,
-        "filtered" => Numeric,
-        "out" => Numeric,
-        "queue_push_duration_in_millis" => Numeric
+   "pipelines" => {
+     "main" => {
+       "events" => {
+         "duration_in_millis" => Numeric,
+         "in" => Numeric,
+         "filtered" => Numeric,
+         "out" => Numeric,
+         "queue_push_duration_in_millis" => Numeric
+       }
      }
    },
    "reloads" => {

data/spec/{api/lib/api → logstash/api/modules}/plugins_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
-require_relative "../../spec_helper"
-require_relative "../../../support/shared_examples"
+require "spec_helper"
 require "sinatra"
 require "logstash/api/modules/plugins"
 require "logstash/json"
@@ -40,7 +39,9 @@ describe LogStash::Api::Modules::Plugins do
 
     it "return a list of available plugins" do
       payload["plugins"].each do |plugin|
-        expect(plugin).to be_available?
+        expect do 
+          Gem::Specification.find_by_name(plugin["name"])
+        end.not_to raise_error
       end
     end
 

data/spec/{api/lib/api → logstash/api/modules}/root_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-require_relative "../../spec_helper"
-require_relative "../../../support/shared_examples"
+require "spec_helper"
+
 require "sinatra"
 require "logstash/api/modules/root"
 require "logstash/json"

data/spec/logstash/compiler/compiler_spec.rb

@@ -8,15 +8,65 @@ describe LogStash::Compiler do
     Java::OrgLogstashConfigIr::DSL
   end
 
+  let(:source_protocol) { "test_proto" }
+
   # Static import of these useful enums
   INPUT = Java::OrgLogstashConfigIr::PluginDefinition::Type::INPUT
   FILTER = Java::OrgLogstashConfigIr::PluginDefinition::Type::FILTER
   OUTPUT = Java::OrgLogstashConfigIr::PluginDefinition::Type::OUTPUT
   CODEC = Java::OrgLogstashConfigIr::PluginDefinition::Type::OUTPUT
 
+  shared_examples_for("component source_with_metadata") do
+    it "should set the correct protocol" do
+      expect(component.source_with_metadata.protocol).to eq(source_protocol)
+    end
+
+    it "should set the id to the source id" do
+      expect(component.source_with_metadata.id).to eq(source_id)
+    end
+  end
+
   describe "compiling to Pipeline" do
-    subject(:source_file) { "fake_sourcefile" }
-    subject(:compiled) { described_class.compile_pipeline(source, source_file) }
+    subject(:source_id) { "fake_sourcefile" }
+    let(:source_with_metadata) { org.logstash.common.SourceWithMetadata.new(source_protocol, source_id, source) }
+    subject(:compiled) { described_class.compile_pipeline(source_with_metadata) }
+
+    describe "compiling multiple sources" do
+      let(:sources) do
+        [ 
+          "input { input_0 {} } filter { filter_0 {} } output { output_0 {} }",
+          "input { input_1 {} } filter { filter_1 {} } output { output_1 {} }"
+        ]
+      end
+      let(:sources_with_metadata) do
+        sources.map.with_index do |source, idx|
+          org.logstash.common.SourceWithMetadata.new("#{source_protocol}_#{idx}", "#{source_id}_#{idx}", source)
+        end
+      end
+
+      subject(:pipeline) { described_class.compile_sources(*sources_with_metadata) }
+
+      it "should compile cleanly" do
+        expect(pipeline).to be_a(org.logstash.config.ir.PipelineIR)
+      end
+
+      it "should provide the original source" do
+        expect(pipeline.original_source).to eq(sources.join("\n"))
+      end
+
+      describe "applying protocol and id metadata" do
+        it "should apply the correct source metadata to all components" do
+          pipeline.plugin_vertices.each do |pv| 
+            name_idx = pv.plugin_definition.name.split("_").last
+            source_protocol_idx = pv.source_with_metadata.protocol.split("_").last
+            source_id_idx = pv.source_with_metadata.id.split("_").last
+
+            expect(name_idx).to eq(source_protocol_idx)
+            expect(name_idx).to eq(source_id_idx)
+          end
+        end
+      end
+    end
 
     describe "complex configs" do
       shared_examples_for "compilable LSCL files" do |path|
@@ -40,8 +90,9 @@ describe LogStash::Compiler do
   end
 
   describe "compiling imperative" do
-    let(:source_file) { "fake_sourcefile" }
-    subject(:compiled) { described_class.compile_imperative(source, source_file) }
+    let(:source_id) { "fake_sourcefile" }
+    let(:source_with_metadata) { org.logstash.common.SourceWithMetadata.new(source_protocol, source_id, source) }
+    subject(:compiled) { described_class.compile_imperative(source_with_metadata) }
 
     describe "an empty file" do
       let(:source) { "input {} output {}" }
@@ -63,7 +114,7 @@ describe LogStash::Compiler do
       let(:source) { "input { generator {} } output { }" }
 
       it "should attach correct source text for components" do
-        expect(compiled[:input].get_meta.getText).to eql("generator {}")
+        expect(compiled[:input].source_with_metadata.getText).to eql("generator {}")
       end
     end
 
@@ -106,6 +157,10 @@ describe LogStash::Compiler do
         it "should contain the single input" do
           expect(input).to ir_eql(j.iPlugin(INPUT, "generator"))
         end
+
+        it_should_behave_like("component source_with_metadata") do
+          let(:component) { input }
+        end
       end
 
       describe "two inputs" do
@@ -190,12 +245,12 @@ describe LogStash::Compiler do
         end
 
         it "should attach source_with_metadata with correct info to the statements" do
-          meta = compiled_section.statements.first.meta
+          meta = compiled_section.statements.first.source_with_metadata
           expect(meta.text).to eql("aplugin { count => 1 }")
           expect(meta.line).to eql(2)
           expect(meta.column).to eql(13)
-          expect(meta.id).to eql(source_file)
-          expect(compiled_section.statements.first.meta)
+          expect(meta.id).to eql(source_id)
+          expect(compiled_section.statements.first.source_with_metadata)
           expect(compiled_section)
         end
       end
@@ -559,9 +614,13 @@ describe LogStash::Compiler do
       describe "a single filter" do
         let(:source) { "input { } filter { grok {} } output { }" }
 
-        it "should contain the single input" do
+        it "should contain the single filter" do
           expect(filter).to ir_eql(j.iPlugin(FILTER, "grok"))
         end
+
+        it_should_behave_like("component source_with_metadata") do
+          let(:component) { filter }
+        end
       end
 
       it_should_behave_like "complex grammar", :filter
@@ -576,6 +635,10 @@ describe LogStash::Compiler do
         it "should contain the single input" do
           expect(output).to ir_eql(j.iPlugin(OUTPUT, "stdout"))
         end
+
+        it_should_behave_like("component source_with_metadata") do
+          let(:component) { output }
+        end
       end
 
       it_should_behave_like "complex grammar", :output

data/spec/logstash/config/source/local_spec.rb

@@ -292,8 +292,9 @@ describe LogStash::Config::Source::Local do
       )
     end
 
-    it "returns a merged config" do
-      expect(subject.pipeline_configs.first.config_string).to include(input_block, output_block, filter_block)
+    # this should be impossible as the bootstrap checks should catch this
+    it "raises an exception" do
+      expect { subject.pipeline_configs }.to raise_error
     end
   end
 
@@ -353,13 +354,28 @@ describe LogStash::Config::Source::Local do
         )
       end
 
-      it "returns a merged config" do
-        expect(subject.pipeline_configs.first.config_string).to include(input_block, filter_block)
+      it "raises an exception" do
+        expect { subject.pipeline_configs }.to raise_error
       end
     end
   end
 
   context "incomplete configuration" do
+    context "when using path.config" do
+      let(:config_string) { filter_block }
+      let(:config_path) do
+        file = Stud::Temporary.file
+        path = file.path
+        file.write(config_string)
+        path
+      end
+      let(:settings) { mock_settings( "path.config" => config_path) }
+
+      it "doesn't add anything" do
+        expect(subject.pipeline_configs.first.config_string).not_to include(LogStash::Config::Defaults.output, LogStash::Config::Defaults.input)
+      end
+    end
+
     context "when the input block is missing" do
       let(:settings) { mock_settings( "config.string" => "#{filter_block} #{output_block}") }
 

data/spec/logstash/config/source/multi_local_spec.rb

@@ -0,0 +1,113 @@
+# encoding: utf-8
+require "logstash/config/source/multi_local"
+require "rspec/expectations"
+require "stud/temporary"
+require "fileutils"
+require "pathname"
+require_relative "../../../support/helpers"
+require_relative "../../../support/matchers"
+require "spec_helper"
+require "webmock/rspec"
+
+describe LogStash::Config::Source::MultiLocal do
+  subject { described_class.new(settings) }
+  let(:settings) { mock_settings({}) }
+  let(:pipelines_yaml_location) { "" }
+
+  before(:each) do
+    allow(subject).to receive(:pipelines_yaml_location).and_return(pipelines_yaml_location)
+  end
+
+  describe "#match?" do
+    context "when `config.string` is set" do
+      let(:settings) do
+        mock_settings("config.string" => "")
+      end
+      it "returns false" do
+        expect(subject.match?).to be_falsey
+      end
+    end
+
+    context "when `config.path` are set`" do
+      let(:config_file) { temporary_file("") }
+
+      let(:settings) do
+        mock_settings("path.config" => config_file)
+      end
+
+      it "returns false" do
+        expect(subject.match?).to be_falsey
+      end
+    end
+
+    context "when both `config.string` and `path.config` are set" do
+      let(:settings) do
+        mock_settings("config.string" => "", "path.config" => temporary_file(""))
+      end
+      it "returns false" do
+        expect(subject.match?).to be_falsey
+      end
+    end
+
+    context "when neither `config.path` nor `path.config` are set`" do
+      it "returns true" do
+        expect(subject.match?).to be_truthy
+      end
+    end
+  end
+  describe "#detect_duplicate_pipelines" do
+    let(:retrieved_pipelines) { [{}] }
+    let(:retrieved_pipelines_configs) { retrieved_pipelines.map {|h| mock_settings(h) } }
+    context "when there are duplicate pipeline ids" do
+      let(:retrieved_pipelines) do
+        [
+          {"pipeline.id" => "main", "config.string" => ""},
+          {"pipeline.id" => "main", "config.string" => ""},
+        ]
+      end
+      it "should raise a ConfigurationError" do
+        expect { subject.detect_duplicate_pipelines(retrieved_pipelines_configs) }.to raise_error(::LogStash::ConfigurationError)
+      end
+    end
+    context "when there are no duplicate pipeline ids" do
+      let(:retrieved_pipelines) do
+        [
+          {"pipeline.id" => "main", "config.string" => ""},
+          {"pipeline.id" => "backup", "config.string" => ""},
+        ]
+      end
+      it "should not raise an error" do
+        expect { subject.detect_duplicate_pipelines(retrieved_pipelines_configs) }.to_not raise_error
+      end
+    end
+  end
+
+  describe "#pipeline_configs" do
+    let(:retrieved_pipelines) do
+      [
+        { "pipeline.id" => "main", "config.string" => "" },
+        { "pipeline.id" => "backup", "config.string" => "" }
+      ]
+    end
+    before(:each) do
+      allow(subject).to receive(:retrieve_yaml_pipelines).and_return(retrieved_pipelines)
+    end
+
+    it "should return instances of PipelineConfig" do
+      configs = subject.pipeline_configs
+      expect(configs).to be_a(Array)
+      expect(subject.pipeline_configs.first).to be_a(::LogStash::Config::PipelineConfig)
+      expect(subject.pipeline_configs.last).to be_a(::LogStash::Config::PipelineConfig)
+    end
+
+    context "using non pipeline related settings" do
+      let(:retrieved_pipelines) do [
+          { "pipeline.id" => "main", "config.string" => "", "http.port" => 22222 },
+        ]
+      end
+      it "should raise and error" do
+        expect { subject.pipeline_configs }.to raise_error(ArgumentError)
+      end
+    end
+  end
+end