fluent-plugin-sns 2.1.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87c37f2b1deda6a5b4805a25b8a41df7fa109b30
-  data.tar.gz: ed7fcfc6e9b947d1b53124a150c8a5e85475a8f4
+  metadata.gz: c35f1599ebe9e156c55ee4e985fea312eaf862ac
+  data.tar.gz: 2aa903bae1f77f667a16eea2a64a119fc3b7042e
 SHA512:
-  metadata.gz: 34f1045f519263a3731abe878a5208fdad121932e897b92c71f815909b9fdd0deac12f0c4f1573b17c0ea95f87d368ab26c95aa8b86c9084686cb37318731209
-  data.tar.gz: bfd814e554938853faaf27cad70027f53fb78852a57a6affc23ebff05f7e059257623e1022e0ff8bd435eefa52af721ca2bb9a5bd355da09041c61cd0d0eed13
+  metadata.gz: c6dc25c329fd1843ffe7a1ef3f9ada2ffcdbea79d026a70aa1df1912be8cbd874365fdbfeb074eaf69899e89aaf91de2b294a3a369285297412b2694f99c9b23
+  data.tar.gz: 9fc5500948a63e3ac492725c3936ab57335fd1693044f13e9e540e6bf100f5695ddc366473d7ff8b57958e7e0dd0495d2b3eff008caa1da17196ee5d7395936a

data/README.rdoc

@@ -28,16 +28,9 @@ Send fluent-event as message to amazon SNS.
 
       # following attibutes are optional
 
-      sns_endpoint {endpointURL}
-
-      ### endpoint list ###
-      # Asia Pacific (Tokyo) [Default] : sns.ap-northeast-1.amazonaws.com
-      # Asia Pacific (Singapore)       : sns.ap-southeast-1.amazonaws.com
-      # US-East (Virginia)             : sns.us-east-1.amazonaws.com
-      # US-West (Oregon)               : sns.us-west-2.amazonaws.com
-      # US-West (N.California)         : sns.us-west-1.amazonaws.com
-      # EU-West (Ireland)              : sns.eu-west-1.amazonaws.com
-      # South America (São Paulo)      : sns.sa-east-1.amazonaws.com
+      # AWS region (defaults to 'ap-northeast-1'), for a list of all available
+      # regions see: http://docs.aws.amazon.com/general/latest/gr/rande.html#sns_region
+      sns_region {region}
 
       sns_subject_template {template_erb_file_path}
       sns_subject_key {sns_subject_key}
@@ -46,6 +39,12 @@ Send fluent-event as message to amazon SNS.
       sns_body_template {sns_body_template}
       sns_body_key {sns_body_key}
 
+      # SNS Message attributes:
+      # http://docs.aws.amazon.com/sns/latest/dg/SNSMessageAttributes.html
+      # Note that currently only string values are supported.
+      sns_message_attributes {attribute: string_value}
+      sns_message_attributes_keys {attribute: key_in_record_with_string_value}
+
       proxy http(s)://{url}:{port}
 
     </match>
@@ -59,7 +58,7 @@ Send fluent-event as message to amazon SNS.
       type sns
 
       sns_topic_name example
-      
+
       sns_endpoint sns.ap-northeast-1.amazonaws.com
 
       sns_subject_key from

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gemspec.has_rdoc = false
     gemspec.require_paths = ["lib"]
     gemspec.add_dependency "fluentd", "~> 0.10.0"
-    gemspec.add_dependency "aws-sdk-v1", "~> 1"
+    gemspec.add_dependency "aws-sdk", "~> 2"
     gemspec.test_files = Dir["test/**/*.rb"]
     gemspec.files = Dir["lib/**/*", "test/**/*.rb"] + %w[VERSION AUTHORS Rakefile]
     gemspec.executables = []

data/VERSION

@@ -1 +1 @@
-2.1.7
+3.1.0

data/lib/fluent/plugin/out_sns.rb

@@ -1,6 +1,6 @@
 module Fluent
 
-  require 'aws-sdk-v1'
+  require 'aws-sdk'
 
   class SNSOutput < Output
 
@@ -22,7 +22,11 @@ module Fluent
     config_param :sns_body_template, :default => nil
     config_param :sns_body_key, :string, :default => nil
     config_param :sns_body, :string, :default => nil
-    config_param :sns_endpoint, :string, :default => 'sns.ap-northeast-1.amazonaws.com'
+    config_param :sns_message_attributes, :hash, :default => nil
+    config_param :sns_message_attributes_keys, :hash, :default => nil
+    config_param :sns_endpoint, :string, :default => 'sns.ap-northeast-1.amazonaws.com',
+                 :obsoleted => 'Use sns_region instead'
+    config_param :sns_region, :string, :default => 'ap-northeast-1'
     config_param :proxy, :string, :default => ENV['HTTP_PROXY']
 
     def configure(conf)
@@ -32,16 +36,18 @@ module Fluent
     def start
       super
       options = {}
-      options[:sns_endpoint] = @sns_endpoint
-      options[:proxy_uri] = @proxy
+      options[:region] = @sns_region
+      options[:http_proxy] = @proxy
       if @aws_key_id && @aws_sec_key
-        options[:access_key_id] = @aws_key_id
-        options[:secret_access_key] = @aws_sec_key
+        options[:credentials] = Aws::Credentials.new(@aws_key_id, @aws_sec_key)
       end
-      AWS.config(options)
+      Aws.config.update(options)
 
-      @sns = AWS::SNS.new
-      @topic = @sns.topics.find{|topic| @sns_topic_name == topic.name}
+      @sns = Aws::SNS::Resource.new
+      @topic = @sns.topics.find{|topic| @sns_topic_name == topic.arn.split(":")[-1]}
+      if @topic.nil?
+        raise ConfigError, "No topic found for topic name #{@sns_topic_name}."
+      end
 
       @subject_template = nil
       unless @sns_subject_template.nil?
@@ -68,7 +74,13 @@ module Fluent
         record['time'] = Time.at(time).localtime
         body = get_body(record).to_s.force_encoding('UTF-8')
         subject = get_subject(record).to_s.force_encoding('UTF-8').gsub(/(\r\n|\r|\n)/, '')
-        @topic.publish( body, :subject => subject )
+        message_attributes = get_message_attributes(record)
+
+        @topic.publish({
+          message: body,
+          subject: subject,
+          message_attributes: message_attributes,
+        })
       }
     end
 
@@ -85,5 +97,30 @@ module Fluent
       end
       record[@sns_body_key] || @sns_body || record.to_json
     end
+
+    def get_message_attributes(record)
+      message_attributes = {}
+
+      if @sns_message_attributes_keys
+        @sns_message_attributes_keys.each_pair do |attribute, key|
+          value = record[key]
+          if value
+            message_attributes[attribute] = {
+              data_type: "String",
+              string_value: value,
+            }
+          end
+        end
+      elsif @sns_message_attributes
+        @sns_message_attributes.each_pair do |attribute, value|
+          message_attributes[attribute] = {
+            data_type: "String",
+            string_value: value,
+          }
+        end
+      end
+      return message_attributes
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sns
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 3.1.0
 platform: ruby
 authors:
 - Yuri Odagiri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 description: 
 email: ixixizko@gmail.com
 executables: []