logstash-integration-jdbc 5.4.2 → 5.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c54f1c22363c2d0637b44a2b68a98e22a1b2f07bc68927a4cc9bd6788a6fc009
-  data.tar.gz: 3ea76ee4fcdde152e43af6c0aab53be50dc022a8c31fce8ebac36669370a4875
+  metadata.gz: 0427bfc9149fd1b4751f91bda69dcbc67fe50bbb59ba331142c52b0ac79b92df
+  data.tar.gz: 9b89e07e05f01b5f4226cbbb452a36e0edb116ca116d843d8f578508206086b8
 SHA512:
-  metadata.gz: d31cef0d20064897337825bcf7ff491d3b64295c47b644d527974f458ac2c8a180d930b84b55fac6601a5f76faa10754b8975af681c4e0718ec2711e08a0d571
-  data.tar.gz: 6434512f2b958b976a12a7c4afe3d584066cb505c4818d8e340e363a7db4327a433785fc9ddfddc6c67eb2d719fc3f518346974760003873250895cb396d36e1
+  metadata.gz: 7bcc88da6e2d4de082a5547f0f273063913f2fe8e87578d7177eb4929604a66ec8be48818ba7b32a88a7bf978aad42f07c14f69f60349d82531f531c0cd77480
+  data.tar.gz: 76bc8bb2c010a6f6087e91be3280c1b83ae165449889cc425cb91b4e6fe0f9092b229f7ed37df5fb6ae7be3acbaa8c69541c610bbfff07c374a32be014ccdcbf

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.4.3
+  - Fix crash when metadata file can't be deleted after moving under path.data [#136](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/136)
+
 ## 5.4.2
   - Doc: described default_hash and tag_on_default_use interaction filter plugin [#122](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/122)
   - Added new settings `statement_retry_attempts` and `statement_retry_attempts_wait_time` for retry of failed sql statement execution [#123](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/123)

data/docs/input-jdbc.asciidoc

@@ -491,10 +491,12 @@ How often to validate a connection (in seconds)
 ===== `last_run_metadata_path`
 
   * Value type is <<string,string>>
-  * Default value is `"$HOME/.logstash_jdbc_last_run"`
+  * Default value is `"<path.data>/plugins/inputs/jdbc/logstash_jdbc_last_run"`
 
 Path to file with last run time
 
+In versions prior to 5.2.6 the metadata file was written to `$HOME/.logstash_jdbc_last_run`. If during a Logstash upgrade the file is found in "$HOME" it will be moved to the default location under "path.data". If the path is defined by the user then no automatic move is performed.
+
 [id="plugins-{type}s-{plugin}-lowercase_column_names"]
 ===== `lowercase_column_names`
 

data/lib/logstash/inputs/jdbc.rb

@@ -406,7 +406,7 @@ module LogStash module Inputs class Jdbc < LogStash::Inputs::Base
         # the correct access rights
         ::File.delete(old_default_path.to_path)
         @logger.info("Successfully moved the #{old_default_path.to_path} into #{metadata_new_path.to_path}")
-      rescue e
+      rescue => e
         @logger.warn("Using new metadata file at #{metadata_new_path.to_path} but #{old_default_path} can't be removed.")
       end
     end

data/logstash-integration-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-integration-jdbc'
-  s.version         = '5.4.2'
+  s.version         = '5.4.3'
   s.licenses = ['Apache License (2.0)']
   s.summary         = "Integration with JDBC - input and filter plugins"
   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

@@ -1169,19 +1169,31 @@ describe LogStash::Inputs::Jdbc do
     context "when a file exists" do
       before do
         # in a faked HOME folder save a valid previous last_run metadata file
+        allow(ENV).to receive(:[]).and_call_original
         allow(ENV).to receive(:[]).with('HOME').and_return(fake_home)
-        File.open("#{ENV['HOME']}/.logstash_jdbc_last_run", 'w') do |file|
+
+        File.open("#{fake_home}/.logstash_jdbc_last_run", 'w') do |file|
           file.write("--- !ruby/object:DateTime '2022-03-08 08:10:00.486889000 Z'")
         end
       end
+      let(:old_path) { "#{fake_home}/.logstash_jdbc_last_run" }
+      let(:path_data) { LogStash::SETTINGS.get_value("path.data") }
+      let(:new_path) { "#{path_data}/plugins/inputs/jdbc/logstash_jdbc_last_run" }
 
       it "should be moved" do
         plugin.register
-
-        expect(::File.exist?("#{ENV['HOME']}/.logstash_jdbc_last_run")).to be false
-        path = LogStash::SETTINGS.get_value("path.data")
-        full_path = "#{path}/plugins/inputs/jdbc/logstash_jdbc_last_run"
-        expect(::File.exist?(full_path)).to be true
+        expect(::File).to_not exist(old_path)
+        expect(::File).to exist(new_path)
+      end
+      context "if the delete fails" do
+        before(:each) do
+          allow(File).to receive(:delete).and_raise ArgumentError
+        end
+        it "should be still be moved" do
+          plugin.register
+          expect(::File).to exist(old_path) # old still exists
+          expect(::File).to exist(new_path)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-jdbc
 version: !ruby/object:Gem::Version
-  version: 5.4.2
+  version: 5.4.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -333,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Integration with JDBC - input and filter plugins