logstash-core 7.0.0.rc2-java → 7.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd9e0954d75c202b40785abd73dd2a91bbad3fe10eebf1d49d310069d55dabc4
-  data.tar.gz: 1e6ee088d75edbb76f8df8c56a99cfcc73b0bd639d8d29a9797032aa453d1ddb
+  metadata.gz: cd03158df42534c10604620e5d3ed4bec52b3ab60fe43a882dab39a8da514f2f
+  data.tar.gz: 79ff89c08dd2008fd09fea936f5bfd3cac980ab84a925e64e39f593ba7bbaaa6
 SHA512:
-  metadata.gz: 56f8f714138219a2adec1103207dec90d8518f334c8014ecb7694ea61d2e21cea9eeb78c268cdcde1c1a248d9e7416cdfa3094f1611ebdc22e7ecb04dfecb577
-  data.tar.gz: 2c153ed57ef1be8f20f4db27098093ffb55b6a0e357e327498a03d40ea84e3afa33185ec45124c2ae97143410765a2b2f0c0cbea43408216f16c35be54162fcb
+  metadata.gz: 3426d6a30a3e62d4619b851b5adc21a8ca38e50827fe2fc84184a05b33ee3108a4894e566f0bfb6050f8ee397fd37e4f6c33a61eaf4011c7c4349973a25d499d
+  data.tar.gz: a6ca153528bdabd909c6bc0b8ba76bdee2c47d7285cab759acdb8d46ae660197bc7841a47bd94aa3bc63028e4f170c52afe1874bcfcd55ccb2c9d413692bcaa3

data/lib/logstash/compiler/lscl.rb

@@ -115,7 +115,7 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
         elsif existing.kind_of?(::Array)
           hash[k] = existing.push(*v)
         else
-          hash[k] = existing + v
+          hash[k] = [existing, v] unless v == existing
         end
         hash
       end

data/lib/logstash/runner.rb

@@ -369,6 +369,8 @@ class LogStash::Runner < Clamp::StrictCommand
 
     @agent.shutdown
 
+    logger.info("Logstash shut down.")
+
     # flush any outstanding log messages during shutdown
     org.apache.logging.log4j.LogManager.shutdown
 

data/lib/logstash/settings.rb

@@ -586,6 +586,30 @@ module LogStash
         coerce(value)
       end
     end
+
+    ##
+    # Instances of `DeprecatedSetting` can be registered, but will fail with helpful guidance when encountering any
+    # configuration that attempts to explicitly set the value. They should be used in the Major version immediately
+    # following a deprecation to assist users who are porting forward configurations.
+    class DeprecatedSetting < Setting
+      def initialize(name, guidance='please remove the setting from your configuration and try again.')
+        super(name, Object)
+        @guidance = guidance
+      end
+
+      def set(value)
+        fail(ArgumentError, "The setting `#{name}` has been deprecated and removed from Logstash; #{@guidance}")
+      end
+    end
+
+    # Useful when a setting has been renamed but otherwise is semantically identical
+    class DeprecatedAndRenamed < DeprecatedSetting
+      attr_reader :new_name
+      def initialize(name, new_name)
+        super(name, "please update your configuration to use `#{new_name}` instead.")
+        @new_name = new_name
+      end
+    end
   end
 
 

data/logstash-core.gemspec

@@ -57,6 +57,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "sinatra", '~> 1', '>= 1.4.6'
   gem.add_runtime_dependency 'puma', '~> 2'
   gem.add_runtime_dependency "jruby-openssl", "~> 0.10" # >= 0.9.13 Required to support TLSv1.2
+  gem.add_runtime_dependency "faraday", "~> 0.9.0" # because of conflicting dependencies between twitter input and octokit
   gem.add_runtime_dependency "chronic_duration", "~> 0.10"
 
   gem.add_runtime_dependency "treetop", "~> 1" #(MIT license)

data/spec/logstash/settings/deprecated_and_renamed_spec.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'logstash/settings'
+
+describe LogStash::Setting::DeprecatedAndRenamed do
+  subject(:setting) { described_class.new("option.deprecated", "option.current") }
+  let(:value) { Object.new }
+
+  describe '#set' do
+    it 'fails with deprecation runtime error and helpful guidance' do
+      expect { setting.set(value) }.to raise_exception do |exception|
+        expect(exception).to be_a_kind_of(ArgumentError)
+        expect(exception.message).to match(/deprecated and removed/)
+        expect(exception.message).to include("option.deprecated")
+        expect(exception.message).to include("option.current")
+      end
+    end
+  end
+end

data/versions-gem-copy.yml

@@ -1,14 +1,14 @@
 ---
 # alpha and beta qualifiers are now added via VERSION_QUALIFIER environment var
-logstash: 7.0.0
-logstash-core: 7.0.0
+logstash: 7.0.1
+logstash-core: 7.0.1
 logstash-core-plugin-api: 2.1.16
 
 # jruby must reference a *released* version of jruby which can be downloaded from the official download url
 # *and* for which jars artifacts are published for compile-time
 jruby:
-  version: 9.2.6.0
-  sha1: 3c13ec3966f6cc44966f3978c96325b9e56174f1
+  version: 9.2.7.0
+  sha1: dc35f9bb991f526f058bf6b9591c460f98cffe9e
 
 # jruby-runtime-override, if specified, will override the jruby version installed in vendor/jruby for logstash runtime only,
 # not for the compile-time jars

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc2
+  version: 7.0.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,20 @@ 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:
@@ -535,6 +549,7 @@ files:
 - spec/logstash/setting_spec.rb
 - spec/logstash/settings/array_coercible_spec.rb
 - spec/logstash/settings/bytes_spec.rb
+- spec/logstash/settings/deprecated_and_renamed_spec.rb
 - spec/logstash/settings/integer_spec.rb
 - spec/logstash/settings/modules_spec.rb
 - spec/logstash/settings/numeric_spec.rb
@@ -585,12 +600,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 2.7.9
 signing_key:
 specification_version: 4
 summary: logstash-core - The core components of logstash
@@ -675,6 +690,7 @@ test_files:
 - spec/logstash/setting_spec.rb
 - spec/logstash/settings/array_coercible_spec.rb
 - spec/logstash/settings/bytes_spec.rb
+- spec/logstash/settings/deprecated_and_renamed_spec.rb
 - spec/logstash/settings/integer_spec.rb
 - spec/logstash/settings/modules_spec.rb
 - spec/logstash/settings/numeric_spec.rb