logstash-input-jdbc 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e32e58893ccf6dccc61c104295f6650c4c54e0a
-  data.tar.gz: b2a94b10eb6e6820d3f4820307a81e5e8116bc56
+  metadata.gz: afede6bb954e753352fe3138057cb32dbffc814d
+  data.tar.gz: 624feecfdfdea557f91b480acfccb7d0948a4660
 SHA512:
-  metadata.gz: 1f504c333b1e161e837ddecea78115e22cd7097ef8ff9b567557eb50f204d797b5c7cb5cfe5da3815bb168737e1d937dee93e517a5705bc2b720bb66149ce69a
-  data.tar.gz: 4c06af8468321c95732f23983d06dfe89a1fb5c1c591c0c5cbadca24dc1ae257f0a92f0327184ca4a6c1cbf956020ebe82a812019f3925df00ec9fe24f735d3a
+  metadata.gz: da164fbd6abf2627372925ff198ba99fd822588392365498f3543a928e1ffcdd297b3098ba30ac4d8426b06059f4c4fde8cbef4ef1f21652a9345298e27c641c
+  data.tar.gz: 4b6a2ede22c3392d6553cb2b04a7b1c26c5333722ffc7dc16ebe0fa19eee49dce7bdee9a773a4ce35aff55692942d7db06950ea571d72d37f94e165e66ea846a

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 4.0.2
+  - Added feature to read password from external file (#120).
 ## 4.0.1
   - Republish all the gems under jruby.
 ## 4.0.0

data/README.md

@@ -95,6 +95,7 @@ Reading data from MySQL:
 	    jdbc_connection_string => "jdbc:mysql://host:port/database"
 	    jdbc_user => "user"
 	    jdbc_password => "password"
+      # or jdbc_password_filepath => "/path/to/my/password_file"
 	    statement => "SELECT ..."
 	    jdbc_paging_enabled => "true"
 	    jdbc_page_size => "50000"

data/lib/logstash/inputs/jdbc.rb

@@ -185,6 +185,12 @@ class LogStash::Inputs::Jdbc < LogStash::Inputs::Base
     end
 
     @statement = File.read(@statement_filepath) if @statement_filepath
+
+    if (@jdbc_password_filepath and @jdbc_password)
+      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
   end # def register
 
   def run(queue)

data/lib/logstash/plugin_mixins/jdbc.rb

@@ -40,6 +40,9 @@ module LogStash::PluginMixins::Jdbc
     # JDBC password
     config :jdbc_password, :validate => :password
 
+    # JDBC password filename
+    config :jdbc_password_filepath, :validate => :path
+
     # JDBC enable paging
     #
     # This will cause a sql statement to be broken up into multiple queries.

data/logstash-input-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-jdbc'
-  s.version         = '4.0.1'
+  s.version         = '4.0.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"

data/spec/inputs/jdbc_spec.rb

@@ -81,6 +81,41 @@ describe LogStash::Inputs::Jdbc do
     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" }
+    let(:jdbc_password_file_path) { Stud::Temporary.pathname }
+    let(:settings) { { "jdbc_password_filepath" => jdbc_password_file_path,
+                       "jdbc_password" => jdbc_password,
+                       "statement" => statement } }
+
+    it "should fail to register" do
+      expect{ plugin.register }.to raise_error(LogStash::ConfigurationError)
+    end
+  end
+
+  context "when jdbc_password is passed in from a file" do
+    let(:statement) { "SELECT * from test_table" }
+    let(:jdbc_password) { "secret" }
+    let(:jdbc_password_file_path) { Stud::Temporary.pathname }
+    let(:settings) { { "jdbc_password_filepath" => jdbc_password_file_path,
+                       "statement" => statement } }
+
+    before do
+      File.write(jdbc_password_file_path, jdbc_password)
+      plugin.register
+    end
+
+    after do
+      plugin.stop
+    end
+
+    it "should read in jdbc_password from file" do
+      expect(plugin.jdbc_password).to eq(jdbc_password)
+    end
+  end
+
+
   context "when neither statement and statement_filepath arguments are passed" do
     it "should fail to register" do
       expect{ plugin.register }.to raise_error(LogStash::ConfigurationError)

metadata

@@ -1,155 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: sequel
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: sequel
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: tzinfo
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: tzinfo
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: tzinfo-data
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rufus-scheduler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rufus-scheduler
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: timecop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: timecop
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: jdbc-derby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: jdbc-derby
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: docker-api
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: docker-api
   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: []
@@ -177,12 +177,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []