logstash-input-sqs 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a6fdc994c8c6ebd9175705b27655d59b05077bf
-  data.tar.gz: 27f71b1d9c8c5b3fb3e5f0ff88e89d612dbf68a5
+  metadata.gz: 9a2ff09888677156e06aae67eee1791aadd5ec0e
+  data.tar.gz: b9b80b1bea2c09bfa757afdec78502f9716d2281
 SHA512:
-  metadata.gz: 144dc569bcb78514c165eb2cc4089e2f90069b778537ad6dc501edd03a537f46fda0b9074ca24b01bf2c348b0687f4fb05c4943a6c8cd3edc87b55ba484a44ff
-  data.tar.gz: 5dab8585276679b08119fd525a02b38a428060cce3d02068a6663facf0c5c065f885c99ded701de7c92503819e30c28c6fae12c031c008c070d0455db703c6c3
+  metadata.gz: ed7a86a835f37601ae8cab2dab1e1c0b2cff4124eac04f4ec76044a37488640625b2154d0359867b364e92621352d4395c955c604c6f592f4ec0a52eb305c02f
+  data.tar.gz: 72a7e6174f6181ddc8cf9dec32172ee1a56451d053233eaf3ef750be7a20529e87ffeddc4f08f5f029e967ab1ceccb83faba769c561146033b0ceb054dc7da5a

data/README.md

@@ -1,15 +1,15 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/inputs/sqs.rb

@@ -94,7 +94,6 @@ class LogStash::Inputs::SQS < LogStash::Inputs::Threadable
     require "aws-sdk"
     @logger.info("Registering SQS input", :queue => @queue)
 
-    monkey_patch_aws_retryable_plugin!
     setup_queue
   end
 
@@ -141,6 +140,8 @@ class LogStash::Inputs::SQS < LogStash::Inputs::Threadable
 
     run_with_backoff do
       poller.poll(polling_options) do |messages, stats|
+        break if stop?
+
         messages.each do |message|
           output_queue << handle_message(message)
         end
@@ -171,25 +172,10 @@ class LogStash::Inputs::SQS < LogStash::Inputs::Threadable
       next_sleep =  next_sleep > max_time ? sleep_time : sleep_time * BACKOFF_FACTOR 
 
       retry
-    rescue LogStash::ShutdownSignal
-      # The pipeline is currently shutting down.
-      # we can safely rescue and return, all unacked sqs messages will be resend
-      # when the pipeline is up again.
     end
   end
 
   def convert_epoch_to_timestamp(time)
     LogStash::Timestamp.at(time.to_i / 1000)
   end
-
-  def monkey_patch_aws_retryable_plugin!
-    Aws::Plugins::RetryErrors::ErrorInspector.module_eval do
-      def networking?
-        !@error.is_a?(LogStash::ShutdownSignal) &&
-          (@error.is_a?(Seahorse::Client::NetworkingError) ||
-           Aws::Plugins::RetryErrors::ErrorInspector::NETWORKING_ERRORS.include?(@name) ||
-           @http_status_code == 0)
-      end
-    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         = '1.1.0'
+  s.version         = '2.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Pull events from an Amazon Web Services Simple Queue Service (SQS) queue."
   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"
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
 
   s.add_runtime_dependency 'logstash-codec-json'
   s.add_runtime_dependency "logstash-mixin-aws", ">= 1.0.0"

data/spec/inputs/sqs_spec.rb

@@ -5,11 +5,12 @@ require "logstash/event"
 require "logstash/json"
 require "aws-sdk"
 require "spec_helper"
+require "ostruct"
 
 describe LogStash::Inputs::SQS do
   let(:queue_name) { "the-infinite-pandora-box" }
-  let(:queue_url) { "https://sqs.test.local/#{queue}" }
-  let(:options) do
+  let(:queue_url) { "https://sqs.test.local/#{queue_name}" }
+  let(:config) do
     {
       "region" => "us-east-1",
       "access_key_id" => "123",
@@ -18,8 +19,7 @@ describe LogStash::Inputs::SQS do
     }
   end
 
-  let(:input) { LogStash::Inputs::SQS.new(options) }
-
+  let(:input) { LogStash::Inputs::SQS.new(config) }
   let(:decoded_message) { { "bonjour" => "awesome" }  }
   let(:encoded_message)  { double("sqs_message", :body => LogStash::Json::dump(decoded_message)) }
 
@@ -27,6 +27,7 @@ describe LogStash::Inputs::SQS do
 
   let(:mock_sqs) { Aws::SQS::Client.new({ :stub_responses => true }) }
 
+
   context "with invalid credentials" do
     before do
       expect(Aws::SQS::Client).to receive(:new).and_return(mock_sqs)
@@ -47,6 +48,33 @@ describe LogStash::Inputs::SQS do
       expect { subject.register }.not_to raise_error
     end
 
+    context "when interrupting the plugin" do
+      before do
+        expect(Aws::SQS::Client).to receive(:new).and_return(mock_sqs)
+        expect(mock_sqs).to receive(:get_queue_url).with({ :queue_name => queue_name }).and_return({:queue_url => queue_url })
+        expect(subject).to receive(:poller).and_return(mock_sqs).at_least(:once)
+
+        # We have to make sure we create a bunch of events
+        # so we actually really try to stop the plugin.
+        # 
+        # rspec's `and_yield` allow you to define a fix amount of possible 
+        # yielded values and doesn't allow you to create infinite loop.
+        # And since we are actually creating thread we need to make sure
+        # we have enough work to keep the thread working until we kill it..
+        #
+        # I haven't found a way to make it rspec friendly
+        mock_sqs.instance_eval do
+          def poll(polling_options = {})
+            loop do
+              yield [OpenStruct.new(:body => LogStash::Json::dump({ "message" => "hello world"}))], OpenStruct.new
+            end
+          end
+        end
+      end
+
+      it_behaves_like "an interruptible input plugin"
+    end
+
     context "enrich event" do
       let(:event) { LogStash::Event.new }
 
@@ -66,7 +94,7 @@ describe LogStash::Inputs::SQS do
       subject { input.add_sqs_data(event, message) }
 
       context "when the option is specified" do
-        let(:options) do
+        let(:config) do
           {
             "region" => "us-east-1",
             "access_key_id" => "123",
@@ -107,7 +135,7 @@ describe LogStash::Inputs::SQS do
     end
 
     context "when decoding body" do
-      subject { LogStash::Inputs::SQS::new(options.merge({ "codec" => "json" })) }
+      subject { LogStash::Inputs::SQS::new(config.merge({ "codec" => "json" })) }
 
       it "uses the specified codec" do
         expect(subject.decode_event(encoded_message)["bonjour"]).to eq(decoded_message["bonjour"])

metadata

@@ -1,91 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-sqs
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.0.snapshot
+  name: logstash-core
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.snapshot
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-codec-json
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-mixin-aws
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+  name: logstash-mixin-aws
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
 email: info@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/inputs/sqs.rb
 - logstash-input-sqs.gemspec
 - spec/inputs/sqs_spec.rb
@@ -114,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Pull events from an Amazon Web Services Simple Queue Service (SQS) queue.

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"