logstash-filter-jdbc_static 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3b81e0c9308bdc5e2ed77ff83285478e1acb576014a87066b9515463556054a
-  data.tar.gz: 9b7712e0be06ba5bf6aba7faea67eb241b70597378b0348dcc75ae114fe6e9ba
+  metadata.gz: 44a9dc021efa08eb1c02d143f9c3b16e89b1dab5be971a1c1bd18c047f1b9dcb
+  data.tar.gz: ff306839f602b625350173005b9780504b9ec6f3bfba2abe5cad4f92a654ab4a
 SHA512:
-  metadata.gz: 27e86d778e71192f76c2e205907fd2f846aced383f35cd3df85e4ff6b191d66d68c7395c6195668ae003813f5bf020110f5528f9c8274c476984a476655a691c
-  data.tar.gz: '0091f4a6ffa0082ed1b95e287b502fcbf765c14e6f8400c5dc4a9782825d9603a465058f9ac86cb59c75bba0bf601beb1d0f300d397d4825f17fcd9a4761a4cb'
+  metadata.gz: 2eb10e33bcbd0db98bdbad8ad8575cf2ed631a606285ea2ac489588d033b7c5179e89b2b5133003ac0dad979fa374e303fe55bf6ca5f70f1906b3487f182094e
+  data.tar.gz: 8fb1524a50778571c1fc7bfd8811de682eecdf842cacc0e1c467f42d7296297c6a92b2fe34785fe9d23470d18a0d54e447c212a36f2ff19a0dade3122ab1bb7e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.7
+ - Fixed issue with driver verification using Java 11 [#51](https://github.com/logstash-plugins/logstash-filter-jdbc_static/pull/51)
+
 ## 1.0.6
  - Added info to documentation to emphasize significance of table order [36](https://github.com/logstash-plugins/logstash-filter-jdbc_static/pull/36)
 

data/lib/logstash/filters/jdbc/basic_database.rb

@@ -85,9 +85,8 @@ module LogStash module Filters module Jdbc
     def verify_connection(connection_string, driver_class, driver_library, user, password)
       begin
         if driver_library
-          class_loader = java.lang.ClassLoader.getSystemClassLoader().to_java(java.net.URLClassLoader)
           driver_library.split(",").each do |driver_path|
-            make_driver_path_loadable(class_loader, driver_path.strip)
+            require driver_path
           end
         end
       rescue LoadError => e
@@ -115,11 +114,6 @@ module LogStash module Filters module Jdbc
       end
     end
 
-    def make_driver_path_loadable(class_loader, driver_path)
-      # so we can set an expectation in rspec
-      class_loader.add_url(java.io.File.new(driver_path).toURI().toURL())
-    end
-
     def post_initialize()
       @unique_db_name = SecureRandom.hex(12)
     end

data/logstash-filter-jdbc_static.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-filter-jdbc_static'
-  s.version         = '1.0.6'
+  s.version         = '1.0.7'
   s.licenses        = ['Apache-2.0']
   s.summary         = "This filter executes a SQL query to fetch a SQL query result, store it locally then use a second SQL query to update an event."
   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/filters/integration/jdbc_static_spec.rb

@@ -0,0 +1,120 @@
+# encoding: utf-8
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/filters/jdbc_static"
+require "sequel"
+require "sequel/adapters/jdbc"
+require "stud/temporary"
+require "timecop"
+
+module LogStash module Filters
+  describe JdbcStatic, :integration => true do
+
+    before(:all) do
+      @thread_abort = Thread.abort_on_exception
+      Thread.abort_on_exception = true
+    end
+
+    let(:loader_statement) { "SELECT ip, name, location FROM reference_table" }
+    let(:lookup_statement) { "SELECT * FROM servers WHERE ip LIKE :ip" }
+    let(:parameters_rhs) { "%%{[ip]}" }
+    let(:temp_import_path_plugin) { Stud::Temporary.pathname }
+    let(:temp_import_path_rspec) { Stud::Temporary.pathname }
+
+    ENV["TZ"] = "Etc/UTC"
+
+    # For Travis and CI based on docker, we source from ENV
+    jdbc_connection_string = ENV.fetch("PG_CONNECTION_STRING",
+                                       "jdbc:postgresql://postgresql:5432") + "/jdbc_static_db?user=postgres"
+
+    let(:local_db_objects) do
+      [
+        {"name" => "servers", "index_columns" => ["ip"], "columns" => [["ip", "varchar(64)"], ["name", "varchar(64)"], ["location", "varchar(64)"]]},
+      ]
+    end
+
+    let(:settings) do
+      {
+        "jdbc_user" => ENV['USER'],
+        "jdbc_driver_class" => "org.postgresql.Driver",
+        "jdbc_driver_library" => "/usr/share/logstash/postgresql.jar",
+        "staging_directory" => temp_import_path_plugin,
+        "jdbc_connection_string" => jdbc_connection_string,
+        "loaders" => [
+          {
+            "id" =>"servers",
+            "query" => loader_statement,
+            "local_table" => "servers"
+          }
+        ],
+        "local_db_objects" => local_db_objects,
+        "local_lookups" => [
+          {
+            "query" => lookup_statement,
+            "parameters" => {"ip" => parameters_rhs},
+            "target" => "server"
+          }
+        ]
+      }
+    end
+
+    let(:plugin) { JdbcStatic.new(settings) }
+
+    let(:event)      { ::LogStash::Event.new("message" => "some text", "ip" => ipaddr) }
+
+    let(:ipaddr) { ".3.1.1" }
+
+    describe "non scheduled operation" do
+      after { plugin.close }
+
+      context "under normal conditions" do
+        it "enhances an event" do
+          plugin.register
+          plugin.filter(event)
+          expect(event.get("server")).to eq([{"ip"=>"10.3.1.1", "name"=>"mv-server-1", "location"=>"MV-9-6-4"}])
+        end
+      end
+
+      context "when the loader query returns no results" do
+        let(:loader_statement) { "SELECT ip, name, location FROM reference_table WHERE ip LIKE '20%'" }
+        it "add an empty array to the target field" do
+          plugin.register
+          plugin.filter(event)
+          expect(event.get("server")).to eq([])
+        end
+      end
+
+      context "under normal conditions when index_columns is not specified" do
+        let(:local_db_objects) do
+          [
+            {"name" => "servers", "columns" => [["ip", "varchar(64)"], ["name", "varchar(64)"], ["location", "varchar(64)"]]},
+          ]
+        end
+        it "enhances an event" do
+          plugin.register
+          plugin.filter(event)
+          expect(event.get("server")).to eq([{"ip"=>"10.3.1.1", "name"=>"mv-server-1", "location"=>"MV-9-6-4"}])
+        end
+      end
+    end
+
+    describe "scheduled operation" do
+      context "given a loader_schedule" do
+        it "should properly schedule" do
+          settings["loader_schedule"] = "*/10 * * * * * UTC"
+          Timecop.travel(Time.now.utc - 3600)
+          Timecop.scale(60)
+          static_filter = JdbcStatic.new(settings)
+          runner = Thread.new(static_filter) do |filter|
+            filter.register
+          end
+          sleep 3
+          static_filter.filter(event)
+          expect(static_filter.loader_runner.reload_count).to be > 1
+          static_filter.close
+          Timecop.return
+          expect(event.get("server")).to eq([{"ip"=>"10.3.1.1", "name"=>"mv-server-1", "location"=>"MV-9-6-4"}])
+        end
+      end
+    end
+  end
+end end

data/spec/filters/jdbc/read_only_database_spec.rb

@@ -38,29 +38,6 @@ module LogStash module Filters module Jdbc
         end
       end
 
-      describe "multiple driver loading" do
-        before :each do
-          allow(Sequel::JDBC).to receive(:load_driver)
-          allow_any_instance_of(described_class).to receive(:make_driver_path_loadable)
-        end
-
-        context "using three drivers" do
-          it "makes all loadable" do
-            expect_any_instance_of(described_class).to receive(:make_driver_path_loadable).with(anything, "/foo/bar.jar")
-            expect_any_instance_of(described_class).to receive(:make_driver_path_loadable).with(anything, "/foo/baz.jar")
-            expect_any_instance_of(described_class).to receive(:make_driver_path_loadable).with(anything, "/foo/biz.jar")
-            described_class.create("mock://mydb", "a driver class", "/foo/bar.jar, /foo/baz.jar, /foo/biz.jar")
-          end
-        end
-
-        context "just one driver" do
-          it "makes one loadable" do
-            expect_any_instance_of(described_class).to receive(:make_driver_path_loadable).once.with(anything, "/foo/bar.jar")
-            described_class.create("mock://mydb", "a driver class", "/foo/bar.jar")
-          end
-        end
-      end
-
       describe "methods" do
         let(:dataset) { double("Sequel::Dataset") }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-jdbc_static
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +173,7 @@ files:
 - lib/logstash/filters/jdbc_static.rb
 - logstash-filter-jdbc_static.gemspec
 - spec/filters/env_helper.rb
+- spec/filters/integration/jdbc_static_spec.rb
 - spec/filters/jdbc/column_spec.rb
 - spec/filters/jdbc/db_object_spec.rb
 - spec/filters/jdbc/loader_spec.rb
@@ -220,6 +221,7 @@ summary: This filter executes a SQL query to fetch a SQL query result, store it
   then use a second SQL query to update an event.
 test_files:
 - spec/filters/env_helper.rb
+- spec/filters/integration/jdbc_static_spec.rb
 - spec/filters/jdbc/column_spec.rb
 - spec/filters/jdbc/db_object_spec.rb
 - spec/filters/jdbc/loader_spec.rb