fluent-plugin-aws-sqs 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e960c029622511a676c30a88311bc2f322d67cf2672b893f109daa0db6a215d2
-  data.tar.gz: 39e66e44e7639f72aaaca42d1d85e3ba21c0da3d11b40f314e5ee3a392037033
+  metadata.gz: 50685c5260965737557cc07ca01975b2fcb055fbab68d2fc0a805242b1a15fac
+  data.tar.gz: 20ce27643d10fe6b80d9f6b48b885c256869e92cc1c8854683b9c3a6ec026a2b
 SHA512:
-  metadata.gz: 6f36ab932217826628fa09056bc7fb3d2f0d0578c1fefcdb4129fe6ff024d79d51a37bc34a70a5956efa3f99fd7548676033f2c073a2724ac4daeec3fca21d4e
-  data.tar.gz: f6333b2e24c65fdda88a5538c605ee149a4165735f08cd69a689c246344bf79e6a3893fc16d1beb30f44b2282682beb6d08c623359972a0e767d59850bcd2c5f
+  metadata.gz: a3a1971248f41a9ef47f3582b3ed786e91ec098c37cef776ab4f5508464256f4a297a5839c8fe49921a7e57385d567f77cb4facc64cc2a0bd1d66204f237edf0
+  data.tar.gz: f4d5d67dc5fdeb0c46841844bf5bbb4f59d700a7a86961ee2fca5f77a594482e140019a9bf7d5d1dc06aaa8d9fe2915d4672e40569de3f88d90e0eed796877a0

data/.gitignore

@@ -5,3 +5,6 @@
 !.vscode/extensions.json
 .history/
 .idea/*
+*.gem
+.bundle/
+vendor/

data/Gemfile.lock

@@ -0,0 +1,69 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-aws-sqs (1.0.1)
+      aws-sdk-sqs (>= 1.22.0)
+      fluentd (>= 0.14.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    aws-eventstream (1.0.3)
+    aws-partitions (1.215.0)
+    aws-sdk-core (3.68.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-sqs (1.22.0)
+      aws-sdk-core (~> 3, >= 3.61.1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+    concurrent-ruby (1.1.5)
+    cool.io (1.5.4)
+    dig_rb (1.0.1)
+    fluentd (1.7.1)
+      cool.io (>= 1.4.5, < 2.0.0)
+      dig_rb (~> 1.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.0)
+      msgpack (>= 1.2.0, < 2.0.0)
+      serverengine (>= 2.0.4, < 3.0.0)
+      sigdump (~> 0.2.2)
+      strptime (>= 0.2.2, < 1.0.0)
+      tzinfo (~> 2.0)
+      tzinfo-data (~> 1.0)
+      yajl-ruby (~> 1.0)
+    http_parser.rb (0.6.0)
+    jmespath (1.4.0)
+    msgpack (1.3.1)
+    power_assert (1.1.5)
+    rake (12.3.3)
+    rr (1.2.1)
+    serverengine (2.1.1)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    strptime (0.2.3)
+    test-unit (3.3.3)
+      power_assert
+    test-unit-rr (1.0.5)
+      rr (>= 1.1.1)
+      test-unit (>= 2.5.2)
+    tzinfo (2.0.0)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2019.3)
+      tzinfo (>= 1.0.0)
+    yajl-ruby (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  fluent-plugin-aws-sqs!
+  rake (~> 12.0)
+  test-unit (>= 3.1.0)
+  test-unit-rr
+
+BUNDLED WITH
+   1.17.3

data/Rakefile

@@ -2,6 +2,6 @@
 require 'rake/testtask'
   Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'tests/**/test_*.rb'
   test.verbose = true
 end

data/lib/fluent/plugin/{in_sqs.rb → in-sqs.rb}

@@ -10,10 +10,10 @@ module Fluent::Plugin
     config_param :aws_key_id, :string, default: nil, secret: true
     config_param :aws_sec_key, :string, default: nil, secret: true
     config_param :tag, :string
-    config_param :region, :string, default: 'ap-northeast-1'
+    config_param :region, :string, default: 'eu-central-1'
     config_param :sqs_url, :string, default: nil
     config_param :receive_interval, :time, default: 0.1
-    config_param :max_number_of_messages, :integer, default: 10
+    config_param :max_number_of_messages, :integer, default: 100
     config_param :wait_time_seconds, :integer, default: 10
     config_param :visibility_timeout, :integer, default: nil
     config_param :delete_message, :bool, default: false
@@ -22,6 +22,23 @@ module Fluent::Plugin
     def configure(conf)
       super
 
+      # configured "port" is referred by `@port` or instance method #port
+      if @aws_key_id == nil
+        raise Fluent::ConfigError, "aws_key_id configuration key is mandatory"
+      end
+
+      if @aws_sec_key == nil
+        raise Fluent::ConfigError, "aws_sec_key configuration key is mandatory"
+      end
+
+      if @tag == nil
+        raise Fluent::ConfigError, "tag configuration key is mandatory"
+      end
+
+      if @sqs_url == nil
+        raise Fluent::ConfigError, "sqs_url configuration key is mandatory"
+      end
+
       Aws.config = {
         access_key_id: @aws_key_id,
         secret_access_key: @aws_sec_key,
@@ -64,8 +81,6 @@ module Fluent::Plugin
       log.warn_backtrace ex.backtrace
     end
 
-    private
-
     def parse_message(message)
       {
         'body' => message.body.to_s,

data/lib/fluent/plugin/version.rb

@@ -1,3 +1,3 @@
 module SQS
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
 end 

data/tests/test_in-sqs.rb

@@ -0,0 +1,80 @@
+require "test-unit"
+require "fluent/test"
+require "fluent/test/driver/input"
+require "fluent/test/helpers"
+require "./lib/fluent/plugin/in-sqs.rb"
+
+class InSqsTest < Test::Unit::TestCase
+  include Fluent::Test::Helpers
+
+  # default configuration for tests
+  DEFAULT_VALID_CONFIG = %[
+    aws_key_id test_aws_key_id
+    aws_sec_key test_aws_sec_key
+    tag test_tag
+    sqs_url http://sqs-url.com
+  ]
+
+  setup do
+    Fluent::Test.setup # this is required to setup router and others
+  end
+
+  def create_driver(conf = DEFAULT_VALID_CONFIG)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::SQSInput).configure(conf)
+  end
+  
+  sub_test_case 'configured with invalid configurations' do
+    test 'should reject because aws_key_id is missing' do
+      assert_raise Fluent::ConfigError do
+        create_driver(%[
+          aws_sec_key test_aws_sec_key
+          tag tag
+          sqs_url http://sqs-url.com
+        ])
+      end
+    end
+
+    test 'should reject because aws_sec_key is missing' do
+      assert_raise Fluent::ConfigError do
+        create_driver(%[
+          aws_key_id test_aws_key_id
+          tag tag
+          sqs_url http://sqs-url.com
+        ])
+      end
+    end
+
+    test 'should reject because tag is missing' do
+      assert_raise Fluent::ConfigError do
+        create_driver(%[
+          aws_sec_key test_aws_sec_key
+          aws_key_id test_aws_key_id
+          sqs_url http://sqs-url.com
+        ])
+      end
+    end
+
+    test 'should reject because sqs_url is missing' do
+      assert_raise Fluent::ConfigError do
+        create_driver(%[
+          aws_sec_key test_aws_sec_key
+          aws_key_id test_aws_key_id
+          tag test_tag
+        ])
+      end
+    end
+
+    test 'params are set correctly' do
+      d = create_driver
+      assert_equal "test_tag", d.instance.tag
+      assert_equal "test_aws_sec_key", d.instance.aws_sec_key
+      assert_equal "test_aws_key_id", d.instance.aws_key_id
+      assert_equal "eu-central-1", d.instance.region
+      assert_equal "http://sqs-url.com", d.instance.sqs_url
+      assert_equal 0.1, d.instance.receive_interval
+      assert_equal 100, d.instance.max_number_of_messages
+      assert_equal 10, d.instance.wait_time_seconds
+    end
+  end # end of configured with invalid configurations sub_test_case
+
+end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-aws-sqs
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Shai Moria
@@ -108,14 +108,14 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - VERSION
 - fluent-plugin-aws-sqs.gemspec
-- lib/fluent/plugin/in_sqs.rb
+- lib/fluent/plugin/in-sqs.rb
 - lib/fluent/plugin/version.rb
-- spec/lib/fluent/plugin/in_sqs_spec.rb
-- spec/spec_helper.rb
+- tests/test_in-sqs.rb
 homepage: https://github.com/zooz/fluent-plugin-aws-sqs
 licenses:
 - Apache-2.0

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

@@ -1,120 +0,0 @@
-require 'spec_helper'
-require 'fluent/plugin/in_sqs'
-
-describe Fluent::Plugin::SQSInput do
-  let(:driver) do
-    Fluent::Test.setup
-    Fluent::Test::Driver::Input.new(Fluent::Plugin::SQSInput).configure(config)
-  end
-  subject { driver.instance }
-
-  describe '#configure' do
-    let(:config) do
-      %(
-         aws_key_id AWS_KEY_ID
-         aws_sec_key AWS_SEC_KEY
-         tag TAG
-         region REGION
-         sqs_url http://SQS_URL
-         receive_interval 1
-         max_number_of_messages 10
-         wait_time_seconds 10
-         visibility_timeout 1
-         delete_message true
-         stub_responses true
-      )
-    end
-
-    context 'fluentd input configuration settings' do
-      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.tag).to eq('TAG') }
-      it { expect(subject.region).to eq('REGION') }
-      it { expect(subject.sqs_url).to eq('http://SQS_URL') }
-      it { expect(subject.receive_interval).to eq(1) }
-      it { expect(subject.max_number_of_messages).to eq(10) }
-      it { expect(subject.wait_time_seconds).to eq(10) }
-      it { expect(subject.visibility_timeout).to eq(1) }
-      it { expect(subject.delete_message).to eq(true) }
-      it { expect(subject.stub_responses).to eq(true) }
-    end
-
-    context 'AWS configuration settings' do
-      subject { Aws.config }
-
-      before { driver.instance }
-
-      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
-  end
-
-  describe '#run' do
-    let(:message_attributes) do
-      {
-        body: 'body',
-        receipt_handle: 'receipt_handle',
-        message_id: 'message_id',
-        md5_of_body: 'md5_of_body',
-        queue_url: 'queue_url',
-        attributes: { 'SenderId' => 'sender_id' }
-      }
-    end
-    let(:queue) { double(:queue, receive_messages: true) }
-    let(:message) { double(:message, **message_attributes.merge(delete: nil)) }
-    let(:messages) { [message] }
-
-    context 'with no delete messages param' do
-      let(:config) do
-        %(
-         tag TAG
-         max_number_of_messages 10
-         wait_time_seconds 10
-         visibility_timeout 1
-         delete_message false
-      )
-      end
-
-      before do
-        allow(subject).to receive(:queue) { queue }
-      end
-
-      it 'parse through messages and emit it' do
-        expect(queue).to receive(:receive_messages)
-          .with(max_number_of_messages: 10, wait_time_seconds: 10, visibility_timeout: 1) { messages }
-        expect(subject).to receive(:parse_message).with(message) { message_attributes }
-        expect(message).not_to receive(:delete)
-        expect(subject.router).to receive(:emit).with('TAG', kind_of(Fluent::EventTime), message_attributes)
-
-        subject.run
-      end
-    end
-
-    context 'with no delete messages param' do
-      let(:config) do
-        %(
-         tag TAG
-         max_number_of_messages 10
-         wait_time_seconds 10
-         visibility_timeout 1
-         delete_message true
-      )
-      end
-
-      before do
-        allow(subject).to receive(:queue) { queue }
-      end
-
-      it 'parse through messages and emit it' do
-        expect(queue).to receive(:receive_messages)
-          .with(max_number_of_messages: 10, wait_time_seconds: 10, visibility_timeout: 1) { messages }
-        expect(subject).to receive(:parse_message).with(message) { message_attributes }
-        expect(message).to receive(:delete)
-        expect(subject.router).to receive(:emit).with('TAG', kind_of(Fluent::EventTime), message_attributes)
-
-        subject.run
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,28 +0,0 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
-
-  require 'fluent/load'
-  require 'fluent/test'
-  require 'fluent/test/helpers'
-  require 'fluent/test/driver/output'
-  require 'fluent/test/driver/input'
-
-  require 'ostruct'
-  require 'pry'
-  require 'rr'
-  # prevent Test::Unit's AutoRunner from executing during RSpec's rake task
-  Test::Unit.run = true if defined?(Test::Unit) && Test::Unit.respond_to?(:run=)
-end