fluent-plugin-sqs 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac806e59bc8e71ad1eecb7cc1f3a6fc0c7107d8c
-  data.tar.gz: 01ee1714e4709cadbe7965453abac2d74f664384
+  metadata.gz: 9d3cb56ea2f1a833fa07ff05c7d3783a6bebdc0f
+  data.tar.gz: c680daae717c680cbd2408af7280b5e7406ef19f
 SHA512:
-  metadata.gz: 591e14bd3934e022a5eca41cbf9dd588de7d1976625c2d4eb9a8ae8d32da32eddfa52548a2968d63354473169989d7cc3eb9613713cd960db623e743ed7dd2a8
-  data.tar.gz: 82b30c47720e3daabe83efcba3dbb91ac24f53dc87439926b0afb36c93387d7646f94806267a2a84dfd86b57aab38119c77d9ac0adcdd76955388570dfc265df
+  metadata.gz: c53d5a1d95b9629446f5cc4dc8f065d7af2a1d14774e42187736b8057f4dfc56512c28c57dc3b931e484a94f7d888232bbab0923820876491e82f6054a8e5390
+  data.tar.gz: 5c653c3ef79d9ea96c08d0b63e6b6a1e91d8b38ea2f8c487315eafed7df72ba6008bf82c0df10898cd061b5edc91f3a5116533d9c1762baaeb9fdbfacc5ed740

data/README.rdoc

@@ -33,10 +33,14 @@ Read events from from amazon SQS.
       aws_sec_key {your_aws_secret_key}
 
       # following attibutes are optional
-    　
+
       create_queue {boolean}
       region {your_region}
 
+      # following attributes are required if you use FIFO queue
+
+      message_group_id {string}
+
       ### region list ###
       # Asia Pacific (Tokyo) [Default] : ap-northeast-1
       # Asia Pacific (Singapore)       : ap-southeast-1

data/VERSION

@@ -1 +1 @@
-2.1.0
+3.0.0

data/lib/fluent/plugin/in_sqs.rb

@@ -1,5 +1,5 @@
 require 'fluent/plugin/input'
-require 'aws-sdk'
+require 'aws-sdk-sqs'
 
 module Fluent::Plugin
   class SQSInput < Input

data/lib/fluent/plugin/out_sqs.rb

@@ -1,5 +1,5 @@
 require 'fluent/plugin/output'
-require 'aws-sdk'
+require 'aws-sdk-sqs'
 
 module Fluent::Plugin
   SQS_BATCH_SEND_MAX_MSGS = 10
@@ -24,6 +24,7 @@ module Fluent::Plugin
     config_param :delay_seconds, :integer, default: 0
     config_param :include_tag, :bool, default: true
     config_param :tag_property_name, :string, default: '__tag'
+    config_param :message_group_id, :string, default: nil
 
     config_section :buffer do
       config_set_default :@type, DEFAULT_BUFFER_TYPE
@@ -33,6 +34,10 @@ module Fluent::Plugin
       compat_parameters_convert(conf, :buffer, :inject)
       super
 
+      if (!@queue_name.nil? && @queue_name.end_with?('.fifo')) || (!@sqs_url.nil? && @sqs_url.end_with?('.fifo'))
+        raise Fluent::ConfigError, 'message_group_id parameter is required for FIFO queue' if @message_group_id.nil?
+      end
+
       Aws.config = {
         access_key_id: @aws_key_id,
         secret_access_key: @aws_sec_key,
@@ -100,7 +105,10 @@ module Fluent::Plugin
                    "#{SQS_BATCH_SEND_MAX_SIZE} bytes.  " \
                    "(Truncated message: #{body[0..200]})"
         else
-          batch_records << { id: generate_id, message_body: body, delay_seconds: @delay_seconds }
+          id = "#{@tag_property_name}#{SecureRandom.hex(16)}"
+          batch_record = { id: id, message_body: body, delay_seconds: @delay_seconds }
+          batch_record[:message_group_id] = @message_group_id unless @message_group_id.nil?
+          batch_records << batch_record
         end
       end
 
@@ -111,10 +119,5 @@ module Fluent::Plugin
         end
       end
     end
-
-    def generate_id
-      unique_val = ((('a'..'z').to_a + (0..9).to_a)*3).shuffle[0,(rand(10).to_i)].join
-      @tag_property_name + Time.now.to_i.to_s + unique_val
-    end
   end
 end

data/spec/lib/fluent/plugin/out_sqs_spec.rb

@@ -5,10 +5,7 @@ describe Fluent::Plugin::SQSOutput do
   let(:driver) { Fluent::Test::Driver::Output.new(Fluent::Plugin::SQSOutput) }
   subject { driver.instance }
 
-  before do
-    Fluent::Test.setup
-    driver.configure(config)
-  end
+  before { Fluent::Test.setup }
 
   describe '#configure' do
     let(:config) do
@@ -22,10 +19,13 @@ describe Fluent::Plugin::SQSOutput do
          delay_seconds 1
          include_tag false
          tag_property_name TAG_PROPERTY_NAME
+         message_group_id MESSAGE_GROUP_ID
       )
     end
 
     context 'fluentd output configuration settings' do
+      before { driver.configure(config) }
+
       it { expect(subject.aws_key_id).to eq('AWS_KEY_ID') }
       it { expect(subject.aws_sec_key).to eq('AWS_SEC_KEY') }
       it { expect(subject.queue_name).to eq('QUEUE_NAME') }
@@ -35,20 +35,55 @@ describe Fluent::Plugin::SQSOutput do
       it { expect(subject.delay_seconds).to eq(1) }
       it { expect(subject.include_tag).to eq(false) }
       it { expect(subject.tag_property_name).to eq('TAG_PROPERTY_NAME') }
+      it { expect(subject.message_group_id).to eq('MESSAGE_GROUP_ID') }
     end
 
     context 'AWS configuration settings' do
       subject { Aws.config }
 
-      before { driver.instance }
+      before do
+        driver.instance
+        driver.configure(config)
+      end
 
       it { expect(subject[:access_key_id]).to eq('AWS_KEY_ID') }
       it { expect(subject[:secret_access_key]).to eq('AWS_SEC_KEY') }
       it { expect(subject[:region]).to eq('REGION') }
     end
+
+    context 'using Standard queue' do
+      let(:config) { %( queue_name QUEUE_NAME ) }
+
+      it 'does not raises error' do
+        expect { driver.configure(config) }.not_to raise_error(Fluent::ConfigError)
+      end
+    end
+
+    context 'using FIFO queue and sets message_group_id' do
+      let(:config) do
+        %(
+          queue_name QUEUE_NAME.fifo
+          message_group_id MESSAGE_GROUP_ID
+        )
+      end
+
+      it 'does not raise error' do
+        expect { driver.configure(config) }.not_to raise_error(Fluent::ConfigError)
+      end
+    end
+
+    context 'using FIFO queue and does not set message_group_id' do
+      let(:config) { %( queue_name QUEUE_NAME.fifo ) }
+
+      it 'raises error' do
+        expect { driver.configure(config) }.to raise_error(Fluent::ConfigError)
+      end
+    end
   end
 
   describe '#queue' do
+    before { driver.configure(config) }
+
     context 'when create_queue and queue_name are set' do
       let(:config) do
         %(
@@ -109,6 +144,8 @@ describe Fluent::Plugin::SQSOutput do
   end
 
   describe '#write' do
+    before { driver.configure(config) }
+
     let(:config) do
       %(
        queue_name QUEUE_NAME

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sqs
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Yuri Odagiri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -31,19 +31,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 3
 summary: Amazon SQS input/output plugin for Fluent event collector