logstash-input-s3-sns-sqs 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7484934d1a9826d562d1a1949bef243f398ead37282b5f78a6d274765b891d0
-  data.tar.gz: c7595e2a337910dabfc862bd0588aa206f0039a1a174512e3aae961536bcb1f2
+  metadata.gz: 4f090986d9b42c172402ba4b1b31c60d0ddbce1d76f160cf6ad9fcb02bbcccb9
+  data.tar.gz: a281caf8e678835b008e927ac7ca81f3edab6448f1932c8fec2116623e263e8b
 SHA512:
-  metadata.gz: 5e48df7a8f5240acfae4e84aa9995130448440279e706f734e1867ed18ce543c003b5ff046b937278b1b8956c93c1432a333b95c7b055bfd0e6b1b504ab555e2
-  data.tar.gz: 50c0b7bf135e0e347c6045e1b60f749348687a3848829c3a8b767e9caa2695953c0746f504bfc52e3be5f75feb1b61f59d3a2a2182918aedb2af0dd767d16ad0
+  metadata.gz: 993b13ece9f6fc0ac31231ea028780a4108e621c3f9e9efd905fb51f54f8aa0760b736138557fc02307ec9feeb78efdade413e9226704e8a876d397acc8f9916
+  data.tar.gz: 6d221eb99ace6783e81e89543c84be4693d2de5a8591103ac8b4c5eeb449add26144f54ea77d1798926a9959e1fbfadac58b8170f035edac95d31b525ecf10c4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+##2.1.1
+- FEATURE: Enable Multiregion Support for included S3 client.
+- Add region by bucket feature
 ##2.1.0
 - FEATURE: Add S3 metadata -> config :include_object_properties
 - FEATURE: Watch for threads in exception state and restart...

data/lib/logstash/inputs/s3/client_factory.rb

@@ -10,6 +10,7 @@ class S3ClientFactory
     @aws_options_hash.merge!(@s3_default_options) unless @s3_default_options.empty?
     @sts_client = Aws::STS::Client.new(region: options[:aws_region])
     @credentials_by_bucket = options[:s3_credentials_by_bucket]
+    @region_by_bucket = options[:s3_region_by_bucket]
     @logger.debug("Credentials by Bucket", :credentials => @credentials_by_bucket)
     @default_session_name = options[:s3_role_session_name]
     @clients_by_bucket = {}
@@ -24,6 +25,9 @@ class S3ClientFactory
         unless @credentials_by_bucket[bucket_name].nil?
           options.merge!(credentials: get_s3_auth(@credentials_by_bucket[bucket_name]))
         end
+        unless @region_by_bucket[bucket_name].nil?
+          options.merge!(region: @region_by_bucket[bucket_name])
+        end
         @clients_by_bucket[bucket_symbol] = Aws::S3::Client.new(options)
         @logger.debug("Created a new S3 Client", :bucket_name => bucket_name, :client => @clients_by_bucket[bucket_symbol], :used_options => options)
       end

data/lib/logstash/inputs/s3snssqs.rb

@@ -193,6 +193,7 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
     FileUtils.mkdir_p(@temporary_directory) unless Dir.exist?(@temporary_directory)
     @id ||= "Unknown" #Use INPUT{ id => name} for thread identifier
     @credentials_by_bucket = hash_key_is_regex({})
+    @region_by_bucket = hash_key_is_regex({})
     # create the bucket=>folder=>codec lookup from config options
     @codec_by_folder = hash_key_is_regex({})
     @type_by_folder = hash_key_is_regex({})
@@ -227,6 +228,9 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
       if options.key?('credentials')
         @credentials_by_bucket[bucket] = options['credentials']
       end
+      if options.key?('region')
+        @region_by_bucket[bucket] = options['region']
+      end
       if options.key?('folders')
         # make these hashes do key lookups using regex matching
         folders = hash_key_is_regex({})
@@ -261,6 +265,7 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
       aws_region: @region,
       s3_default_options: @s3_default_options,
       s3_credentials_by_bucket: @credentials_by_bucket,
+      s3_region_by_bucket: @region_by_bucket,
       s3_role_session_name: @s3_role_session_name
     }, aws_options_hash)
     @s3_downloader = S3Downloader.new(@logger, @received_stop, {

data/logstash-input-s3-sns-sqs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-s3-sns-sqs'
-  s.version         = '2.1.0'
+  s.version         = '2.1.1'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Get logs from AWS s3 buckets as issued by an object-created event via sns -> sqs."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-s3-sns-sqs
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Christian Herweg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement