logstash-integration-aws 7.1.5-java → 7.1.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77814112cf4be9a2155d84247dab1157ee8a9b1a075b92ed3888b7a9d66ccf8a
-  data.tar.gz: bb70280e923a6375f7ec8834f42c753483c150325bb4fc566d213f3addc78a61
+  metadata.gz: 163e3851149d6d1e0be9602a1298359cc355f57177bad417429a5c39840ca768
+  data.tar.gz: deadfc6ba818c8081ad796fc2180e80c189da9842b97e1cace008bb2fab44432
 SHA512:
-  metadata.gz: 9999ddefbccde321a77933296295295550fa4e2651af60f8f7cd0dfb615dece6300bb34a010d6c3600d4313d53ed34f75274c91c662083c165cbdd1df69cd90a
-  data.tar.gz: 771d356b646e22616732ff35ed1ef6df791c4bf423e38dcbd6b7460bb0992fb2a6176c0a2cff74bc3c67e93353356f152a156edf2ecbc3c05eaac112210dcea3
+  metadata.gz: 21eaa2c5146017e907a18f7e1b1f479ecf708fd6a89fc771c1283a85a919545e02c064d5944ea29ee5d52bb562079816e8365a1063e810e22c5c6ab7a4b6a6b0
+  data.tar.gz: b65ae6b87d7340c8494877f4be303b83042a93769d99ade69c9d7bc27eced6bf3286fbfd30812cf299495ae0d920e124dbce27153c15bcac313d375bb69aaf6c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 7.1.6
+  - Clean up plugin created temporary dirs at startup [#39](https://github.com/logstash-plugins/logstash-integration-aws/pull/39)
+
 ## 7.1.5
   - Fix external documentation links [#35](https://github.com/logstash-plugins/logstash-integration-aws/pull/35)
 

data/VERSION

@@ -1 +1 @@
-7.1.5
+7.1.6

data/lib/logstash/outputs/s3.rb

@@ -395,8 +395,9 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
     @crash_uploader = Uploader.new(bucket_resource, @logger, CRASH_RECOVERY_THREADPOOL)
 
     temp_folder_path = Pathname.new(@temporary_directory)
-    files = Dir.glob(::File.join(@temporary_directory, "**/*"))
-               .select { |file_path| ::File.file?(file_path) }
+    all_files = Dir.glob(::File.join(@temporary_directory, "**/*"))
+    removed_dirs = remove_empty_dirs(all_files)
+    files = all_files.select { |file_path| !removed_dirs.include?(file_path) && ::File.file?(file_path) }
     under_recovery_files = get_under_recovery_files(files)
 
     files.each do |file_path|
@@ -439,4 +440,20 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
     end
     skip_files
   end
+
+  # Sorts explored files in desc order
+  # And proceeds bottom-up traversal remove operation if dir is empty
+  # Returns removed set to avoid duplicate Dir.glob process
+  def remove_empty_dirs(files)
+    removed_dirs = Set.new
+    files.sort { |x, y| y.length - x.length } # make sure to remove from leaf node
+         .select { |path| ::File.directory?(path) }
+         .select { |path| (Dir.entries(path) - %w[ . .. ]).empty? } # current and parent dirs escape
+         .each do |path|
+            @logger.debug? && @logger.debug("Removing empty temporary file", :path => path)
+            FileUtils.rm_f(path)
+            removed_dirs << path
+         end
+    removed_dirs
+  end
 end

data/lib/logstash-integration-aws_jars.rb

@@ -1,4 +1,4 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('org.logstash.plugins.integration.aws', 'logstash-integration-aws', '7.1.5')
+require_jar('org.logstash.plugins.integration.aws', 'logstash-integration-aws', '7.1.6')

data/spec/outputs/s3_spec.rb

@@ -229,4 +229,33 @@ describe LogStash::Outputs::S3 do
       end
     end
   end
+
+  context "remove empty dirs" do
+
+    before do
+      allow(File).to receive(:directory?).with('/path/to/bar-empty').and_return(true)
+      allow(File).to receive(:directory?).with('/path/to/foo/empty-dir').and_return(true)
+      allow(File).to receive(:directory?).with('/path/to/foo-file').and_return(true)
+      allow(File).to receive(:directory?).with('/path/to/foo-file/file.tmp').and_return(false)
+      allow(File).to receive(:directory?).with('/path/to/foo').and_return(true)
+
+      allow(Dir).to receive(:entries).with('/path/to/bar-empty').and_return([])
+      allow(Dir).to receive(:entries).with('/path/to/foo/empty-dir').and_return(%w(. ..))
+      allow(Dir).to receive(:entries).with('/path/to/foo-file').and_return(%w(/path/to/foo-file/file.tmp))
+      allow(Dir).to receive(:entries).with('/path/to/foo').and_return(%w(. .. empty-dir))
+    end
+
+    it "removes empty dirs" do
+      # Dir.glob() discovered files
+      files = %w(/path/to/bar-empty /path/to/foo/empty-dir /path/to/foo-file/file.tmp /path/to/foo-file)
+      removed_dirs = subject.send(:remove_empty_dirs, files)
+
+      expect(removed_dirs.include?('/path/to/bar-empty')).to be_truthy
+      expect(removed_dirs.include?('/path/to/foo/empty-dir')).to be_truthy
+      expect(removed_dirs.include?('/path/to/foo-file')).to be_falsey
+      expect(removed_dirs.include?('/path/to/foo-file/file.tmp')).to be_falsey
+      expect(removed_dirs.include?('/path/to/foo')).to be_falsey     
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-aws
 version: !ruby/object:Gem::Version
-  version: 7.1.5
+  version: 7.1.6
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-04 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -408,7 +408,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/unit/outputs/sqs_spec.rb
-- vendor/jar-dependencies/org/logstash/plugins/integration/aws/logstash-integration-aws/7.1.5/logstash-integration-aws-7.1.5.jar
+- vendor/jar-dependencies/org/logstash/plugins/integration/aws/logstash-integration-aws/7.1.6/logstash-integration-aws-7.1.6.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache-2.0