fluent-plugin-elb-log 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b54e216c7f743ae8f8663bf1ad475bd840400b
-  data.tar.gz: 7abdf722312a6f6019c39dc9e18779310a3b6ae2
+  metadata.gz: 758e11bd1e39f44c8f3fa111370b4a6c98f47234
+  data.tar.gz: 1d175b06fabd4016957b5093627c948174b7d1e2
 SHA512:
-  metadata.gz: e63ce266899674a4d486ee0fd34dc231a1772d9d478748bb91ec8e26d107185b4ba77afb290ea01d1528cee993fd9d0d9546aac3f090e4be8ea9eabae5423a53
-  data.tar.gz: d61f3d2b30aa47515572a027985f7a81633bd08c74a8b93d6c807c16c4d929b0a1d52808c722a2a4fca504d203a0de26ec906d787925ef5dd7431803233a0e34
+  metadata.gz: 7d603a8276abf6dae8990dd30becde23eb2e1749e621e04d0699cb3ba199c14d62026547855744770c51cbf475cc21f9a3a7ac4cc2bc83fcdf581baee93574a3
+  data.tar.gz: 87062acf6b2809effaa29f8df2db6d26c987511a9452b625b662ed4ee2ee6504a920c06b698f203b744d3653dd4b9bc9cd61c74c00acb2f70b2ddcf1b89d77d3

data/.travis.yml

@@ -0,0 +1,9 @@
+lang: ruby
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.*
+branches:
+  only:
+    - master

data/Rakefile

@@ -1 +1,11 @@
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*.rb'
+  test.verbose = true
+end
+
+desc 'Run tests for all'
+task :default => :test

data/fluent-plugin-elb-log.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-elb-log"
-  spec.version       = "0.0.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["shinsaka"]
   spec.email         = ["shinx1265@gmail.com"]
   spec.summary       = "Amazon ELB log input plugin"
@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "webmock"
 end

data/lib/fluent/plugin/in_elb_log.rb

@@ -1,6 +1,6 @@
 class Fluent::Elb_LogInput < Fluent::Input
   Fluent::Plugin.register_input('elb_log', self)
-  
+
   LOGFILE_REGEXP = /^((?<prefix>.+?)\/|)AWSLogs\/(?<account_id>[0-9]{12})\/elasticloadbalancing\/(?<region>.+?)\/(?<logfile_date>[0-9]{4}\/[0-9]{2}\/[0-9]{2})\/[0-9]{12}_elasticloadbalancing_.+?_(?<logfile_elb_name>[^_]+)_(?<elb_timestamp>[0-9]{8}T[0-9]{4}Z)_(?<elb_ip_address>.+?)_(?<logfile_hash>.+)\.log$/
   ACCESSLOG_REGEXP = /^(?<time>.+?) (?<elb>.+?) (?<client>.+)\:(?<client_port>.+) (?<backend>.+)\:(?<backend_port>.+) (?<request_processing_time>.+?) (?<backend_processing_time>.+?) (?<response_processing_time>.+?) (?<elb_status_code>.+?) (?<backend_status_code>.+?) (?<received_bytes>.+?) (?<sent_bytes>.+?) \"(?<request_method>.+?) (?<request_uri>.+?) (?<request_protocol>.+?)\"$/
 
@@ -15,12 +15,14 @@ class Fluent::Elb_LogInput < Fluent::Input
   def configure(conf)
     super
     require 'aws-sdk'
-    require 'net/http'
-    iam = Net::HTTP.get_response('169.254.169.254','/latest/meta-data/iam/info')
-    if iam.msg != 'OK'
-      raise Fluent::ConfigError.new("access_key_id is required") unless @access_key_id
-      raise Fluent::ConfigError.new("secret_access_key is required") unless @secret_access_key
+
+    if @access_key_id.nil? and has_not_iam_role?
+      raise Fluent::ConfigError.new("access_key_id is required")
+    end
+    if @secret_access_key.nil? and has_not_iam_role?
+      raise Fluent::ConfigError.new("secret_access_key is required")
     end
+
     raise Fluent::ConfigError.new("s3_bucketname is required") unless @s3_bucketname
     raise Fluent::ConfigError.new("timestamp_file is required") unless @timestamp_file
   end
@@ -65,7 +67,7 @@ class Fluent::Elb_LogInput < Fluent::Input
 
   def input
     $log.info "fluent-plugin-elb-log: input start"
-   
+
     # get timestamp last proc
     @timestamp_file.rewind
     timestamp = @timestamp_file.read.to_i
@@ -120,7 +122,7 @@ class Fluent::Elb_LogInput < Fluent::Input
           request_uri: line_match[:request_uri],
           request_protocol: line_match[:request_protocol],
         }
-        
+
         Fluent::Engine.emit("elb.access", Fluent::Engine.now, record_common.merge(record))
       end
       # timestamp save
@@ -131,6 +133,26 @@ class Fluent::Elb_LogInput < Fluent::Input
     end
   end
 
+  def has_iam_role?
+    return @has_iam_role unless @has_iam_role.nil?
+
+    require 'net/http'
+    @has_iam_role  = false
+    begin
+      http = Net::HTTP.new('169.254.169.254', '80')
+      http.open_timeout = 5 # sec
+      response = http.request(Net::HTTP::Get.new('/latest/meta-data/iam/info'))
+      @has_iam_role = true if response.code == '200'
+    rescue => e
+      $log.warn "fluent-plugin-elb-log: #{e.message}"
+    end
+    @has_iam_role
+  end
+
+  def has_not_iam_role?
+    !has_iam_role?
+  end
+
   class TimerWatcher < Coolio::TimerWatcher
     def initialize(interval, repeat, &callback)
       @callback = callback

data/test/helper.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'bundler'
+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
+end
+require 'test/unit'
+require 'webmock/test_unit'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'fluent/test'
+require 'fluent/plugin/in_elb_log'
+
+class Test::Unit::TestCase
+end

data/test/plugin/in_elb_log.rb

@@ -0,0 +1,102 @@
+require_relative '../helper'
+
+class Elb_LogInputTest < Test::Unit::TestCase
+
+  def setup
+    Fluent::Test.setup
+  end
+
+  DEFAULT_CONFIG = {
+    :access_key_id     => 'dummy_access_key_id',
+    :secret_access_key => 'dummy_secret_access_key',
+    :s3_endpoint       => 's3-ap-northeast-1.amazonaws.com',
+    :s3_bucketname     => 'bummy_bucket',
+    :s3_prefix         => 'test',
+    :timestamp_file    => 'elb_last_at.dat',
+    :refresh_interval  => 300
+  }
+
+  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::Elb_LogInput).configure(parse_config conf)
+  end
+
+  def iam_info
+    stub_request(:get, "http://169.254.169.254/latest/meta-data/iam/info")
+  end
+
+  def use_iam_role
+    iam_info.to_return(:status => [200, 'OK'])
+  end
+
+  def not_use_iam_role
+    iam_info.to_return(:status => [404, 'Not Found'])
+  end
+
+  def test_confiture_default
+    use_iam_role
+    assert_nothing_raised { driver = create_driver }
+
+    exception = assert_raise(Fluent::ConfigError) {
+      conf = DEFAULT_CONFIG.clone
+      conf.delete(:s3_bucketname)
+      driver = create_driver(conf)
+    }
+    assert_equal('s3_bucketname is required', exception.message)
+
+    exception = assert_raise(Fluent::ConfigError) {
+      conf = DEFAULT_CONFIG.clone
+      conf.delete(:timestamp_file)
+      driver = create_driver(conf)
+    }
+    assert_equal('timestamp_file is required', exception.message)
+  end
+
+  def test_configure_in_EC2_with_IAM_role
+    use_iam_role
+    conf = DEFAULT_CONFIG.clone
+    conf.delete(:access_key_id)
+    conf.delete(:secret_access_key)
+    assert_nothing_raised { driver = create_driver(conf) }
+  end
+
+  def test_configure_in_EC2_without_IAM_role
+    not_use_iam_role
+    exception = assert_raise(Fluent::ConfigError) {
+      conf = DEFAULT_CONFIG.clone
+      conf.delete(:access_key_id)
+      driver = create_driver(conf)
+    }
+    assert_equal('access_key_id is required', exception.message)
+
+    exception = assert_raise(Fluent::ConfigError) {
+      conf = DEFAULT_CONFIG.clone
+      conf.delete(:secret_access_key)
+      driver = create_driver(conf)
+    }
+    assert_equal('secret_access_key is required', exception.message)
+  end
+
+  def test_configure_outside_EC2
+    iam_info.to_timeout
+
+    assert_nothing_raised { driver = create_driver }
+    exception = assert_raise(Fluent::ConfigError) {
+      conf = DEFAULT_CONFIG.clone
+      conf.delete(:access_key_id)
+      driver = create_driver(conf)
+    }
+    assert_equal('access_key_id is required', exception.message)
+
+    exception = assert_raise(Fluent::ConfigError) {
+      conf = DEFAULT_CONFIG.clone
+      conf.delete(:secret_access_key)
+      driver = create_driver(conf)
+    }
+    assert_equal('secret_access_key is required', exception.message)
+  end
+
+end

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elb-log
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - shinsaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   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: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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: '0'
 description: Amazon ELB log input plugin for fluentd
@@ -73,7 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -81,6 +96,8 @@ files:
 - fluent-plugin-elb-log.gemspec
 - fluent.conf.sample
 - lib/fluent/plugin/in_elb_log.rb
+- test/helper.rb
+- test/plugin/in_elb_log.rb
 homepage: https://github.com/shinsaka/fluent-plugin-elb-log
 licenses:
 - MIT
@@ -91,18 +108,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Amazon ELB log input plugin
-test_files: []
+test_files:
+- test/helper.rb
+- test/plugin/in_elb_log.rb