fluent-plugin-ec2-metadata 0.0.15 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d2c8b687f111b107457e4d141196b4a04c16bc
-  data.tar.gz: 8b6b74fcecb1a2bc1b845f54049ca65e907ad2d8
+  metadata.gz: ce91cbea4bad7e31c32de08af7f6769d986be51c
+  data.tar.gz: 5c9ba0747b12f50bdb65c2d9386fa1afb18a655d
 SHA512:
-  metadata.gz: 4f2a19de0877c4ffd1c6e45532d09645f1af6f2a64eb37c5996713355bf595af0a4d105416e9e4c7ae6fa0e5d2bcfb3b34932ddd20c02af05075d221d8e3523e
-  data.tar.gz: bf2d28ec7d231966e8ebe24571f2875c1f0476d522d614f4ae8098d3d3f95275c07fe5703a009fd418e5625e38d4467327470a559fd229d8f04485ffcc5ec68d
+  metadata.gz: c8f5b0090c3120c9cedfa29269461901e9106d57a58cb926d7bcf529b51f5c72b22af9680b9cc08d25f960631aa45354cfd334733f6ee28af5a179b50275ad4a
+  data.tar.gz: 96fc722e796512024285c29c5708241d92c97768c4b42a4e0651c04b899d8e11cece1febcf83a7626953c28afea764eada9c19715e2e8f030538b07316eea849

data/.travis.yml

@@ -1,15 +1,8 @@
 rvm:
-  - 2.0.*
   - 2.1.*
   - 2.2.*
   - 2.3.0
 gemfile:
   - Gemfile
-  - Gemfile.fluentd.0.12
-  - Gemfile.fluentd.0.10
-matrix:
-  exclude:
-    - rvm: 2.0.*
-      gemfile: Gemfile
 before_install: gem update bundler
 after_script: codeclimate-test-reporter

data/README.md

@@ -9,6 +9,13 @@
 
 [Fluentd](http://fluentd.org) plugin to add ec2 metadata fields to a event record
 
+## Requirements
+
+| fluent-plugin-ec2-metadata | fluentd    | ruby   |
+|--------------------|------------|--------|
+|  >= 0.0.16            | v0.14.x | >= 2.1 |
+|  0.0.15 <=            | v0.12.x | >= 1.9 |
+
 ## Installation
 Use RubyGems:
 

data/Rakefile

@@ -15,4 +15,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test

data/fluent-plugin-ec2-metadata.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-ec2-metadata"
-  spec.version       = "0.0.15"
+  spec.version       = "0.1.0"
   spec.authors       = ["SAKAMOTO Takumi"]
   spec.email         = ["takumi.saka@gmail.com"]
   spec.description   = %q{Fluentd output plugin to add ec2 metadata fields to a event record}
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency     "fluentd"
+  spec.add_runtime_dependency     "fluentd", "> 0.14.0"
   spec.add_runtime_dependency     "oj"
   spec.add_runtime_dependency     "aws-sdk"
 

data/lib/fluent/plugin/ec2_metadata.rb

@@ -104,19 +104,19 @@ module Fluent
     end
 
     def modify_record(record, tag, tag_parts)
-      @placeholder_expander.prepare_placeholders(record, tag, tag_parts, @ec2_metadata)
+      placeholders = @placeholder_expander.prepare_placeholders(record, tag, tag_parts, @ec2_metadata)
       new_record = record.dup
-      @map.each_pair { |k, v| new_record[k] = @placeholder_expander.expand(v) }
+      @map.each_pair { |k, v| new_record[k] = @placeholder_expander.expand(v, placeholders) }
       new_record
     end
 
     def modify(output_tag, record, tag, tag_parts)
-      @placeholder_expander.prepare_placeholders(record, tag, tag_parts, @ec2_metadata)
+      placeholders = @placeholder_expander.prepare_placeholders(record, tag, tag_parts, @ec2_metadata)
 
-      new_tag = @placeholder_expander.expand(output_tag)
+      new_tag = @placeholder_expander.expand(output_tag, placeholders)
 
       new_record = record.dup
-      @map.each_pair { |k, v| new_record[k] = @placeholder_expander.expand(v) }
+      @map.each_pair { |k, v| new_record[k] = @placeholder_expander.expand(v, placeholders) }
 
       [new_tag, new_record]
     end
@@ -145,13 +145,13 @@ module Fluent
           placeholders.store("${#{k}}", v)
         }
 
-        @placeholders = placeholders
+        placeholders
       end
 
-      def expand(str)
+      def expand(str, placeholders)
         str.gsub(/(\${[a-z_:\-]+(\[-?[0-9]+\])?}|__[A-Z_]+__)/) {
-          @log.warn "ec2-metadata: unknown placeholder `#{$1}` found in a tag `#{@placeholders['${tag}']}`" unless @placeholders.include?($1)
-          @placeholders[$1]
+          @log.warn "ec2-metadata: unknown placeholder `#{$1}` found in a tag `#{placeholders['${tag}']}`" unless placeholders.include?($1)
+          placeholders[$1]
         }
       end
     end

data/lib/fluent/plugin/filter_ec2_metadata.rb

@@ -1,19 +1,15 @@
+require 'fluent/plugin/filter'
 require_relative 'ec2_metadata'
 
-module Fluent
+module Fluent::Plugin
   class EC2MetadataFilter < Filter
     include Fluent::EC2Metadata
 
     Fluent::Plugin.register_filter('ec2_metadata', self)
 
-    # Define `router` method of v0.12 to support v0.10 or earlier
-    unless method_defined?(:router)
-      define_method("router") { Fluent::Engine }
-    end
-
-    config_param :aws_key_id, :string, :default => ENV['AWS_ACCESS_KEY_ID'], :secret => true
-    config_param :aws_sec_key, :string, :default => ENV['AWS_SECRET_ACCESS_KEY'], :secret => true
-    config_param :metadata_refresh_seconds, :integer, :default => 300
+    config_param :aws_key_id, :string, default: ENV['AWS_ACCESS_KEY_ID'], secret: true
+    config_param :aws_sec_key, :string, default: ENV['AWS_SECRET_ACCESS_KEY'], secret: true
+    config_param :metadata_refresh_seconds, :integer, default: 300
 
     attr_reader :ec2_metadata
 

data/lib/fluent/plugin/out_ec2_metadata.rb

@@ -1,34 +1,27 @@
+require 'fluent/plugin/output'
 require_relative 'ec2_metadata'
 
-module Fluent
+module Fluent::Plugin
   class EC2MetadataOutput < Output
-    include EC2Metadata
+    include Fluent::EC2Metadata
 
     Fluent::Plugin.register_output('ec2_metadata', self)
 
-    # Define `router` method of v0.12 to support v0.10 or earlier
-    unless method_defined?(:router)
-      define_method("router") { Fluent::Engine }
-    end
-
-    unless method_defined?(:log)
-      define_method(:log) { $log }
-    end
+    helpers :event_emitter
 
     config_param :output_tag, :string
-    config_param :aws_key_id, :string, :default => ENV['AWS_ACCESS_KEY_ID'], :secret => true
-    config_param :aws_sec_key, :string, :default => ENV['AWS_SECRET_ACCESS_KEY'], :secret => true
-    config_param :metadata_refresh_seconds, :integer, :default => 300
+    config_param :aws_key_id, :string, default: ENV['AWS_ACCESS_KEY_ID'], secret: true
+    config_param :aws_sec_key, :string, default: ENV['AWS_SECRET_ACCESS_KEY'], secret: true
+    config_param :metadata_refresh_seconds, :integer, default: 300
 
     attr_reader :ec2_metadata
 
-    def emit(tag, es, chain)
+    def process(tag, es)
       tag_parts = tag.split('.')
       es.each { |time, record|
         new_tag, new_record = modify(@output_tag, record, tag, tag_parts)
         router.emit(new_tag, time, new_record)
       }
-      chain.next
     rescue => e
       log.warn "ec2-metadata: #{e.class} #{e.message} #{e.backtrace.join(', ')}"
     end

data/test/plugin/test_filter_ec2_metadata.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'fluent/test/driver/filter'
 require 'fluent/plugin/filter_ec2_metadata'
 
 require 'webmock/test_unit'
@@ -21,8 +22,8 @@ class EC2MetadataFilterTest < Test::Unit::TestCase
     @time = Fluent::Engine.now
   end
 
-  def create_driver(conf=CONFIG, tag='test')
-    Fluent::Test::FilterTestDriver.new(Fluent::EC2MetadataFilter, tag).configure(conf)
+  def create_driver(conf=CONFIG)
+    Fluent::Test::Driver::Filter.new(Fluent::Plugin::EC2MetadataFilter).configure(conf)
   end
 
   test 'configure-vpc' do
@@ -71,4 +72,26 @@ class EC2MetadataFilterTest < Test::Unit::TestCase
       assert_equal(nil, d.instance.ec2_metadata['subnet_id'])
     end
   end
+
+  test 'emit' do
+    VCR.use_cassette('ec2-vpc') do
+      d = create_driver
+
+      d.run(default_tag: 'test') do
+        d.feed("a" => 1)
+        d.feed("a" => 2)
+      end
+
+      # record
+      mapped = {
+        'instance_id' => 'i-0c0c0000',
+        'az' => 'ap-northeast-1b',
+        'name' => 'instance-name',
+      }
+      assert_equal [
+        {"a" => 1}.merge(mapped),
+        {"a" => 2}.merge(mapped),
+      ], d.filtered.map{|e| e.last}
+    end
+  end
 end

data/test/plugin/test_out_ec2_metadata.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'fluent/test/driver/output'
 require 'fluent/plugin/out_ec2_metadata'
 
 require 'webmock/test_unit'
@@ -23,8 +24,8 @@ class EC2MetadataOutputTest < Test::Unit::TestCase
     @time = Fluent::Engine.now
   end
 
-  def create_driver(conf=CONFIG, tag='test')
-    Fluent::Test::OutputTestDriver.new(Fluent::EC2MetadataOutput, tag).configure(conf)
+  def create_driver(conf=CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::EC2MetadataOutput).configure(conf)
   end
 
   test 'configure-vpc' do
@@ -85,14 +86,14 @@ class EC2MetadataOutputTest < Test::Unit::TestCase
     VCR.use_cassette('ec2-vpc') do
       d = create_driver
 
-      d.run do
-        d.emit("a" => 1)
-        d.emit("a" => 2)
+      d.run(default_tag: 'test') do
+        d.feed("a" => 1)
+        d.feed("a" => 2)
       end
 
       # tag
-      assert_equal "i-0c0c0000.test", d.emits[0][0]
-      assert_equal "i-0c0c0000.test", d.emits[1][0]
+      assert_equal "i-0c0c0000.test", d.events[0][0]
+      assert_equal "i-0c0c0000.test", d.events[1][0]
 
       # record
       mapped = {
@@ -104,7 +105,7 @@ class EC2MetadataOutputTest < Test::Unit::TestCase
       assert_equal [
         {"a" => 1}.merge(mapped),
         {"a" => 2}.merge(mapped),
-      ], d.records
+      ], d.events.map{|e| e.last}
     end
   end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ec2-metadata
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors:
 - SAKAMOTO Takumi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-01 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -118,8 +118,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.fluentd.0.10
-- Gemfile.fluentd.0.12
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -152,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd output plugin to add ec2 metadata fields to a event record

data/Gemfile.fluentd.0.10

@@ -1,9 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'fluentd', '~> 0.10.43'
-
-gemspec
-
-group :test do
-  gem 'codeclimate-test-reporter', require: nil
-end

data/Gemfile.fluentd.0.12

@@ -1,9 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'fluentd', '~> 0.12.0'
-
-gemspec
-
-group :test do
-  gem 'codeclimate-test-reporter', require: nil
-end