RubyGems - fluent-plugin-ec2-metadata - Versions diffs - 0.0.8 → 0.0.9 - Mend

fluent-plugin-ec2-metadata 0.0.8 → 0.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

checksums.yaml +4 -4
data/.travis.yml +6 -1
data/Gemfile +4 -1
data/README.md +5 -0
data/fluent-plugin-ec2-metadata.gemspec +4 -2
data/lib/fluent/plugin/out_ec2_metadata.rb +22 -17
data/test/cassettes/ec2.yml +300 -0
data/test/helper.rb +12 -1
data/test/plugin/test_out_ec2_metadata.rb +39 -30
metadata +33 -3

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11331e7e781dbae0d5b87b96721317fca8896cd0
-  data.tar.gz: 279d392a4b0e6cfed8a35c63470cc0ae0c9fda95
+  metadata.gz: 6a0cd615badf1c5b2a61d1911c8f51cbb902fe2c
+  data.tar.gz: 57b1f0dc6af6988d3be54a8880e2d3f162615f7c
 SHA512:
-  metadata.gz: 5d6deb719ada83309d99ad4fcf8ea0bee7a716923e4ffedfeb8c1bb3063547d55619a291024fc3388c8d1b0ae742adbde763921dc9bca0c014e1fae696e707bf
-  data.tar.gz: 6ab0f9458d31cef03d8f04aba86d3e05fc36970d81a498103d51e8782bf127b5f2747c2c36d311f410e0df04857801121a03204fe3e067a33c951c72420ee194
+  metadata.gz: 61e1f818cc83363166125539aca48585e6f0b34a454f423c8b559c95730f36b8adf8babf15360eb5983d21895b06631de3eef04feed6a09d1c97a74e4238fa38
+  data.tar.gz: 6d4418525ae1c495dee94d07dda681166c65921287729eda4d9f752e8450d540aaa1945fcd3388735b7998a8b7c85b156fe6173e428eb99ae2557d48a6638da6

data/.travis.yml CHANGED Viewed

@@ -1,4 +1,9 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.2
+  - 2.1
   - 2.0.0
+  - 1.9.3
+script:
+  - bundle exec rake test
+  - bundle exec rake build

data/Gemfile CHANGED Viewed

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
-# Specify your gem's dependencies in fluent-plugin-ec2-metadata.gemspec
 gemspec
+group :test do
+  gem "codeclimate-test-reporter", require: nil
+end

data/README.md CHANGED Viewed

@@ -1,5 +1,10 @@
 # fluent-plugin-ec2-metadata
+[![Gem Version](https://badge.fury.io/rb/fluent-plugin-ec2-metadata.svg)](http://badge.fury.io/rb/fluent-plugin-ec2-metadata)
+[![Build Status](https://travis-ci.org/takus/fluent-plugin-ec2-metadata.svg?branch=master)](https://travis-ci.org/takus/fluent-plugin-ec2-metadata)
+[![Test Coverage](https://codeclimate.com/github/takus/fluent-plugin-ec2-metadata/badges/coverage.svg)](https://codeclimate.com/github/takus/fluent-plugin-ec2-metadata/coverage)
+[![Code Climate](https://codeclimate.com/github/takus/fluent-plugin-ec2-metadata/badges/gpa.svg)](https://codeclimate.com/github/takus/fluent-plugin-ec2-metadata)
 [Fluentd](http://fluentd.org) plugin to add ec2 metadata fields to a event record
 ## Installation

data/fluent-plugin-ec2-metadata.gemspec CHANGED Viewed

@@ -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.8"
+  spec.version       = "0.0.9"
   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}
@@ -18,7 +18,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "vcr"
+  spec.add_development_dependency "webmock"
   spec.add_development_dependency "test-unit", ">= 3.1.0"
   spec.add_runtime_dependency     "fluentd"
-  spec.add_runtime_dependency     "aws-sdk-v1"
+  spec.add_runtime_dependency     "aws-sdk"
 end

data/lib/fluent/plugin/out_ec2_metadata.rb CHANGED Viewed

@@ -12,9 +12,8 @@ module Fluent
       require 'net/http'
     end
-    config_param :output_tag,  :string
-    config_param :aws_key_id,  :string, :default => ENV['AWS_ACCESS_KEY_ID'], :secret => true
+    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
     def configure(conf)
@@ -33,11 +32,11 @@ module Fluent
       # get ec2 metadata
       @ec2_metadata = {}
-      @ec2_metadata['instance_id']       = get_metadata('instance-id')
-      @ec2_metadata['instance_type']     = get_metadata('instance-type')
+      @ec2_metadata['instance_id'] = get_metadata('instance-id')
+      @ec2_metadata['instance_type'] = get_metadata('instance-type')
       @ec2_metadata['availability_zone'] = get_metadata('placement/availability-zone')
-      @ec2_metadata['region']            = @ec2_metadata['availability_zone'].chop
-      @ec2_metadata['mac']               = get_metadata('mac')
+      @ec2_metadata['region'] = @ec2_metadata['availability_zone'].chop
+      @ec2_metadata['mac'] = get_metadata('mac')
       begin
         @ec2_metadata['vpc_id'] = get_metadata("network/interfaces/macs/#{@ec2_metadata['mac']}/vpc-id")
       rescue
@@ -53,20 +52,26 @@ module Fluent
       # get tags
       if @map.values.any? { |v| v.match(/^\${tagset_/) } || @output_tag =~ /\${tagset_/
-        require 'aws-sdk-v1'
+        require 'aws-sdk'
         if @aws_key_id and @aws_sec_key then
-          AWS.config(access_key_id: @aws_key_id, secret_access_key: @aws_sec_key, region: @ec2_metadata['region'])
+          ec2 = Aws::EC2::Client.new(
+            region: @ec2_metadata['region'],
+            access_key_id: @aws_key_id,
+            secret_access_key: @aws_sec_key,
+          )
         else
-          AWS.config(region: @ec2_metadata['region'])
+          ec2 = Aws::EC2::Client.new(
+            region: @ec2_metadata['region'],
+          )
         end
-        response = AWS.ec2.client.describe_instances( { :instance_ids => [ @ec2_metadata['instance_id'] ] })
-        instance = response[:reservation_set].first[:instances_set].first
+        response = ec2.describe_instances({ :instance_ids => [@ec2_metadata['instance_id']] })
+        instance = response.reservations[0].instances[0]
         raise Fluent::ConfigError, "ec2-metadata: failed to get instance data #{response.pretty_inspect}" if instance.nil?
-        instance[:tag_set].each { |tag|
-            @ec2_metadata["tagset_#{tag[:key].downcase}"] = tag[:value]
+        instance.tags.each { |tag|
+          @ec2_metadata["tagset_#{tag.key.downcase}"] = tag.value
         }
       end
     end
@@ -85,9 +90,9 @@ module Fluent
     private
     def get_metadata(f)
-        res = Net::HTTP.get_response("169.254.169.254", "/latest/meta-data/#{f}")
-        raise Fluent::ConfigError, "ec2-metadata: failed to get #{f}" unless res.is_a?(Net::HTTPSuccess)
-        res.body
+      res = Net::HTTP.get_response("169.254.169.254", "/latest/meta-data/#{f}")
+      raise Fluent::ConfigError, "ec2-metadata: failed to get #{f}" unless res.is_a?(Net::HTTPSuccess)
+      res.body
     end
     def modify(output_tag, record, tag, tag_parts)

data/test/cassettes/ec2.yml ADDED Viewed

@@ -0,0 +1,300 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/instance-id
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"1971254081"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '10'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: i-0c0c0000
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/instance-type
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"765393446"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '8'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: m3.large
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/placement/availability-zone
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"1870317889"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '15'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: ap-northeast-1b
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/mac
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"1996419393"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '17'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: 00:c0:00:0c:cc:00
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/network/interfaces/macs/00:c0:00:0c:cc:00/vpc-id
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"1822409025"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '12'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: vpc-00000000
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/network/interfaces/macs/00:c0:00:0c:cc:00/subnet-id
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"1870330753"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '15'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: subnet-00000000
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: post
+    uri: https://ec2.ap-northeast-1.amazonaws.com/
+    body:
+      encoding: UTF-8
+      string: Action=DescribeInstances&InstanceId.1=i-0c0c0000&Version=2015-10-01
+    headers:
+      Content-Type:
+      - application/x-www-form-urlencoded; charset=utf-8
+      Accept-Encoding:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby2/2.2.5 ruby/2.1.4 x86_64-linux
+      X-Amz-Date:
+      - 20151213T100607Z
+      Host:
+      - ec2.ap-northeast-1.amazonaws.com
+      Content-Length:
+      - '67'
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/xml;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Vary:
+      - Accept-Encoding
+      Date:
+      - Sun, 13 Dec 2015 10:06:07 GMT
+      Server:
+      - AmazonEC2
+    body:
+      encoding: UTF-8
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2015-10-01/">
+            <requestId>00f71347-3b87-4f5b-a60f-8c46d76ea808</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-44d8965d</reservationId>
+                    <ownerId>000000000000</ownerId>
+                    <groupSet/>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-0c0c0000</instanceId>
+                            <tagSet>
+                                <item>
+                                    <key>Name</key>
+                                    <value>instance-name</value>
+                                </item>
+                            </tagSet>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 10:06:07 GMT
+recorded_with: VCR 3.0.0

data/test/helper.rb CHANGED Viewed

@@ -1,3 +1,6 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 require 'rubygems'
 require 'bundler'
 begin
@@ -7,10 +10,11 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+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
@@ -22,6 +26,13 @@ unless ENV.has_key?('VERBOSE')
   $log = nulllogger
 end
+require 'vcr'
+VCR.configure do |config|
+  config.cassette_library_dir = 'test/cassettes'
+  config.hook_into :webmock
+  config.ignore_hosts 'codeclimate.com'
+end
 require 'fluent/plugin/out_ec2_metadata'
 class Test::Unit::TestCase

data/test/plugin/test_out_ec2_metadata.rb CHANGED Viewed

@@ -1,50 +1,59 @@
 require 'helper'
+require 'webmock/test_unit'
+WebMock.disable_net_connect!
 class EC2MetadataOutputTest < Test::Unit::TestCase
-  def setup
-    Fluent::Test.setup
-  end
   CONFIG = %[
     output_tag ${instance_id}.${tag}
+    aws_key_id aws_key
+    aws_sec_key aws_sec
     <record>
+      name ${tagset_name}
       instance_id ${instance_id}
-      az          ${availability_zone}
+      az ${availability_zone}
     </record>
   ]
-  def create_driver(conf = CONFIG, tag='test')
-    Fluent::Test::OutputTestDriver.new(Fluent::EC2MetadataOutput, tag).configure(conf)
+  def setup
+    Fluent::Test.setup
+    @time = Fluent::Engine.now
   end
-  def get_instance_id
-    Net::HTTP.get_response('169.254.169.254', '/latest/meta-data/instance-id').body
+  def create_driver(conf=CONFIG, tag='test')
+    Fluent::Test::OutputTestDriver.new(Fluent::EC2MetadataOutput, tag).configure(conf)
   end
-  def get_avaivality_zone
-    Net::HTTP.get_response('169.254.169.254', '/latest/meta-data/placement/availability-zone').body
+  test 'configure' do
+    VCR.use_cassette('ec2') do
+      d = create_driver
+      assert_equal("${instance_id}.${tag}", d.instance.output_tag)
+      assert_equal("aws_key", d.instance.aws_key_id)
+      assert_equal("aws_sec", d.instance.aws_sec_key)
+    end
   end
-  def test_emit
-    d = create_driver(CONFIG, 'foo.bar')
-    d.run do
-      d.emit("a" => 1)
-      d.emit("a" => 2)
+  test 'emit' do
+    VCR.use_cassette('ec2') do
+      d = create_driver
+      d.run do
+        d.emit("a" => 1)
+        d.emit("a" => 2)
+      end
+      # tag
+      assert_equal "i-0c0c0000.test", d.emits[0][0]
+      assert_equal "i-0c0c0000.test", d.emits[1][0]
+      # record
+      mapped = { 'instance_id' => 'i-0c0c0000', 'az' => 'ap-northeast-1b', 'name' => 'instance-name' }
+      assert_equal [
+        {"a" => 1}.merge(mapped),
+        {"a" => 2}.merge(mapped),
+      ], d.records
     end
-    instance_id = get_instance_id
-    availability_zone = get_avaivality_zone
-    # tag
-    assert_equal "#{instance_id}.foo.bar", d.emits[0][0]
-    assert_equal "#{instance_id}.foo.bar", d.emits[1][0]
-    # record
-    mapped = { 'instance_id' => instance_id, 'az' => availability_zone }
-    assert_equal [
-      {"a" => 1}.merge(mapped),
-      {"a" => 2}.merge(mapped),
-    ], d.records
   end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ec2-metadata
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - SAKAMOTO Takumi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  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'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,6 +109,7 @@ files:
 - Rakefile
 - fluent-plugin-ec2-metadata.gemspec
 - lib/fluent/plugin/out_ec2_metadata.rb
+- test/cassettes/ec2.yml
 - test/helper.rb
 - test/plugin/test_out_ec2_metadata.rb
 homepage: https://github.com/takus/fluent-plugin-ec2-metadata
@@ -108,5 +137,6 @@ signing_key:
 specification_version: 4
 summary: Fluentd output plugin to add ec2 metadata fields to a event record
 test_files:
+- test/cassettes/ec2.yml
 - test/helper.rb
 - test/plugin/test_out_ec2_metadata.rb