fluent-plugin-rds-log 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af2ad022bfc6adfe2df08b831c7355ad301d0101
-  data.tar.gz: 60ed9e0202423282af89ae41c5a9f3680382e6e0
+  metadata.gz: 100e761ba4bf2026359c5f82740808b063c8a326
+  data.tar.gz: d262031aba300c0c1d83b0bbe277b36e76ad8d91
 SHA512:
-  metadata.gz: '038e385f56381fbd9076f02d6952fe6d2c56af76df8fb9d7337f1b94a18e8cdca69d7972070daf44a7d377177dd0a614d5d57be77246221454780e2ab1059137'
-  data.tar.gz: 6065cfc37c1eba8d9604888e9596fcdaf18af3c4171151482153dfedf95bf8e4ecd595c05baf8e56eea2389de884accdb43297100f1e0952eccb95a776004f64
+  metadata.gz: da8d43d78575d074a82b0d519cf12c89d861a5cbc769aca5971c7a1315ea1e33b68b5ce85bfe1b12de83dbfe1683d0ac970dd302bacea9b6a37d80b80b2f28ee
+  data.tar.gz: 1e56100f1d83482270327ffcb12556fc4777fa40c3891a099a1bedb57682f5e8df5bd099aa89e39dbe84dafd78ed0bcfa646045a94b4259beb8cbcbd73d2a03f

data/fluent-plugin-rds-log.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-rds-log"
-  gem.version       = "0.3.0"
+  gem.version       = "0.3.1"
   gem.authors       = ["shinsaka"]
   gem.email         = ["shinx1265@gmail.com"]
   gem.description   = "Amazon RDS slow_log and general_log input plugin for Fluent event collector"
@@ -18,5 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "fluentd", ">= 0.14.0", "< 2"
   gem.add_dependency "mysql2",  "~> 0.4.1"
   gem.add_development_dependency 'rake', '~> 10.0', '>= 10.0.4'
-  gem.add_development_dependency 'test-unit', '~> 3.1', '>= 3.1.0'
+  gem.add_development_dependency "test-unit", "~> 3.2"
+  gem.add_development_dependency "webmock", "~>3"
+  gem.add_development_dependency "simplecov", "~>0"
 end

data/lib/fluent/plugin/in_rds_log.rb

@@ -27,7 +27,7 @@ class Fluent::Plugin::Rds_LogInput < Fluent::Plugin::Input
   def configure(conf)
     super
     if @log_type.nil?
-      $log.error "fluent-plugin-rds-log: missing parameter log_type is {slow_log|general_log}"
+      log.error "fluent-plugin-rds-log: missing parameter log_type is {slow_log|general_log}"
     end
   end
 
@@ -56,7 +56,7 @@ class Fluent::Plugin::Rds_LogInput < Fluent::Plugin::Input
       })
       return client
     rescue
-      $log.error "fluent-plugin-rds-log: cannot connect RDS [#{host}]"
+      log.error "fluent-plugin-rds-log: cannot connect RDS [#{host}]"
     end
     return nil
   end
@@ -92,8 +92,8 @@ class Fluent::Plugin::Rds_LogInput < Fluent::Plugin::Input
       end
       output_log_data = client.query(sql, :cast => false)
     rescue Exception => e
-      $log.error "fluent-plugin-rds-log: ERROR Occurred!"
-      $log.error "#{e.message}\n#{e.backtrace.join("\n")}"
+      log.error "fluent-plugin-rds-log: ERROR Occurred!"
+      log.error "#{e.message}\n#{e.backtrace.join("\n")}"
       return nil
     end
   end

data/test/helper.rb

@@ -1,29 +1,20 @@
-require 'rubygems'
-require 'bundler'
+require 'bundler/setup'
+require 'test/unit'
+require 'webmock/test_unit'
+require 'simplecov'
 
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
+SimpleCov.start do
+  add_filter '/test/'
 end
-require "test/unit"
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require "fluent/test"
-unless ENV.has_key?("VERBOSE")
-  nulllogger = Object.new
-  nulllogger.instance_eval {|obj|
-    def method_missing(method, *args)
-      #pass
-    end
-  }
-  $log = nulllogger
-end
-
-require "fluent/plugin/in_rds_log"
+$LOAD_PATH.unshift(File.join(__dir__, '..', 'lib'))
+$LOAD_PATH.unshift(__dir__)
+require 'fluent/test'
+require 'fluent/test/helpers'
+require 'fluent/test/driver/input'
+require 'fluent/plugin/in_rds_log'
 
 class Test::Unit::TestCase
+  include Fluent::Test::Helpers
+  extend Fluent::Test::Helpers
 end

data/test/plugin/test_in_rds_log.rb

@@ -0,0 +1,56 @@
+require_relative '../helper'
+
+class Rds_LogInputTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  DEFAULT_CONFIG = {
+    host: 'endpoint.abcdefghijkl.ap-northeast-1.rds.amazonaws.com',
+    username: 'testuser',
+    password: 'testpass',
+    refresh_interval: 30,
+    auto_reconnect: true,
+    tag: 'rds-general-log',
+    add_host: true,
+    where: 'argument',
+  }
+
+
+  def parse_config(conf = {})
+    ''.tap{|s| conf.each { |k, v| s << "#{k} #{v}\n" } }
+  end
+
+  def create_driver(conf = DEFAULT_CONFIG)
+    Fluent::Test::InputTestDriver.new(Fluent::Plugin::Rds_LogInput).configure(parse_config conf)
+  end
+
+  def iam_info_url
+    'http://169.254.169.254/latest/meta-data/iam/security-credentials/'
+  end
+
+  def use_iam_role
+    stub_request(:get, iam_info_url)
+      .to_return(status: [200, 'OK'], body: "hostname")
+    stub_request(:get, "#{iam_info_url}hostname")
+      .to_return(status: [200, 'OK'],
+                 body: {
+                   "AccessKeyId" => "dummy",
+                   "SecretAccessKey" => "secret",
+                   "Token" => "token"
+                 }.to_json)
+  end
+
+  def test_configure
+    use_iam_role
+    d = create_driver
+    assert_equal 'endpoint.abcdefghijkl.ap-northeast-1.rds.amazonaws.com', d.instance.host
+    assert_equal 'testuser', d.instance.username
+    assert_equal 'testpass', d.instance.password
+    assert_equal 30, d.instance.refresh_interval
+    assert_equal true, d.instance.auto_reconnect
+    assert_equal 'rds-general-log', d.instance.tag
+    assert_equal true, d.instance.add_host
+    assert_equal 'argument', d.instance.where
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rds-log
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - shinsaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-27 00:00:00.000000000 Z
+date: 2018-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -70,20 +70,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 description: Amazon RDS slow_log and general_log input plugin for Fluent event collector
 email:
 - shinx1265@gmail.com
@@ -101,7 +123,7 @@ files:
 - fluent.conf.sample
 - lib/fluent/plugin/in_rds_log.rb
 - test/helper.rb
-- test/plugin/test_in_rds_slowlog.rb
+- test/plugin/test_in_rds_log.rb
 homepage: https://github.com/shinsaka/fluent-plugin-rds-log
 licenses:
 - MIT
@@ -128,4 +150,4 @@ specification_version: 4
 summary: Amazon RDS for MySQL log input plugin
 test_files:
 - test/helper.rb
-- test/plugin/test_in_rds_slowlog.rb
+- test/plugin/test_in_rds_log.rb

data/test/plugin/test_in_rds_slowlog.rb

@@ -1,27 +0,0 @@
-require 'helper'
-
-class Rds_SlowlogInputTest < Test::Unit::TestCase
-  def setup
-    Fluent::Test.setup
-  end
-
-  CONFIG = %[
-    tag rds-slowlog
-    host localhost
-    username test_rds_user
-    password test_rds_password
-  ]
-
-  def create_driver(conf = CONFIG)
-    Fluent::Test::InputTestDriver.new(Fluent::Rds_LogInput).configure(conf)
-  end
-
-  def test_configure
-    d = create_driver
-    assert_equal 'rds-slowlog', d.instance.tag
-    assert_equal 'localhost', d.instance.host
-    assert_equal 'test_rds_user', d.instance.username
-    assert_equal 'test_rds_password', d.instance.password
-  end
-
-end