logstash-input-jdbc 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 092e53a0d727fc85cbcb20dc9cbbb6af813bb535
-  data.tar.gz: 39aa1ec2ca42438a90a7cf3475c9eee6fe800622
+  metadata.gz: 06c6146d1a00d00d4bf3dec3d65795cfd1e5dc94
+  data.tar.gz: dd47271869a2a33e4bea9c92681a520c6b1cfce1
 SHA512:
-  metadata.gz: db44c1a23b3590320c8ccdabd0118a7ed5df70cb4e124b0af089a7b0cad2b56a005c3e9609d4581685e1b01514257ef618c95103cb915616f3a01e72da864f79
-  data.tar.gz: 4a1d088041137bc24e0c789424705d889eea7a0fcb367548e36807c8d1a29a3fa595e1cba7af5ce08afaa31eafcdae6e88e79b8709110ff8e9ec126ca3e687d6
+  metadata.gz: bbfbeb43d4a972d212d689a2bfb6d546fad9c672a9653c56546c559eacee386cc3d67e7b75bc769efc622f327dc1ed10b471a41ce6755cb722d2e60b3753b379
+  data.tar.gz: ae2c5aa96ccc1acc9d459a9e47014f3115a1cc1d49b835d97eb40a6a65605b5e6d9654d7b906d52abe88485104b41135af1762a8803531fecf9554e416dbe8c2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.2.1
+ - Fix bug where failed healthchecks would not call a non-existant method and suppress the real error
+
 ## 4.2.0
  - Automatically reconnect on connection issues
  - Fix test failures

data/docs/index.asciidoc

@@ -12,7 +12,7 @@ START - GENERATED VARIABLES, DO NOT EDIT!
 END - GENERATED VARIABLES, DO NOT EDIT!
 ///////////////////////////////////////////
 
-[id="plugins-{type}-{plugin}"]
+[id="plugins-{type}s-{plugin}"]
 
 === Jdbc input plugin
 

data/lib/logstash/inputs/jdbc.rb

@@ -232,7 +232,7 @@ class LogStash::Inputs::Jdbc < LogStash::Inputs::Base
       raise(LogStash::ConfigurationError, "Only one of :jdbc_password, :jdbc_password_filepath may be set at a time.")
     end
 
-    @jdbc_password = File.read(@jdbc_password_filepath).strip if @jdbc_password_filepath
+    @jdbc_password = LogStash::Util::Password.new(File.read(@jdbc_password_filepath).strip) if @jdbc_password_filepath
 
     if enable_encoding?
       @converters = {}

data/lib/logstash/plugin_mixins/jdbc.rb

@@ -171,7 +171,7 @@ module LogStash::PluginMixins::Jdbc
       @database.test_connection
     rescue Sequel::DatabaseConnectionError => e
       @logger.warn("Failed test_connection.")
-      @database.close_jdbc_connection
+      close_jdbc_connection
 
       #TODO return false and let the plugin raise a LogStash::ConfigurationError
       raise e

data/logstash-input-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-jdbc'
-  s.version         = '4.2.1'
+  s.version         = '4.2.2'
   s.licenses = ['Apache License (2.0)']
   s.summary = "This example input streams a string at a definable interval."
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -28,4 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'jdbc-derby'
+  s.add_development_dependency 'jdbc-mysql'
 end

data/spec/inputs/jdbc_spec.rb

@@ -2,6 +2,8 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/inputs/jdbc"
 require "jdbc/derby"
+require "jdbc/mysql"
+Jdbc::MySQL.load_driver
 require "sequel"
 require "sequel/adapters/jdbc"
 require "timecop"
@@ -26,19 +28,24 @@ describe LogStash::Inputs::Jdbc do
   end
 
   before :each do
-    Jdbc::Derby.load_driver
-    db.create_table :test_table do
-      DateTime :created_at
-      Integer  :num
-      String   :string
-      DateTime :custom_time
-    end
-    db << "CREATE TABLE types_table (num INTEGER, string VARCHAR(255), started_at DATE, custom_time TIMESTAMP, ranking DECIMAL(16,6))"
+    if !RSpec.current_example.metadata[:no_connection]
+      # before body
+      Jdbc::Derby.load_driver
+      db.create_table :test_table do
+        DateTime :created_at
+        Integer  :num
+        String   :string
+        DateTime :custom_time
+      end
+      db << "CREATE TABLE types_table (num INTEGER, string VARCHAR(255), started_at DATE, custom_time TIMESTAMP, ranking DECIMAL(16,6))"
+    end
   end
 
   after :each do
-    db.drop_table(:test_table)
-    db.drop_table(:types_table)
+    if !RSpec.current_example.metadata[:no_connection]
+      db.drop_table(:test_table)
+      db.drop_table(:types_table)
+    end
   end
 
   context "when registering and tearing down" do
@@ -87,6 +94,24 @@ describe LogStash::Inputs::Jdbc do
     end
   end
 
+  context "when connecting to a non-existent server", :no_connection => true do
+    let(:mixin_settings) do
+      super.merge(
+        "jdbc_driver_class" => "com.mysql.jdbc.Driver",
+        "jdbc_connection_string" => "jdbc:mysql://localhost:99999/somedb"
+      )
+    end
+    let(:settings) { super.merge("statement" => "SELECT 1 as col1 FROM test_table", "jdbc_user" => "foo", "jdbc_password" => "bar") }
+
+    it "should not register correctly" do
+        plugin.register
+        q = Queue.new
+        expect do
+          plugin.run(q)
+        end.to raise_error(::Sequel::DatabaseConnectionError)
+    end
+  end
+
   context "when both jdbc_password and jdbc_password_filepath arguments are passed" do
     let(:statement) { "SELECT * from test_table" }
     let(:jdbc_password) { "secret" }
@@ -117,7 +142,7 @@ describe LogStash::Inputs::Jdbc do
     end
 
     it "should read in jdbc_password from file" do
-      expect(plugin.jdbc_password).to eq(jdbc_password)
+      expect(plugin.jdbc_password.value).to eq(jdbc_password)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: jdbc-mysql
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []