fluent-plugin-amazon_sns 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ef75460ea04488c84f86ac2e8d786dcc3ccf535
-  data.tar.gz: 9e2631dc421c9c10162717a1507fc2117726c2f4
+  metadata.gz: 2b0a087a81fc8241de26ae9801ee3edbde84528b
+  data.tar.gz: 51ad2e47176262ab9d79a130c12a097dabb0c8f2
 SHA512:
-  metadata.gz: 57eba5a6a76400ea92f29516875de83978037b58b8a374281d4b949f46b66c3710c607369ba3d4b106927aba3c76a82c11fa17a0a87baa765cdaa65670dc1a65
-  data.tar.gz: a8736122f171cf24d53c6a1f698a1ff04d611ea691cc76ebadb1ee0d29d0ce775266a5d9f8a436c37f07c27a6c865ac32a3580cade040bba43dd69cebef0c5b2
+  metadata.gz: 9dd19b54b682e7102c7ec2b2a7e592ee9e85f69b9e94164947224e3b346add8d1e9f83663894e0b3f52b745838827e3275619e9b6da74c1aa8be1a58e3612b62
+  data.tar.gz: 9593538a7f29f75967f52e906a9d62d619aa4855d8e0a285e1259c2c63898a87f50a2e99c0019d45d22692d621e97a9e5cda2b5eddebeffa7071eb4d23381a78

data/HISTORY.md

@@ -1,3 +1,8 @@
+### 0.0.6
+
+- Mark `aws_secret_access_key` parameter as secret (cosmo0920)
+- Upgrade aws-sdk to v2 (kaorimatz)
+
 ### 0.0.5
 
 - relax fluentd dependency (makimoto)

data/fluent-plugin-amazon_sns.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "fluentd", "~> 0.10"
-  spec.add_dependency "aws-sdk-v1", "~> 1.12"
+  spec.add_dependency "aws-sdk", "~> 2"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/lib/fluent/plugin/amazon_sns/version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module AmazonSns
-      VERSION = "0.0.5"
+      VERSION = "0.0.6"
     end
   end
 end

data/lib/fluent/plugin/out_amazon_sns.rb

@@ -1,4 +1,4 @@
-require "aws-sdk-v1"
+require "aws-sdk"
 
 module Fluent
   class AmazonSNSOutput < BufferedOutput
@@ -11,8 +11,8 @@ module Fluent
     config_set_default :include_time_key, true
 
     config_param :aws_access_key_id, :string, default: nil
-    config_param :aws_secret_access_key, :string, default: nil
-    config_param :aws_region, :string, default: nil
+    config_param :aws_secret_access_key, :string, default: nil, secret: true
+    config_param :aws_region, :string, default: ENV['AWS_REGION'] || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
     config_param :aws_proxy_uri, :string, default: ENV['HTTP_PROXY']
 
     config_param :subject_key, :string, default: nil
@@ -36,18 +36,19 @@ module Fluent
                          else
                            raise Fluent::ConfigError, "no one way specified to decide target"
                          end
+    end
+
+    def start
+      super
 
       options = {}
-      [:access_key_id, :secret_access_key, :region, :proxy_uri].each do |key|
+      [:access_key_id, :secret_access_key, :region].each do |key|
         options[key] = instance_variable_get "@aws_#{key}"
       end
+      options[:http_proxy] = @aws_proxy_uri
 
-      AWS.config(options)
-    end
-
-    def start
-      super
-      @sns = AWS::SNS.new
+      sns_client = Aws::SNS::Client.new(options)
+      @sns = Aws::SNS::Resource.new(client: sns_client)
       @topics = get_topics
     end
 
@@ -66,16 +67,16 @@ module Fluent
         topic = @topic_generator.call(tag, record)
         topic = topic.gsub(/\./, '-') if topic # SNS doesn't allow .
         if @topics[topic]
-          @topics[topic].publish(record.to_json, subject: subject)
+          @topics[topic].publish(message: record.to_json, subject: subject)
         else
           $log.error "Could not find topic '#{topic}' on SNS"
         end
       end
     end
 
-    def get_topics()
+    def get_topics
       @sns.topics.inject({}) do |product, topic|
-        product[topic.name] = topic
+        product[topic.arn.split(/:/).last] = topic
         product
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-amazon_sns
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tatsuhiko Miyagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Fluent output plugin to send to Amazon SNS