logstash-core 7.1.1-java → 7.2.0-java

data/spec/logstash/config/config_ast_spec.rb

@@ -143,6 +143,21 @@ describe LogStashConfigParser do
 
         expect(config).to be_nil
       end
+
+      it "supports octal literals" do
+        parser = LogStashConfigParser.new
+        config = parser.parse(%q(
+          input {
+            example {
+              foo => 010
+            }
+          }
+        ))
+
+        compiled_number = eval(config.recursive_select(LogStash::Config::AST::Number).first.compile)
+
+        expect(compiled_number).to be == 8
+      end
     end
 
     context "when config.support_escapes" do

data/spec/logstash/environment_spec.rb

@@ -57,14 +57,14 @@ describe LogStash::Environment do
     context "windows" do
       windows_host_os.each do |host|
         it "#{host} returns true" do
-          expect(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return(host)
+          allow(LogStash::Environment).to receive(:host_os).and_return(host)
           expect(LogStash::Environment.windows?).to be_truthy
         end
       end
 
       linux_host_os.each do |host|
         it "#{host} returns false" do
-          expect(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return(host)
+          allow(LogStash::Environment).to receive(:host_os).and_return(host)
           expect(LogStash::Environment.windows?).to be_falsey
         end
       end
@@ -73,14 +73,14 @@ describe LogStash::Environment do
     context "Linux" do
       windows_host_os.each do |host|
         it "#{host} returns true" do
-          expect(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return(host)
+          allow(LogStash::Environment).to receive(:host_os).and_return(host)
           expect(LogStash::Environment.linux?).to be_falsey
         end
       end
 
       linux_host_os.each do |host|
         it "#{host} returns false" do
-          expect(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return(host)
+          allow(LogStash::Environment).to receive(:host_os).and_return(host)
           expect(LogStash::Environment.linux?).to be_truthy
         end
       end

data/spec/logstash/plugin_spec.rb

@@ -267,6 +267,81 @@ describe LogStash::Plugin do
     end
   end
 
+  describe "#plugin_metadata" do
+    plugin_types = [
+        LogStash::Filters::Base,
+        LogStash::Codecs::Base,
+        LogStash::Outputs::Base,
+        LogStash::Inputs::Base
+    ]
+
+    before(:each) { LogStash::PluginMetadata::reset! }
+
+    plugin_types.each do |plugin_type|
+      let(:plugin) do
+        Class.new(plugin_type) do
+          config_name "simple_plugin"
+
+          config :host, :validate => :string
+          config :export, :validate => :boolean
+
+          def register; end
+        end
+      end
+
+      let(:config) do
+        {
+            "host" => "127.0.0.1",
+            "export" => true
+        }
+      end
+
+      subject(:plugin_instance) { plugin.new(config) }
+
+      context "plugin type is #{plugin_type}" do
+        {
+            'when there is not ID configured for the plugin' => {},
+            'when a user provide an ID for the plugin' => { 'id' => 'ABC' },
+        }.each do |desc, config_override|
+
+
+          context(desc) do
+            let(:config) { super.merge(config_override) }
+
+            it "has a PluginMetadata" do
+              expect(plugin_instance.plugin_metadata).to be_a_kind_of(LogStash::PluginMetadata)
+            end
+
+            it "PluginMetadata is defined" do
+              expect(defined?(plugin_instance.plugin_metadata)).to be_truthy
+            end
+
+            if config_override.include?('id')
+              it "will be shared between instance of plugins" do
+                expect(plugin_instance.plugin_metadata).to equal(plugin.new(config).plugin_metadata)
+              end
+            end
+
+            it 'stores metadata' do
+              new_value = 'foo'
+              old_value = plugin_instance.plugin_metadata.set(:foo, new_value)
+              expect(old_value).to be_nil
+              expect(plugin_instance.plugin_metadata.get(:foo)).to eq(new_value)
+            end
+
+            it 'removes metadata when the plugin is closed' do
+              new_value = 'foo'
+              plugin_instance.plugin_metadata.set(:foo, new_value)
+              expect(plugin_instance.plugin_metadata.get(:foo)).to eq(new_value)
+              plugin_instance.do_close
+              expect(plugin_instance.plugin_metadata.set?(:foo)).to be_falsey
+            end
+          end
+        end
+      end
+    end
+  end
+
   describe "#id" do
     let(:plugin) do
       Class.new(LogStash::Filters::Base,) do

data/spec/plugin_metadata_spec.rb

@@ -0,0 +1,151 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require 'logstash/plugin_metadata'
+require 'securerandom'
+
+describe LogStash::PluginMetadata do
+
+  let(:registry) { described_class }
+  before(:each) { registry.reset! }
+
+  let(:plugin_id) { SecureRandom.uuid }
+
+  describe 'registry' do
+    describe '#for_plugin' do
+      it 'returns the same instance when given the same id' do
+        expect(registry.for_plugin(plugin_id)).to be(registry.for_plugin(plugin_id))
+      end
+      it 'returns different instances when given different ids' do
+        expect(registry.for_plugin(plugin_id)).to_not equal(registry.for_plugin(plugin_id.next))
+      end
+    end
+    describe '#exists?' do
+      context 'when the plugin has not yet been registered' do
+        it 'returns false' do
+          expect(registry.exists?(plugin_id)).to be false
+        end
+      end
+      context 'when the plugin has already been registered' do
+        before(:each) { registry.for_plugin(plugin_id).set(:foo, 'bar') }
+        it 'returns true' do
+          expect(registry.exists?(plugin_id)).to be true
+        end
+      end
+    end
+    describe '#delete_for_plugin' do
+      before(:each) { registry.for_plugin(plugin_id).set(:foo, 'bar') }
+      it 'deletes the registry' do
+        expect(registry.exists?(plugin_id)).to be true
+        registry.delete_for_plugin(plugin_id)
+        expect(registry.exists?(plugin_id)).to be false
+      end
+      it 'deletes the data inside the registry' do
+        plugin_registry = registry.for_plugin(plugin_id)
+        registry.delete_for_plugin(plugin_id)
+        expect(plugin_registry.set?(:foo)).to be false
+      end
+    end
+
+  end
+
+  describe 'instance' do
+    let(:instance) { registry.for_plugin(plugin_id) }
+
+    describe '#set' do
+      context 'when the key is not set' do
+        it 'sets the new value' do
+          instance.set(:foo, 'bar')
+          expect(instance.get(:foo)).to eq('bar')
+        end
+        it 'returns the nil' do
+          expect(instance.set(:foo, 'bar')).to be_nil
+        end
+      end
+      context 'when the key is set' do
+        let (:val) { 'bananas'}
+        before(:each) { instance.set(:foo, val) }
+
+        it 'sets the new value' do
+          instance.set(:foo, 'bar')
+          expect(instance.get(:foo)).to eq('bar')
+        end
+        it 'returns the previous associated value' do
+          expect(instance.set(:foo, 'bar')).to eq(val)
+        end
+        context 'when the new value is nil' do
+          it 'unsets the value' do
+            instance.set(:foo, nil)
+            expect(instance.set?(:foo)).to be false
+          end
+        end
+      end
+    end
+
+    describe '#get' do
+      context 'when the key is set' do
+        before(:each) { instance.set(:foo, 'bananas') }
+        it 'returns the associated value' do
+          expect(instance.get(:foo)).to eq('bananas')
+        end
+      end
+      context 'when the key is not set' do
+        it 'returns nil' do
+          expect(instance.get(:foo)).to be_nil
+        end
+      end
+    end
+
+    describe '#set?' do
+      context 'when the key is set' do
+        before(:each) { instance.set(:foo, 'bananas')}
+        it 'returns true' do
+          expect(instance.set?(:foo)).to be true
+        end
+      end
+      context 'when the key is not set' do
+        it 'returns false' do
+          expect(instance.set?(:foo)).to be false
+        end
+      end
+    end
+
+    describe '#delete' do
+      context 'when the key is set' do
+        let (:val) { 'bananas' }
+        before(:each) { instance.set(:foo, val)}
+        it 'returns the value' do
+          expect(instance.delete(:foo)).to be val
+        end
+        it 'removes the key' do
+          instance.delete(:foo)
+          expect(instance.set?(:foo)).to be false
+        end
+      end
+      context 'when the key is not set' do
+        it 'returns nil' do
+          expect(instance.delete(:foo)).to be nil
+        end
+
+        it 'should not be set' do
+          instance.delete(:foo)
+          expect(instance.set?(:foo)).to be false
+        end
+      end
+    end
+
+    describe '#clear' do
+      context 'when the key is set' do
+        before(:each) do
+          instance.set(:foo, 'bananas')
+          instance.set(:bar, 'more bananas')
+        end
+        it 'removes all keys' do
+          instance.clear
+          expect(instance.set?(:foo)).to be false
+          expect(instance.set?(:bar)).to be false
+        end
+      end
+    end
+  end
+end

data/versions-gem-copy.yml

@@ -1,7 +1,7 @@
 ---
 # alpha and beta qualifiers are now added via VERSION_QUALIFIER environment var
-logstash: 7.1.1
-logstash-core: 7.1.1
+logstash: 7.2.0
+logstash-core: 7.2.0
 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: 7.1.1
+  version: 7.2.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -162,20 +162,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  name: faraday
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -302,6 +288,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  name: faraday
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: The core components of logstash, the scalable log and event management
   tool
 email:
@@ -337,6 +337,7 @@ files:
 - lib/logstash/bootstrap_check/persisted_queue_config.rb
 - lib/logstash/build.rb
 - lib/logstash/codecs/base.rb
+- lib/logstash/codecs/delegator.rb
 - lib/logstash/compiler.rb
 - lib/logstash/compiler/lscl.rb
 - lib/logstash/compiler/lscl/helpers.rb
@@ -347,6 +348,7 @@ files:
 - lib/logstash/config/defaults.rb
 - lib/logstash/config/file.rb
 - lib/logstash/config/grammar.rb
+- lib/logstash/config/lir_serializer.rb
 - lib/logstash/config/mixin.rb
 - lib/logstash/config/modules_common.rb
 - lib/logstash/config/pipeline_config.rb
@@ -428,6 +430,7 @@ files:
 - lib/logstash/pipeline_settings.rb
 - lib/logstash/pipelines_registry.rb
 - lib/logstash/plugin.rb
+- lib/logstash/plugin_metadata.rb
 - lib/logstash/plugins.rb
 - lib/logstash/plugins/builtin.rb
 - lib/logstash/plugins/builtin/pipeline/input.rb
@@ -486,6 +489,7 @@ files:
 - spec/logstash/api/rack_app_spec.rb
 - spec/logstash/bootstrap_check/persisted_queue_config_spec.rb
 - spec/logstash/codecs/base_spec.rb
+- spec/logstash/codecs/delegator_spec.rb
 - spec/logstash/compiler/compiler_spec.rb
 - spec/logstash/config/config_ast_spec.rb
 - spec/logstash/config/cpu_core_strategy_spec.rb
@@ -579,6 +583,7 @@ files:
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
 - spec/logstash/util_spec.rb
 - spec/logstash/webserver_spec.rb
+- spec/plugin_metadata_spec.rb
 - spec/static/i18n_spec.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb
@@ -628,6 +633,7 @@ test_files:
 - spec/logstash/api/rack_app_spec.rb
 - spec/logstash/bootstrap_check/persisted_queue_config_spec.rb
 - spec/logstash/codecs/base_spec.rb
+- spec/logstash/codecs/delegator_spec.rb
 - spec/logstash/compiler/compiler_spec.rb
 - spec/logstash/config/config_ast_spec.rb
 - spec/logstash/config/cpu_core_strategy_spec.rb
@@ -721,6 +727,7 @@ test_files:
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
 - spec/logstash/util_spec.rb
 - spec/logstash/webserver_spec.rb
+- spec/plugin_metadata_spec.rb
 - spec/static/i18n_spec.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb