logstash-core 6.3.2-java → 6.4.0-java

data/spec/logstash/util/cloud_setting_id_spec.rb

@@ -25,7 +25,7 @@ describe LogStash::Util::CloudSettingId do
       let(:raw) {%w(first second)}
       let(:input) { described_class.cloud_id_encode(*raw) }
       it "raises an error" do
-        expect{subject}.to raise_exception(ArgumentError, "Cloud Id does not decode. You may need to enable Kibana in the Cloud UI. Received: \"#{raw[0]}$#{raw[1]}\".")
+        expect{subject}.to raise_exception(ArgumentError, "Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"#{raw[0]}$#{raw[1]}\".")
       end
     end
 
@@ -90,4 +90,57 @@ describe LogStash::Util::CloudSettingId do
       expect(subject.to_s).to eq(subject.decoded)
     end
   end
-end
+  context "when cloud id contains port descriptions for ES and Kibana" do
+    let(:input) { "different-es-kb-port:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlvJGFjMzFlYmI5MDI0MTc3MzE1NzA0M2MzNGZkMjZmZDQ2OjkyNDMkYTRjMDYyMzBlNDhjOGZjZTdiZTg4YTA3NGEzYmIzZTA6OTI0NA==" }
+
+    it "decodes the elasticsearch port corretly" do
+      expect(subject.elasticsearch_host).to eq("ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243")
+    end
+    it "decodes the kibana port corretly" do
+      expect(subject.kibana_host).to eq("a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9244")
+    end
+  end
+  context "when cloud id contains cloud port" do
+    let(:input) { "custom-port:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlvOjkyNDMkYWMzMWViYjkwMjQxNzczMTU3MDQzYzM0ZmQyNmZkNDYkYTRjMDYyMzBlNDhjOGZjZTdiZTg4YTA3NGEzYmIzZTA=" }
+
+    it "decodes the elasticsearch port corretly" do
+      expect(subject.elasticsearch_host).to eq("ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243")
+    end
+    it "decodes the kibana port corretly" do
+      expect(subject.kibana_host).to eq("a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9243")
+    end
+  end
+  context "when cloud id only defines kibana port" do
+    let(:input) { "only-kb-set:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlvJGFjMzFlYmI5MDI0MTc3MzE1NzA0M2MzNGZkMjZmZDQ2JGE0YzA2MjMwZTQ4YzhmY2U3YmU4OGEwNzRhM2JiM2UwOjkyNDQ=" }
+
+    it "defaults the elasticsearch port to 443" do
+      expect(subject.elasticsearch_host).to eq("ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:443")
+    end
+    it "decodes the kibana port corretly" do
+      expect(subject.kibana_host).to eq("a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9244")
+    end
+  end
+  context "when cloud id defines cloud port and kibana port" do
+    let(:input) { "host-and-kb-set:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlvOjkyNDMkYWMzMWViYjkwMjQxNzczMTU3MDQzYzM0ZmQyNmZkNDYkYTRjMDYyMzBlNDhjOGZjZTdiZTg4YTA3NGEzYmIzZTA6OTI0NA==" }
+
+    it "sets the elasticsearch port to cloud port" do
+      expect(subject.elasticsearch_host).to eq("ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243")
+    end
+    it "overrides cloud port with the kibana port" do
+      expect(subject.kibana_host).to eq("a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9244")
+    end
+  end
+  context "when cloud id defines extra data" do
+    let(:input) { "extra-items:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlvJGFjMzFlYmI5MDI0MTc3MzE1NzA0M2MzNGZkMjZmZDQ2JGE0YzA2MjMwZTQ4YzhmY2U3YmU4OGEwNzRhM2JiM2UwJGFub3RoZXJpZCRhbmRhbm90aGVy" }
+
+    it "captures the elasticsearch host" do
+      expect(subject.elasticsearch_host).to eq("ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:443")
+    end
+    it "captures the kibana host" do
+      expect(subject.kibana_host).to eq("a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:443")
+    end
+    it "captures the remaining identifiers" do
+      expect(subject.other_identifiers).to eq(["anotherid", "andanother"])
+    end
+  end
+end

data/spec/logstash/util/secretstore_spec.rb

@@ -1,9 +1,10 @@
-require "logstash/util/secretstore"
 require "logstash/settings"
 
-describe LogStash::Util::SecretStore do
+java_import "org.logstash.secret.store.SecretStoreExt"
 
-  subject {LogStash::Util::SecretStore}
+describe SecretStoreExt do
+
+  subject {SecretStoreExt}
 
   describe "with missing keystore" do
     before :each do
@@ -11,8 +12,8 @@ describe LogStash::Util::SecretStore do
     end
 
     it "should be not exist" do
-      expect(subject.exists?).to be_falsy
-      expect(subject.get_if_exists).to be_nil
+      expect(subject.exists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)).to be_falsy
+      expect(subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)).to be_nil
     end
   end
 
@@ -22,7 +23,7 @@ describe LogStash::Util::SecretStore do
     end
 
     it "should be readable" do
-      expect(subject.get_if_exists.list).to include(subject.get_store_id("keystore.seed"))
+      expect(subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value).list).to include(subject.get_store_id("keystore.seed"))
     end
   end
 
@@ -41,7 +42,7 @@ describe LogStash::Util::SecretStore do
       end
 
       it "should be readable" do
-        expect(subject.get_if_exists.list).to include(subject.get_store_id("keystore.seed"))
+        expect(subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value).list).to include(subject.get_store_id("keystore.seed"))
       end
     end
 
@@ -55,15 +56,14 @@ describe LogStash::Util::SecretStore do
       end
 
       it "should be not readable" do
-        expect {subject.get_if_exists}.to raise_error.with_message(/Can not access Logstash keystore/)
+        expect {subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)}.to raise_error.with_message(/Can not access Logstash keystore/)
       end
     end
 
     describe "and missing password" do
       it "should be not readable" do
-        expect {subject.get_if_exists}.to raise_error.with_message(/Could not determine keystore password/)
+        expect {subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)}.to raise_error.with_message(/Could not determine keystore password/)
       end
     end
   end
-
 end

data/spec/logstash/util/wrapped_synchronous_queue_spec.rb

@@ -84,8 +84,8 @@ describe LogStash::WrappedSynchronousQueue do
 
       context "when writing to the queue" do
         before :each do
-          read_client.set_events_metric(LogStash::Instrument::NamespacedNullMetric.new([], :null))
-          read_client.set_pipeline_metric(LogStash::Instrument::NamespacedNullMetric.new([], :null))
+          read_client.set_events_metric(LogStash::Instrument::NamespacedNullMetric.new(nil, :null))
+          read_client.set_pipeline_metric(LogStash::Instrument::NamespacedNullMetric.new(nil, :null))
         end
 
         it "appends batches to the queue" do

data/versions-gem-copy.yml

@@ -1,6 +1,6 @@
 ---
-logstash: 6.3.2
-logstash-core: 6.3.2
+logstash: 6.4.0
+logstash-core: 6.4.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: 6.3.2
+  version: 6.4.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2018-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -331,8 +331,6 @@ files:
 - lib/logstash/api/modules/stats.rb
 - lib/logstash/api/rack_app.rb
 - lib/logstash/api/service.rb
-- lib/logstash/bootstrap_check/bad_java.rb
-- lib/logstash/bootstrap_check/bad_ruby.rb
 - lib/logstash/bootstrap_check/default_config.rb
 - lib/logstash/bootstrap_check/persisted_queue_config.rb
 - lib/logstash/build.rb
@@ -356,7 +354,6 @@ files:
 - lib/logstash/config/source/multi_local.rb
 - lib/logstash/config/source_loader.rb
 - lib/logstash/config/string_escape.rb
-- lib/logstash/converge_result.rb
 - lib/logstash/dependency_report.rb
 - lib/logstash/dependency_report_runner.rb
 - lib/logstash/elasticsearch_client.rb
@@ -370,7 +367,6 @@ files:
 - lib/logstash/inputs/base.rb
 - lib/logstash/inputs/threadable.rb
 - lib/logstash/instrument/collector.rb
-- lib/logstash/instrument/global_metrics.rb
 - lib/logstash/instrument/metric.rb
 - lib/logstash/instrument/metric_store.rb
 - lib/logstash/instrument/metric_type.rb
@@ -387,12 +383,9 @@ files:
 - lib/logstash/instrument/periodic_poller/os.rb
 - lib/logstash/instrument/periodic_poller/pq.rb
 - lib/logstash/instrument/periodic_pollers.rb
-- lib/logstash/instrument/snapshot.rb
-- lib/logstash/java_integration.rb
 - lib/logstash/java_pipeline.rb
 - lib/logstash/json.rb
 - lib/logstash/logging.rb
-- lib/logstash/logging/json.rb
 - lib/logstash/logging/logger.rb
 - lib/logstash/modules/cli_parser.rb
 - lib/logstash/modules/elasticsearch_config.rb
@@ -436,9 +429,7 @@ files:
 - lib/logstash/plugins/builtin/pipeline/input.rb
 - lib/logstash/plugins/builtin/pipeline/output.rb
 - lib/logstash/plugins/hooks_registry.rb
-- lib/logstash/plugins/plugin_factory.rb
 - lib/logstash/plugins/registry.rb
-- lib/logstash/queue_factory.rb
 - lib/logstash/runner.rb
 - lib/logstash/settings.rb
 - lib/logstash/shutdown_watcher.rb
@@ -461,7 +452,6 @@ files:
 - lib/logstash/util/password.rb
 - lib/logstash/util/plugin_version.rb
 - lib/logstash/util/prctl.rb
-- lib/logstash/util/retryable.rb
 - lib/logstash/util/safe_uri.rb
 - lib/logstash/util/secretstore.rb
 - lib/logstash/util/settings_helper.rb
@@ -536,7 +526,6 @@ files:
 - 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
 - spec/logstash/pipeline_action/create_spec.rb
@@ -566,7 +555,6 @@ files:
 - spec/logstash/settings_spec.rb
 - spec/logstash/shutdown_watcher_spec.rb
 - spec/logstash/state_resolver_spec.rb
-- spec/logstash/timestamp_spec.rb
 - spec/logstash/util/accessors_spec.rb
 - spec/logstash/util/buftok_spec.rb
 - spec/logstash/util/byte_value_spec.rb
@@ -677,7 +665,6 @@ test_files:
 - 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
 - spec/logstash/pipeline_action/create_spec.rb
@@ -707,7 +694,6 @@ test_files:
 - spec/logstash/settings_spec.rb
 - spec/logstash/shutdown_watcher_spec.rb
 - spec/logstash/state_resolver_spec.rb
-- spec/logstash/timestamp_spec.rb
 - spec/logstash/util/accessors_spec.rb
 - spec/logstash/util/buftok_spec.rb
 - spec/logstash/util/byte_value_spec.rb

data/lib/logstash/bootstrap_check/bad_java.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-require "logstash/util"
-require "logstash/util/java_version"
-require "logstash/errors"
-
-module LogStash module BootstrapCheck
-  class BadJava
-    def self.check(settings)
-      # Exit on bad java versions
-      LogStash::Util::JavaVersion.validate_java_version!
-    rescue => e
-      # Just rewrap the original exception
-      raise LogStash::BootstrapCheckError, e.message
-    end
-  end
-end end

data/lib/logstash/bootstrap_check/bad_ruby.rb

@@ -1,12 +0,0 @@
-# encoding: utf-8
-require "logstash/errors"
-
-module LogStash module BootstrapCheck
-  class BadRuby
-    def self.check(settings)
-      if RUBY_VERSION < "2.0"
-        raise LogStash::BootstrapCheckError, "Ruby 2.0 or later is required. (You are running: " + RUBY_VERSION + ")"
-      end
-    end
-  end
-end end

data/lib/logstash/converge_result.rb

@@ -1,103 +0,0 @@
-# encoding: utf-8
-require "logstash/errors"
-
-module LogStash
-  # This class allow us to keep track and uniform all the return values from the
-  # action task
-  class ConvergeResult
-    class ActionResult
-      attr_reader :executed_at
-
-      def initialize
-        @executed_at = LogStash::Timestamp.now
-      end
-
-      # Until all the action have more granularity in the validation
-      # or execution we make the ConvergeResult works with primitives and exceptions
-      def self.create(action, action_result)
-        if action_result.is_a?(ActionResult)
-          action_result
-        elsif action_result.is_a?(Exception)
-          FailedAction.from_exception(action_result)
-        elsif action_result == true
-          SuccessfulAction.new
-        elsif action_result == false
-          FailedAction.from_action(action, action_result)
-        else
-          raise LogStash::Error, "Don't know how to handle `#{action_result.class}` for `#{action}`"
-        end
-      end
-    end
-
-    class FailedAction < ActionResult
-      attr_reader :message, :backtrace
-
-      def initialize(message, backtrace = nil)
-        super()
-
-        @message = message
-        @backtrace = backtrace
-      end
-
-      def self.from_exception(exception)
-        FailedAction.new(exception.message, exception.backtrace)
-      end
-
-      def self.from_action(action, action_result)
-        FailedAction.new("Could not execute action: #{action}, action_result: #{action_result}")
-      end
-
-      def successful?
-        false
-      end
-    end
-
-    class SuccessfulAction < ActionResult
-      def successful?
-        true
-      end
-    end
-
-    def initialize(expected_actions_count)
-      @expected_actions_count = expected_actions_count
-      @actions = java.util.concurrent.ConcurrentHashMap.new
-    end
-
-    def add(action, action_result)
-      @actions[action] = ActionResult.create(action, action_result)
-    end
-
-    def failed_actions
-      filter_by_successful_state(false)
-    end
-
-    def successful_actions
-      filter_by_successful_state(true)
-    end
-
-    def complete?
-      total == @expected_actions_count
-    end
-
-    def success?
-      failed_actions.empty? && complete?
-    end
-
-    def fails_count
-      failed_actions.size
-    end
-
-    def success_count
-      successful_actions.size
-    end
-
-    def total
-      @actions.size
-    end
-
-    private
-    def filter_by_successful_state(predicate)
-      @actions.select { |action, action_result| action_result.successful? == predicate }
-    end
-  end
-end

data/lib/logstash/instrument/global_metrics.rb

@@ -1,13 +0,0 @@
-class GlobalMetrics
-  class Stats(metric)
-    @metric = metric
-  end
-
-  def initialize(metric)
-    @metric = metric
-
-    @pipeline_reloads = metric.namespace([:stats, :pipelines])
-  end
-
-
-end

data/lib/logstash/instrument/snapshot.rb

@@ -1,15 +0,0 @@
-# encoding: utf-8
-require "logstash/util/loggable"
-
-module LogStash module Instrument
-  class Snapshot
-    include LogStash::Util::Loggable
-
-    attr_reader :metric_store, :created_at
-
-    def initialize(metric_store, created_at = Time.now)
-      @metric_store = metric_store
-      @created_at = created_at
-    end
-  end
-end; end

data/lib/logstash/java_integration.rb

@@ -1,116 +0,0 @@
-# encoding: utf-8
-require "java"
-
-# this is mainly for usage with JrJackson json parsing in :raw mode which generates
-# Java::JavaUtil::ArrayList and Java::JavaUtil::LinkedHashMap native objects for speed.
-# these object already quacks like their Ruby equivalents Array and Hash but they will
-# not test for is_a?(Array) or is_a?(Hash) and we do not want to include tests for
-# both classes everywhere. see LogStash::JSon.
-
-class Array
-  # enable class equivalence between Array and ArrayList
-  # so that ArrayList will work with case o when Array ...
-  def self.===(other)
-    return true if other.is_a?(Java::JavaUtil::Collection)
-    super
-  end
-end
-
-class Hash
-  # enable class equivalence between Hash and LinkedHashMap
-  # so that LinkedHashMap will work with case o when Hash ...
-  def self.===(other)
-    return true if other.is_a?(Java::JavaUtil::Map)
-    super
-  end
-end
-
-# map_mixin to patch LinkedHashMap and HashMap. it must be done directly on the classes,
-# using a module mixin does not work, and injecting in the Map interface does not work either
-# but injecting in the class works.
-
-map_mixin = lambda do
-  # this is a temporary fix to solve a bug in JRuby where classes implementing the Map interface, like LinkedHashMap
-  # have a bug in the has_key? method that is implemented in the Enumerable module that is somehow mixed in the Map interface.
-  # this bug makes has_key? (and all its aliases) return false for a key that has a nil value.
-  # Only LinkedHashMap is patched here because patching the Map interface is not working.
-  # TODO find proper fix, and submit upstream
-  # relevant JRuby files:
-  # https://github.com/jruby/jruby/blob/master/core/src/main/ruby/jruby/java/java_ext/java.util.rb
-  # https://github.com/jruby/jruby/blob/master/core/src/main/java/org/jruby/java/proxies/MapJavaProxy.java
-  def has_key?(key)
-    self.containsKey(key)
-  end
-  alias_method :include?, :has_key?
-  alias_method :member?, :has_key?
-  alias_method :key?, :has_key?
-
-  # Java 8 Map implements a merge method with a different signature from
-  # the Ruby Hash#merge. see https://github.com/jruby/jruby/issues/1249
-  # this can be removed when fixed upstream
-  if ENV_JAVA['java.specification.version'] >= '1.8'
-    def merge(other)
-      dup.merge!(other)
-    end
-  end
-end
-
-Java::JavaUtil::LinkedHashMap.module_exec(&map_mixin)
-Java::JavaUtil::HashMap.module_exec(&map_mixin)
-
-module java::util::Map
-  # have Map objects like LinkedHashMap objects report is_a?(Array) == true
-  def is_a?(clazz)
-    return true if clazz == Hash
-    super
-  end
-end
-
-module java::util::Collection
-  # have Collections objects like ArrayList report is_a?(Array) == true
-  def is_a?(clazz)
-    return true if clazz == Array
-    super
-  end
-
-  # support the Ruby Array delete method on a Java Collection
-  def delete(o)
-    self.removeAll([o]) ? o : block_given? ? yield : nil
-  end
-
-  def compact
-    duped = Java::JavaUtil::ArrayList.new(self)
-    duped.compact!
-    duped
-  end
-
-  def compact!
-    size_before = self.size
-    self.removeAll(java::util::Collections.singleton(nil))
-    if size_before == self.size
-      nil
-    else
-      self
-    end
-  end
-
-  # support the Ruby intersection method on Java Collection
-  def &(other)
-    # transform self into a LinkedHashSet to remove duplicates and preserve order as defined by the Ruby Array intersection contract
-    duped = Java::JavaUtil::LinkedHashSet.new(self)
-    duped.retainAll(other)
-    duped
-  end
-
-  # support the Ruby union method on Java Collection
-  def |(other)
-    # transform self into a LinkedHashSet to remove duplicates and preserve order as defined by the Ruby Array union contract
-    duped = Java::JavaUtil::LinkedHashSet.new(self)
-    duped.addAll(other)
-    duped
-  end
-
-  def inspect
-    "<#{self.class.name}:#{self.hashCode} #{self.to_a(&:inspect)}>"
-  end
-end