logstash-core 6.0.0.beta1-java → 6.0.0.beta2-java

data/spec/logstash/pipeline_spec.rb

@@ -41,6 +41,8 @@ class DummyCodec < LogStash::Codecs::Base
   config_name "dummycodec"
   milestone 2
 
+  config :format, :validate => :string
+
   def decode(data)
     data
   end
@@ -93,11 +95,21 @@ class DummyFlushingFilter < LogStash::Filters::Base
     true
   end
   def flush(options)
-    return [::LogStash::Event.new("message" => "dummy_flush")]
+    [::LogStash::Event.new("message" => "dummy_flush")]
   end
   def close() end
 end
 
+class DummyFlushingFilterPeriodic < DummyFlushingFilter
+  config_name "dummyflushingfilterperiodic"
+
+  def flush(options)
+    # Don't generate events on the shutdown flush to make sure we actually test the
+    # periodic flush.
+    options[:final] ? [] : [::LogStash::Event.new("message" => "dummy_flush")]
+  end
+end
+
 class TestPipeline < LogStash::Pipeline
   attr_reader :outputs, :settings
 end
@@ -108,7 +120,7 @@ describe LogStash::Pipeline do
   let(:override_thread_count)   { 42 }
   let(:dead_letter_queue_enabled) { false }
   let(:dead_letter_queue_path) { }
-  let(:pipeline_settings_obj) { LogStash::SETTINGS }
+  let(:pipeline_settings_obj) { LogStash::SETTINGS.clone }
   let(:pipeline_settings) { {} }
   let(:max_retry) {10} #times
   let(:timeout) {120} #seconds
@@ -124,10 +136,6 @@ describe LogStash::Pipeline do
     pipeline_settings.each {|k, v| pipeline_settings_obj.set(k, v) }
   end
 
-  after :each do
-    pipeline_settings_obj.reset
-  end
-
   describe "#ephemeral_id" do
     it "creates an ephemeral_id at creation time" do
       pipeline = mock_pipeline_from_string("input { generator { count =>  1 } } output { null {} }")
@@ -355,6 +363,30 @@ describe LogStash::Pipeline do
     end
   end
 
+  context "with no explicit ids declared" do
+    before(:each) do
+      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummyinput").and_return(DummyInput)
+      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(DummyCodec)
+      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummyfilter").and_return(DummyFilter)
+      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
+    end
+
+    let(:config) { "input { dummyinput { codec => plain { format => 'something'  } } } filter { dummyfilter {} } output { dummyoutput {} }"}
+    let(:pipeline) { mock_pipeline_from_string(config) }
+
+    after do
+      # If you don't start/stop the pipeline it won't release the queue lock and will
+      # cause the suite to fail :(
+      pipeline.close
+    end
+    
+    it "should use LIR provided IDs" do
+      expect(pipeline.inputs.first.id).to eq(pipeline.lir.input_plugin_vertices.first.id)
+      expect(pipeline.filters.first.id).to eq(pipeline.lir.filter_plugin_vertices.first.id)
+      expect(pipeline.outputs.first.id).to eq(pipeline.lir.output_plugin_vertices.first.id)
+    end
+  end
+
   context "compiled flush function" do
     describe "flusher thread" do
       before(:each) do
@@ -627,7 +659,7 @@ describe LogStash::Pipeline do
     before do
       allow(::LogStash::Outputs::DummyOutput).to receive(:new).with(any_args).and_return(output)
       allow(LogStash::Plugin).to receive(:lookup).with("input", "dummy_input").and_return(DummyInput)
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummy_flushing_filter").and_return(DummyFlushingFilter)
+      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummy_flushing_filter").and_return(DummyFlushingFilterPeriodic)
       allow(LogStash::Plugin).to receive(:lookup).with("output", "dummy_output").and_return(::LogStash::Outputs::DummyOutput)
       allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(LogStash::Codecs::Plain)
     end

data/spec/logstash/runner_spec.rb

@@ -294,6 +294,9 @@ describe LogStash::Runner do
     end
 
     describe "config.debug" do
+      after(:each) do
+        LogStash::SETTINGS.set("config.debug", false)
+      end
       it "should set 'config.debug' to false by default" do
         expect(LogStash::Agent).to receive(:new) do |settings|
           expect(settings.get("config.debug")).to eq(false)
@@ -340,7 +343,7 @@ describe LogStash::Runner do
     end
 
     describe "--modules" do
-      let(:args) { ["--modules", module_string] }
+      let(:args) { ["--modules", module_string, "--setup"] }
 
       context "with an available module specified but no connection to elasticsearch" do
         let(:module_string) { "tester" }

data/spec/logstash/settings/modules_spec.rb

@@ -0,0 +1,115 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/settings"
+require "logstash/util/cloud_setting_id"
+require "logstash/util/cloud_setting_auth"
+require "logstash/util/modules_setting_array"
+
+describe LogStash::Setting::Modules do
+  describe "Modules.Cli" do
+    subject { described_class.new("mycloudid", LogStash::Util::ModulesSettingArray, []) }
+    context "when given an array of hashes that contains a password key" do
+      it "should convert password Strings to Password" do
+        source = [{"var.kibana.password" => "some_secret"}]
+        setting = subject.set(source)
+        expect(setting).to be_a(Array)
+        expect(setting.__class__).to eq(LogStash::Util::ModulesSettingArray)
+        expect(setting.first.fetch("var.kibana.password")).to be_a(LogStash::Util::Password)
+      end
+    end
+  end
+
+  describe "Cloud.Id" do
+    subject { described_class.new("mycloudid", LogStash::Util::CloudSettingId) }
+    context "when given a string which is not a cloud id" do
+      it "should raise an exception" do
+        expect { subject.set("foobarbaz") }.to raise_error(ArgumentError, /Cloud Id does not decode/)
+      end
+    end
+
+    context "when given a string which is empty" do
+      it "should raise an exception" do
+        expect { subject.set("") }.to raise_error(ArgumentError, /Cloud Id does not decode/)
+      end
+    end
+
+    context "when given a string which is has environment prefix only" do
+      it "should raise an exception" do
+        expect { subject.set("testing:") }.to raise_error(ArgumentError, /Cloud Id does not decode/)
+      end
+    end
+
+    context "when given a badly formatted encoded id" do
+      it "should not raise an error" do
+        encoded = Base64.urlsafe_encode64("foo$$bal")
+        expect { subject.set(encoded) }.to raise_error(ArgumentError, /Cloud Id, after decoding, is invalid. Format: '<part1>\$<part2>\$<part3>'/)
+      end
+    end
+
+    context "when given a nil" do
+      it "should not raise an error" do
+        expect { subject.set(nil) }.to_not raise_error
+      end
+    end
+
+    context "when given a string which is an unlabelled cloud id" do
+      it "should set a LogStash::Util::CloudId instance" do
+        expect { subject.set("dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy") }.to_not raise_error
+        expect(subject.value.elasticsearch_host).to eq("notareal.us-east-1.aws.found.io:443")
+        expect(subject.value.kibana_host).to eq("identifier.us-east-1.aws.found.io:443")
+        expect(subject.value.label).to eq("")
+      end
+    end
+
+    context "when given a string which is a labelled cloud id" do
+      it "should set a LogStash::Util::CloudId instance" do
+        expect { subject.set("staging:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy") }.to_not raise_error
+        expect(subject.value.elasticsearch_host).to eq("notareal.us-east-1.aws.found.io:443")
+        expect(subject.value.kibana_host).to eq("identifier.us-east-1.aws.found.io:443")
+        expect(subject.value.label).to eq("staging")
+      end
+    end
+  end
+
+  describe "Cloud.Auth" do
+    subject { described_class.new("mycloudauth", LogStash::Util::CloudSettingAuth) }
+    context "when given a string without a separator or a password" do
+      it "should raise an exception" do
+        expect { subject.set("foobarbaz") }.to raise_error(ArgumentError, /Cloud Auth username and password format should be/)
+      end
+    end
+
+    context "when given a string without a password" do
+      it "should raise an exception" do
+        expect { subject.set("foo:") }.to raise_error(ArgumentError, /Cloud Auth username and password format should be/)
+      end
+    end
+
+    context "when given a string without a username" do
+      it "should raise an exception" do
+        expect { subject.set(":bar") }.to raise_error(ArgumentError, /Cloud Auth username and password format should be/)
+      end
+    end
+
+    context "when given a string which is empty" do
+      it "should raise an exception" do
+        expect { subject.set("") }.to raise_error(ArgumentError, /Cloud Auth username and password format should be/)
+      end
+    end
+
+    context "when given a nil" do
+      it "should not raise an error" do
+        expect { subject.set(nil) }.to_not raise_error
+      end
+    end
+
+    context "when given a string which is a cloud auth" do
+      it "should set the string" do
+        expect { subject.set("frodo:baggins") }.to_not raise_error
+        expect(subject.value.username).to eq("frodo")
+        expect(subject.value.password.value).to eq("baggins")
+        expect(subject.value.to_s).to eq("frodo:<password>")
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta1
+  version: 6.0.0.beta2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -369,6 +369,7 @@ files:
 - lib/logstash/codecs/base.rb
 - lib/logstash/compiler.rb
 - lib/logstash/compiler/lscl.rb
+- lib/logstash/compiler/lscl/helpers.rb
 - lib/logstash/compiler/lscl/lscl_grammar.rb
 - lib/logstash/compiler/treetop_monkeypatches.rb
 - lib/logstash/config/config_ast.rb
@@ -476,6 +477,8 @@ files:
 - lib/logstash/util/buftok.rb
 - lib/logstash/util/byte_value.rb
 - lib/logstash/util/charset.rb
+- lib/logstash/util/cloud_setting_auth.rb
+- lib/logstash/util/cloud_setting_id.rb
 - lib/logstash/util/dead_letter_queue_manager.rb
 - lib/logstash/util/decorators.rb
 - lib/logstash/util/duration_formatter.rb
@@ -483,6 +486,7 @@ files:
 - lib/logstash/util/filetools.rb
 - lib/logstash/util/java_version.rb
 - lib/logstash/util/loggable.rb
+- lib/logstash/util/modules_setting_array.rb
 - lib/logstash/util/password.rb
 - lib/logstash/util/plugin_version.rb
 - lib/logstash/util/prctl.rb
@@ -554,6 +558,7 @@ files:
 - spec/logstash/modules/cli_parser_spec.rb
 - spec/logstash/modules/logstash_config_spec.rb
 - spec/logstash/modules/scaffold_spec.rb
+- spec/logstash/modules/settings_merger_spec.rb
 - spec/logstash/output_delegator_spec.rb
 - spec/logstash/outputs/base_spec.rb
 - spec/logstash/patches_spec.rb
@@ -573,6 +578,7 @@ files:
 - spec/logstash/settings/array_coercible_spec.rb
 - spec/logstash/settings/bytes_spec.rb
 - spec/logstash/settings/integer_spec.rb
+- spec/logstash/settings/modules_spec.rb
 - spec/logstash/settings/numeric_spec.rb
 - spec/logstash/settings/port_range_spec.rb
 - spec/logstash/settings/splittable_string_array_spec.rb
@@ -691,6 +697,7 @@ test_files:
 - spec/logstash/modules/cli_parser_spec.rb
 - spec/logstash/modules/logstash_config_spec.rb
 - spec/logstash/modules/scaffold_spec.rb
+- spec/logstash/modules/settings_merger_spec.rb
 - spec/logstash/output_delegator_spec.rb
 - spec/logstash/outputs/base_spec.rb
 - spec/logstash/patches_spec.rb
@@ -710,6 +717,7 @@ test_files:
 - spec/logstash/settings/array_coercible_spec.rb
 - spec/logstash/settings/bytes_spec.rb
 - spec/logstash/settings/integer_spec.rb
+- spec/logstash/settings/modules_spec.rb
 - spec/logstash/settings/numeric_spec.rb
 - spec/logstash/settings/port_range_spec.rb
 - spec/logstash/settings/splittable_string_array_spec.rb