logstash-core 6.8.6-java → 6.8.11-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9d7d36743dd7f39111f8a88f64f0696fc4fbb79411fb2bbc070e20bf7fef179
-  data.tar.gz: 9b6a1e235e2d5356990d5f4c4b609d4e87b913c53a139278127174befe85c69d
+  metadata.gz: 9f9e757fe4ffbc1fb7bb183bc3d12e4e2ec04e486dd1da1f85e0cf54f315f258
+  data.tar.gz: a826e2f7d1ddf9da267f07ec7b33daafaba0ec38341fcac77f2aa24d6b15296c
 SHA512:
-  metadata.gz: 725ab71aadf8ebb3ef481191340c19b40541c75e27dd88a52acf7cc493593000fdff86836a348451d2f0d8cb10b8ae28129821e161be3c8ef8e526d752520131
-  data.tar.gz: e682dff610e7be2ab9a148610f885c15b71365f415f5831b0832e2427fed6711d66b17f1a33368b9ff80b975b92a1155ae1e400c9d966b54b4548ea155efda92
+  metadata.gz: ecb204af58e61a75ad0dfe46bfab557635915758bd5bdab3a31c219cac3802ff83cb0ccb6031b256d900bcc45fd7d87743c2e919322312abbb07253e76288b0e
+  data.tar.gz: 5bd91c2e3319178fcb312ab8b2d96dee23484f0d80cd0e7f4fc70fbbaede4e658c899b8c703d3d3d81fb0cf0305bc7f5a068063129c1e5bd004b542791f51f89

data/lib/logstash/dependency_report.rb

@@ -32,8 +32,9 @@ class LogStash::DependencyReport < Clamp::Command
     command = ["./gradlew", "generateLicenseReport", "-PlicenseReportInputCSV=#{ruby_output_path}", "-PlicenseReportOutputCSV=#{output_path}"]
     puts "Executing #{command}"
     system(*command)
+
     if $?.exitstatus != 0
-      raise "Could not run gradle java deps! Exit status #{$?.exitstatus}"
+      raise "generateLicenseReport failed with exit status #{$?.exitstatus}"
     end
 
     nil

data/lib/logstash/util/lazy_singleton.rb

@@ -0,0 +1,33 @@
+require 'thread' # Mutex
+
+# A [LazySingleton] wraps the result of the provided block,
+# which is guaranteed to be called at-most-once, even if the
+# block's return value is nil.
+class ::LogStash::Util::LazySingleton
+
+  def initialize(&block)
+    @mutex = Mutex.new
+    @block = block
+    @instantiated = false
+  end
+
+  def instance
+    unless @instantiated
+      @mutex.synchronize do
+        unless @instantiated
+          @instance = @block.call
+          @instantiated = true
+        end
+      end
+    end
+
+    return @instance
+  end
+
+  def reset!
+    @mutex.synchronize do
+      @instantiated = false
+      @instance = nil
+    end
+  end
+end

data/lib/logstash/util/substitution_variables.rb

@@ -2,12 +2,17 @@
 
 java_import "org.logstash.secret.store.SecretStoreExt"
 
+require_relative 'lazy_singleton'
+
 module ::LogStash::Util::SubstitutionVariables
 
   include LogStash::Util::Loggable
 
   SUBSTITUTION_PLACEHOLDER_REGEX = /\${(?<name>[a-zA-Z_.][a-zA-Z0-9_.]*)(:(?<default>[^}]*))?}/
 
+  SECRET_STORE = ::LogStash::Util::LazySingleton.new { load_secret_store }
+  private_constant :SECRET_STORE
+
   # Recursive method to replace substitution variable references in parameters
   def deep_replace(value)
     if value.is_a?(Hash)
@@ -42,7 +47,7 @@ module ::LogStash::Util::SubstitutionVariables
       logger.debug("Replacing `#{placeholder}` with actual value")
 
       #check the secret store if it exists
-      secret_store = SecretStoreExt.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)
+      secret_store = SECRET_STORE.instance
       replacement = secret_store.nil? ? nil : secret_store.retrieveSecret(SecretStoreExt.getStoreId(name))
       #check the environment
       replacement = ENV.fetch(name, default) if replacement.nil?
@@ -54,4 +59,20 @@ module ::LogStash::Util::SubstitutionVariables
     end
   end # def replace_placeholders
 
+  class << self
+    private
+
+    # loads a secret_store from disk if available, or returns nil
+    #
+    # @api private
+    # @return [SecretStoreExt,nil]
+    def load_secret_store
+      SecretStoreExt.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)
+    end
+
+    # @api test
+    def reset_secret_store
+      SECRET_STORE.reset!
+    end
+  end
 end

data/spec/logstash/settings_spec.rb

@@ -158,6 +158,11 @@ describe LogStash::Settings do
 
     before :each do
       LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../src/test/resources/logstash.keystore.with.default.pass"))
+      LogStash::Util::SubstitutionVariables.send(:reset_secret_store)
+    end
+
+    after(:each) do
+      LogStash::Util::SubstitutionVariables.send(:reset_secret_store)
     end
 
     context "placeholders in flat logstash.yml" do
@@ -211,6 +216,7 @@ describe LogStash::Settings do
 
     before :each do
       LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../src/test/resources/logstash.keystore.with.default.pass"))
+      LogStash::Util::SubstitutionVariables.send(:reset_secret_store)
     end
 
     before do
@@ -225,6 +231,10 @@ describe LogStash::Settings do
       ENV.delete('a')
     end
 
+    after(:each) do
+      LogStash::Util::SubstitutionVariables.send(:reset_secret_store)
+    end
+
     subject do
       settings = described_class.new
       settings.register(LogStash::Setting::ArrayCoercible.new("host", String, []))

data/versions-gem-copy.yml

@@ -1,6 +1,6 @@
 ---
-logstash: 6.8.6
-logstash-core: 6.8.6
+logstash: 6.8.11
+logstash-core: 6.8.11
 logstash-core-plugin-api: 2.1.16
 
 # jruby must reference a *released* version of jruby which can be downloaded from the official download url
@@ -20,8 +20,8 @@ jruby:
 # Note: this file is copied to the root of logstash-core because its gemspec needs it when
 #       bundler evaluates the gemspec via bin/logstash
 # Ensure Jackson version here is kept in sync with version used by jrjackson gem
-jrjackson: 0.4.10
-jackson: 2.9.9
-jackson-databind: 2.9.9.3
+jrjackson: 0.4.11
+jackson: 2.9.10
+jackson-databind: 2.9.10.1
 
 # This is a copy the project level versions.yml into this gem's root and it is created when the gemspec is evaluated.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 6.8.6
+  version: 6.8.11
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: 0.4.11
   name: jrjackson
   type: :runtime
   prerelease: false
@@ -265,7 +265,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: 0.4.11
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -455,6 +455,7 @@ files:
 - lib/logstash/util/duration_formatter.rb
 - lib/logstash/util/filetools.rb
 - lib/logstash/util/java_version.rb
+- lib/logstash/util/lazy_singleton.rb
 - lib/logstash/util/loggable.rb
 - lib/logstash/util/manticore_ssl_config_helper.rb
 - lib/logstash/util/modules_setting_array.rb