fluent-plugin-sqs 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f35cff2c285865d248f20a65dbdc41d232c8988
-  data.tar.gz: aa721c439d7f48ee3fb0f46dcc21297e917f0b0f
+  metadata.gz: f51886fc46c9dff3450a0cd2adb6c3315961ff4f
+  data.tar.gz: a2f22f1ffec81f241b9cfa572401ce7a8e956cd4
 SHA512:
-  metadata.gz: bfa9b1b6b8f3f474fd6e4513c72f00fa5c6ba76cfb96c76cf7edcba0d9f35dc51845ba773d2076615c3f1dd5e65b0d9c36bc091bb66b78d3d85d7e3123c1b016
-  data.tar.gz: f43952a98c200f551eb3d7c848c368647301d01f2ac2f05433d16b3aa0ebd5da8233e3ce7a5f80747fbf5b9fa6e47bddd92bd94a021897cdfc08b23844e58bfa
+  metadata.gz: fddc35298bdcd515cb3161821804f415dc28a6c4f9eb26ca5696649ea92baf338cce5101d2f6a9fc6fcb3cfe1858b5d00fde640792bf339d3f3ed59a0105d9a2
+  data.tar.gz: e8b6c5413fd3675cc9b7bffc3febb454287c69cdf1e046eb04aa6efdb144d9b41cade14434deafcd7e12e9674c7ee9ee7b59f077f14a62da5df452ee86454a3d

data/README.rdoc

@@ -21,8 +21,10 @@ Read events from from amazon SQS.
 
       type sqs
 
-      # following attibutes are required
+      # url as https://sqs.us-west-2.amazonaws.com/123456789012/myqueue
+      sqs_url {queue_url}
 
+      # following attibute is required if you don't declare a sqs_url
       queue_name {queue_instance_key}
 
       # following attibutes are required if you don't use IAM Role nor export credentials to ENV

data/Rakefile

@@ -2,11 +2,8 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/clean'
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.test_files = Dir['test/*_test.rb']
-  t.ruby_opts = ['-rubygems'] if defined? Gem
-  t.ruby_opts << '-I.'
-end
+RSpec::Core::RakeTask.new("spec")
 
 task :default => [:build]

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.8.0

data/lib/fluent/plugin/out_sqs.rb

@@ -16,7 +16,8 @@ module Fluent
 
         config_param :aws_key_id, :string, :default => nil, :secret => true
         config_param :aws_sec_key, :string, :default => nil, :secret => true
-        config_param :queue_name, :string
+        config_param :queue_name, :string, :default => nil
+        config_param :sqs_url, :string, :default => nil
         config_param :create_queue, :bool, :default => true
         config_param :sqs_endpoint, :string, :default => 'sqs.ap-northeast-1.amazonaws.com'
         config_param :delay_seconds, :integer, :default => 0
@@ -34,12 +35,19 @@ module Fluent
                 :access_key_id => @aws_key_id,
                 :secret_access_key => @aws_sec_key)
 
+            @sqs_endpoint = @sqs_url.gsub(/https:\/\/(.*?)\/.*/, '\1') if @sqs_url and not @sqs_endpoint
+
             @sqs = AWS::SQS.new(
                 :sqs_endpoint => @sqs_endpoint)
-            if @create_queue then
+
+            if @create_queue and @queue_name then
                 @queue = @sqs.queues.create(@queue_name)
             else
-                @queue = @sqs.queues.named(@queue_name)
+                if @sqs_url # retrive queue by url
+                  @queue = @sqs.queues[@sqs_url]
+                else
+                  @queue = @sqs.queues.named(@queue_name)
+                end
             end
         end
 

data/spec/spec_helper.rb

@@ -22,4 +22,6 @@ RSpec.configure do |config|
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sqs
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Yuri Odagiri
@@ -14,16 +14,22 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 3
 summary: Amazon SQS input/output plugin for Fluent event collector