logstash-output-sqs 4.0.3 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e49917cc3c13832c699a8f26c8f77befbcd6d2a
-  data.tar.gz: 90c4bbb0079d2acd5625d591686ad131ea01c838
+  metadata.gz: 9b008dd6f526b611717c96ae226b584b1afc450d
+  data.tar.gz: 58bdf896df5f7742d55a37059abc4497d2ae6d57
 SHA512:
-  metadata.gz: 0a74c733ab310d5ff40c11c277d67cd3dc9d34879c0b2ed56b69bfc369a5271dcd2baebd4dbd21b055d4cdc470dd0a878698e224c0e7e561d9bbdd33db12e021
-  data.tar.gz: b1827d18305f340f62ef98b6d95fed39341521097c4d5bc3171862dc9843949fa6acc51a247dccd3f1b0811a19ec5f6bf41ed659df27bd70897389d7a7df3773
+  metadata.gz: e24a6cb38f628a17f7588292bc19e77fef7db1ad37c8cd7bf3940b72639c1e7c8e0ea4c9573927a230a52f345b6a2c770a5391d7342defc743de5e5dc7fe702b
+  data.tar.gz: 287bf712c449d69850ab1fcbf4862d24e0f249ac3b4af2bdc2fcc7960b4e9e60dbbd6e6094b41c3df1881bc170a0498d628419528c9a64c75ac373be4da1535b

data/CHANGELOG.md

@@ -1,5 +1,5 @@
-## 4.0.2
-  - Docs fixes
+## 5.0.0
+  - Breaking: mark deprecated `batch` and `batch_timeout` options as obsolete
 
 ## 4.0.1
   - Docs: Fix doc generation issue by removing extraneous comments.

data/docs/index.asciidoc

@@ -130,18 +130,6 @@ file should look like this:
 ----------------------------------
 
 
-[id="plugins-{type}s-{plugin}-batch"]
-===== `batch`  (DEPRECATED)
-
-  * DEPRECATED WARNING: This configuration item is deprecated and may not be available in future versions.
-  * Value type is <<boolean,boolean>>
-  * Default value is `true`
-
-Set to `true` to send messages to SQS in batches (with the
-`SendMessageBatch` API) or `false` to send messages to SQS individually
-(with the `SendMessage` API). The size of the batch is configurable via
-`batch_events`.
-
 [id="plugins-{type}s-{plugin}-batch_events"]
 ===== `batch_events` 
 
@@ -151,15 +139,6 @@ Set to `true` to send messages to SQS in batches (with the
 The number of events to be sent in each batch. Set this to `1` to disable
 the batch sending of messages.
 
-[id="plugins-{type}s-{plugin}-batch_timeout"]
-===== `batch_timeout`  (DEPRECATED)
-
-  * DEPRECATED WARNING: This configuration item is deprecated and may not be available in future versions.
-  * Value type is <<number,number>>
-  * There is no default value for this setting.
-
-
-
 [id="plugins-{type}s-{plugin}-message_max_size"]
 ===== `message_max_size` 
 

data/lib/logstash/outputs/sqs.rb

@@ -70,17 +70,13 @@ class LogStash::Outputs::SQS < LogStash::Outputs::Base
 
   concurrency :shared
 
-  # Set to `true` to send messages to SQS in batches (with the
-  # `SendMessageBatch` API) or `false` to send messages to SQS individually
-  # (with the `SendMessage` API). The size of the batch is configurable via
-  # `batch_events`.
-  config :batch, :validate => :boolean, :default => true, :deprecated => true
+  config :batch, :validate => :boolean, :default => true, :obsolete => "This option is obsolete. Set 'batch_events' to `1` to disable batching"
 
   # The number of events to be sent in each batch. Set this to `1` to disable
   # the batch sending of messages.
   config :batch_events, :validate => :number, :default => 10
 
-  config :batch_timeout, :validate => :number, :deprecated => 'This setting no longer has any effect.'
+  config :batch_timeout, :validate => :number, :obsolete => 'This setting is obsolete.'
 
   # The maximum number of bytes for any message sent to SQS. Messages exceeding
   # this size will be dropped. See
@@ -113,7 +109,7 @@ class LogStash::Outputs::SQS < LogStash::Outputs::Base
 
   public
   def multi_receive_encoded(encoded_events)
-    if @batch and @batch_events > 1
+    if @batch_events > 1
       multi_receive_encoded_batch(encoded_events)
     else
       multi_receive_encoded_single(encoded_events)

data/logstash-output-sqs.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-sqs'
-  s.version         = '4.0.3'
+  s.version         = '5.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Push events to 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/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/integration/outputs/sqs_spec.rb

@@ -72,7 +72,7 @@ describe LogStash::Outputs::SQS, :integration => true do
     end
 
     context 'with batching disabled' do
-      let(:config) { super.merge('batch' => false) }
+      let(:config) { super.merge('batch_events' => 1) }
 
       it 'publishes to SQS' do
         subject.multi_receive_encoded(sample_events)
@@ -80,9 +80,7 @@ describe LogStash::Outputs::SQS, :integration => true do
       end
     end
 
-    context 'with batching enabled' do
-      let(:config) { super.merge('batch' => true) }
-
+    context 'with batching enabled (default)' do
       it 'publishes to SQS' do
         subject.multi_receive_encoded(sample_events)
         expect(receive_all_messages(@queue_url).count).to eq(sample_events.count)

data/spec/unit/outputs/sqs_spec.rb

@@ -97,24 +97,9 @@ describe LogStash::Outputs::SQS do
       end
     end
 
-    context 'with batching disabled using the `batch` parameter' do
-      let(:config) { super.merge('batch' => false) }
-
-      it 'should call send_message' do
-        expect(sqs).to receive(:send_message).with(:queue_url => queue_url, :message_body => sample_event_encoded).exactly(sample_count).times
-        subject.multi_receive_encoded(sample_events)
-      end
-
-      it 'should not call send_message_batch' do
-        expect(sqs).not_to receive(:send_message_batch)
-        subject.multi_receive_encoded(sample_events)
-      end
-    end
-
     context 'with batching disabled' do
       let(:config) do
         super.merge({
-          'batch' => true,
           'batch_events' => 1,
         })
       end
@@ -134,7 +119,6 @@ describe LogStash::Outputs::SQS do
       let(:batch_events) { 3 }
       let(:config) do
         super.merge({
-          'batch' => true,
           'batch_events' => batch_events,
         })
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-sqs
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 5.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement