logstash-integration-aws 7.1.6-java → 7.1.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 163e3851149d6d1e0be9602a1298359cc355f57177bad417429a5c39840ca768
-  data.tar.gz: deadfc6ba818c8081ad796fc2180e80c189da9842b97e1cace008bb2fab44432
+  metadata.gz: 66108a18e73b5e988bded6e5de34f8a9eb914218c6f1d27f7a3be9cf57763396
+  data.tar.gz: 11a2a73eaa92dd70459940a6f0ea5067dfd2089e7ab5cf2bd5c5ed903a21fbfd
 SHA512:
-  metadata.gz: 21eaa2c5146017e907a18f7e1b1f479ecf708fd6a89fc771c1283a85a919545e02c064d5944ea29ee5d52bb562079816e8365a1063e810e22c5c6ab7a4b6a6b0
-  data.tar.gz: b65ae6b87d7340c8494877f4be303b83042a93769d99ade69c9d7bc27eced6bf3286fbfd30812cf299495ae0d920e124dbce27153c15bcac313d375bb69aaf6c
+  metadata.gz: e3f3b447382601f2437c51acd92772eb0c12d7397d4cd8d4cfb47d664bee6e53a0bf14d76f7434a691526fd9f7c4786c508c45851f5fd057fe8a4802cb3c23d7
+  data.tar.gz: 55fc854162afe32be6f17f5393d50154624c411b5b9fcdd1386e42b9c212b86c56f0fe658a9b01f854fa5c101726f0d1bef7ad6534f4593d431e47dd57b5677a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 7.1.8
+  - adding all supported storage classes for s3 output [#49](https://github.com/logstash-plugins/logstash-integration-aws/pull/49)
+
+## 7.1.7
+  - Remove empty temporary dirs at plugin close [#46](https://github.com/logstash-plugins/logstash-integration-aws/pull/46)
+
 ## 7.1.6
   - Clean up plugin created temporary dirs at startup [#39](https://github.com/logstash-plugins/logstash-integration-aws/pull/39)
 

data/VERSION

@@ -1 +1 @@
-7.1.6
+7.1.8

data/docs/output-s3.asciidoc

@@ -107,7 +107,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-signature_version>> |<<string,string>>, one of `["v2", "v4"]`|No
 | <<plugins-{type}s-{plugin}-size_file>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-ssekms_key_id>> |<<string,string>>|No
-| <<plugins-{type}s-{plugin}-storage_class>> |<<string,string>>, one of `["STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA", "ONEZONE_IA"]`|No
+| <<plugins-{type}s-{plugin}-storage_class>> |<<string,string>>, one of `["STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA", "ONEZONE_IA", "INTELLIGENT_TIERING", "GLACIER", "DEEP_ARCHIVE", "OUTPOSTS", "GLACIER_IR", "SNOW", "EXPRESS_ONEZONE"]`|No
 | <<plugins-{type}s-{plugin}-temporary_directory>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-time_file>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-upload_multipart_threshold>> |<<number,number>>|No
@@ -375,7 +375,7 @@ http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html
 [id="plugins-{type}s-{plugin}-storage_class"]
 ===== `storage_class` 
 
-  * Value can be any of: `STANDARD`, `REDUCED_REDUNDANCY`, `STANDARD_IA`, `ONEZONE_IA`
+  * Value can be any of: `STANDARD`, `REDUCED_REDUNDANCY`, `STANDARD_IA`, `ONEZONE_IA`, `INTELLIGENT_TIERING`, `GLACIER`, `DEEP_ARCHIVE`, `OUTPOSTS`, `GLACIER_IR`, `SNOW`, `EXPRESS_ONEZONE`
   * Default value is `"STANDARD"`
 
 Specifies what S3 storage class to use when uploading the file.

data/lib/logstash/outputs/s3.rb

@@ -114,7 +114,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
 
   # Set the time, in MINUTES, to close the current sub_time_section of bucket.
   # If you also define file_size you have a number of files related to the section and the current tag.
-  # If it's valued 0 and rotation_strategy is 'time' or 'size_and_time' then the plugin reaise a configuration error.
+  # If it's valued 0 and rotation_strategy is 'time' or 'size_and_time' then the plugin raises a configuration error.
   config :time_file, :validate => :number, :default => 15
 
   # If `restore => false` is specified and Logstash crashes, the unprocessed files are not sent into the bucket.
@@ -142,7 +142,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
   # More information about the different storage classes can be found:
   # http://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html
   # Defaults to STANDARD.
-  config :storage_class, :validate => ["STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA", "ONEZONE_IA"], :default => "STANDARD"
+  config :storage_class, :validate => ["STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA", "ONEZONE_IA", "INTELLIGENT_TIERING", "GLACIER", "DEEP_ARCHIVE", "OUTPOSTS", "GLACIER_IR", "SNOW", "EXPRESS_ONEZONE"], :default => "STANDARD"
 
   # Set the directory where logstash will store the tmp files before sending it to S3
   # default to the current OS temporary directory in linux /tmp/logstash
@@ -186,7 +186,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
   config :rotation_strategy, :validate => ["size_and_time", "size", "time"], :default => "size_and_time"
 
   # The common use case is to define permission on the root bucket and give Logstash full access to write its logs.
-  # In some circonstances you need finer grained permission on subfolder, this allow you to disable the check at startup.
+  # In some circumstances you need finer grained permission on sub folder, this allow you to disable the check at startup.
   config :validate_credentials_on_root_bucket, :validate => :boolean, :default => true
 
   # The number of times to retry a failed S3 upload.
@@ -272,6 +272,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
     # This will block the shutdown until all upload are done or the use force quit.
     @file_repository.each_files do |file|
       upload_file(file)
+      clean_temporary_file(file) if Dir.exist?(file.temp_path) && file.size == 0
     end
 
     @uploader.stop # wait until all the current upload are complete

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.6')
+require_jar('org.logstash.plugins.integration.aws', 'logstash-integration-aws', '7.1.8')

data/spec/outputs/s3_spec.rb

@@ -122,7 +122,7 @@ describe LogStash::Outputs::S3 do
 
     describe "Storage Class" do
       context "when configured" do
-        ["STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA", "ONEZONE_IA"].each do |storage_class|
+        ["STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA", "ONEZONE_IA", "INTELLIGENT_TIERING", "GLACIER", "DEEP_ARCHIVE", "OUTPOSTS", "GLACIER_IR", "SNOW", "EXPRESS_ONEZONE"].each do |storage_class|
           it "should return the configured storage class: #{storage_class}" do
             s3 = described_class.new(options.merge({ "storage_class" => storage_class }))
             expect(s3.upload_options).to include(:storage_class => storage_class)
@@ -258,4 +258,25 @@ describe LogStash::Outputs::S3 do
     end
   end
 
+  context "plugin close" do
+    let(:temporary_directory) { Stud::Temporary.pathname }
+    let(:options) { super().merge({ 'temporary_directory' => temporary_directory, 'rotation_strategy' => 'time', 'time_file' => 0.01 }) }
+
+    before do
+      allow(subject).to receive(:bucket_resource).and_return(mock_bucket)
+    end
+
+    it "removes empty directory" do
+      subject.register
+      expect(Dir.exist?(temporary_directory)).to be_truthy
+
+      subject.multi_receive_encoded(events_and_encoded) # creates a temporary dir
+      expect((Dir.entries(temporary_directory) - %w{ . .. }).empty?).to be_falsey
+
+      subject.instance_variable_get(:@periodic_check).execute
+      subject.close
+      expect((Dir.entries(temporary_directory) - %w{ . .. }).empty?).to be_truthy
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-aws
 version: !ruby/object:Gem::Version
-  version: 7.1.6
+  version: 7.1.8
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2024-07-26 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.6/logstash-integration-aws-7.1.6.jar
+- vendor/jar-dependencies/org/logstash/plugins/integration/aws/logstash-integration-aws/7.1.8/logstash-integration-aws-7.1.8.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache-2.0