logstash-input-sqs 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbca33a52d6cff51cbe851d9cba61a874804d15dc8675866936740586478751f
-  data.tar.gz: '08c907ba377fa84416e7ae49f161b39909fd361cc710f4ebdd51ae97bd94e852'
+  metadata.gz: 7e5a412aaf0b37b3f1c6673afc9fd8b78556daa2f9376a23d1487d2f67a3dedd
+  data.tar.gz: 9743307a98b4776f11c345a99eca8ebf33f85bb877d06665d65e22f1523f70a8
 SHA512:
-  metadata.gz: 7fd07bb9d70f3a564a878fb42ba8a17421ea5718890ce1b125958280d5d0f2ce7943b7285d7edcec778fdbe0b421e010e5783d8e3aae3617fee0a7d3a0762db7
-  data.tar.gz: '087aff018b51eb2f7eaa233dc730ee817719aa89d4b877fff7b0557a189fe6ca48006a3b753efcac35712d1dbf442881dfb7c33127ee6b031393b8f12f3c58c0'
+  metadata.gz: e7cc7618b904128cec536bc969a866eff79115a572387847be526eb491f7686e57036c37d7c88e6c144c07e42f814a82bfd62e36c1b74638f9bb09828dc791c8
+  data.tar.gz: 216ff224a892a75c6189fec011643af992f014af8cdcf9d2401ecc95687d3eea400a83d218a5b3823cd3f53918f93aef3c78297eea9cc4fd804a8f000e7cd629

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.3.1
+  - Refactoring: used logstash-mixin-aws to leverage shared code to manage `additional_settings` [#64](https://github.com/logstash-plugins/logstash-input-sqs/pull/64)
+
 ## 3.3.0
   - Feature: Add `additional_settings` option to fine-grain configuration of AWS client [#61](https://github.com/logstash-plugins/logstash-input-sqs/pull/61)
 

data/lib/logstash/inputs/sqs.rb

@@ -118,8 +118,7 @@ class LogStash::Inputs::SQS < LogStash::Inputs::Threadable
   end
 
   def setup_queue
-    options = symbolized_settings.merge(aws_options_hash || {})
-    aws_sqs_client = Aws::SQS::Client.new(options)
+    aws_sqs_client = Aws::SQS::Client.new(aws_options_hash || {})
     @poller = Aws::SQS::QueuePoller.new(queue_url(aws_sqs_client), :client => aws_sqs_client)
   rescue Aws::SQS::Errors::ServiceError, Seahorse::Client::NetworkingError => e
     @logger.error("Cannot establish connection to Amazon SQS", exception_details(e))
@@ -198,23 +197,4 @@ class LogStash::Inputs::SQS < LogStash::Inputs::Threadable
     details
   end
 
-  def symbolized_settings
-    @symbolized_settings ||= symbolize_keys_and_cast_true_false(@additional_settings)
-  end
-
-  def symbolize_keys_and_cast_true_false(hash)
-    case hash
-    when Hash
-      symbolized = {}
-      hash.each { |key, value| symbolized[key.to_sym] = symbolize_keys_and_cast_true_false(value) }
-      symbolized
-    when 'true'
-      true
-    when 'false'
-      false
-    else
-      hash
-    end
-  end
-
 end # class LogStash::Inputs::SQS

data/logstash-input-sqs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-sqs'
-  s.version         = '3.3.0'
+  s.version         = '3.3.1'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Pulls events from an Amazon Web Services Simple Queue Service queue"
   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"
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
 
   s.add_runtime_dependency 'logstash-codec-json'
-  s.add_runtime_dependency 'logstash-mixin-aws', '>= 4.3.0'
+  s.add_runtime_dependency 'logstash-mixin-aws', '>= 5.1.0'
 
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency "logstash-codec-json_lines"

data/spec/inputs/sqs_spec.rb

@@ -80,9 +80,8 @@ describe LogStash::Inputs::SQS do
           expect(Aws::SQS::Client).to receive(:new).and_return(mock_sqs)
           # mock a remote call to retrieve the queue URL
           expect(mock_sqs).to receive(:get_queue_url).with({ :queue_name => queue_name }).and_return({:queue_url => queue_url })
-          expect(subject).to receive(:symbolized_settings) do |arg|
-            expect(arg).to include({:force_path_style => true, :ssl_verify_peer => false, :profile => 'logstash'})
-          end.and_call_original
+
+          expect(subject.aws_options_hash).to include({:force_path_style => true, :ssl_verify_peer => false, :profile => 'logstash'})
 
           expect { subject.register }.not_to raise_error
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-sqs
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 5.1.0
   name: logstash-mixin-aws
   prerelease: false
   type: :runtime
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: