fluent-plugin-ec2-metadata 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3be414ed2fcd404b35e6f3404dbb06c218937790
-  data.tar.gz: 47de0d493e38ef9fe37063df3d11ed56547f98bb
+  metadata.gz: 6ee9946a828877a04eb144f77d133e8e323d66b6
+  data.tar.gz: 88dfce584d35db6c01607ad33be8b5d6c3535c5a
 SHA512:
-  metadata.gz: 7565573ed716e8f834bc5d7198d3d06db2636874783440239cc31ecc093c761ed32f8aa6354bf4b71fb440cbebed7f44bff603ab1364b4c783bcb446d507807e
-  data.tar.gz: 69585255c21d28179eee81faf5f1dc06222360b41e86297d5cf217adaf3276fe77e37e0939daf2aed26a5c869f22f2262f2be405397d4dbdcc4d1bd959ff40e3
+  metadata.gz: 10d687358f19ce66463c52d1519a6785aa579d038e904dfbb2fd23191aab594dbf8fa2c06ad14e6b50361e205ed298977b59c6c85127dea37f078d1c62a6e25f
+  data.tar.gz: 28b29b5c2e79ea3904ad09dd4c6b63e499bcc179a5aa46cc4e05fbc8fdf3b2e759814aa3e68a2ca1bfa8d6576f56f9c1bc4ff8f0e82586ae73ac0e96e51f992c

data/.travis.yml

@@ -12,3 +12,4 @@ matrix:
     - rvm: 2.0.*
       gemfile: Gemfile
 before_install: gem update bundler
+after_script: codeclimate-test-reporter

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.12"
+  spec.version       = "0.0.13"
   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}

data/lib/fluent/plugin/ec2_metadata.rb

@@ -15,7 +15,6 @@ module Fluent
       @map = {}
       conf.elements.select { |element| element.name == 'record' }.each { |element|
         element.each_pair { |k, v|
-          element.has_key?(k)
           @map[k] = v
         }
       }
@@ -24,10 +23,10 @@ module Fluent
 
       # get metadata first and then setup a refresh thread
       @ec2_metadata = Hash.new
-      set_metadata 
+      set_metadata
       set_tag
       @refresh_thread = Thread.new {
-        while true 
+        while true
           sleep @metadata_refresh_seconds
           set_metadata
           set_tag
@@ -144,7 +143,7 @@ module Fluent
       end
 
       def expand(str)
-        str.gsub(/(\${[a-z_]+(\[-?[0-9]+\])?}|__[A-Z_]+__)/) {
+        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]
         }

data/test/cassettes/ec2-vpc.yml

@@ -416,6 +416,10 @@ http_interactions:
                                     <key>Name</key>
                                     <value>instance-name</value>
                                 </item>
+                                <item>
+                                    <key>aws:cloudformation:stack-name</key>
+                                    <value>mystack</value>
+                                </item>
                             </tagSet>
                         </item>
                     </instancesSet>

data/test/helper.rb

@@ -1,5 +1,5 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 require 'rubygems'
 require 'bundler'

data/test/plugin/test_out_ec2_metadata.rb

@@ -12,6 +12,7 @@ class EC2MetadataOutputTest < Test::Unit::TestCase
     aws_sec_key aws_sec
     <record>
       name ${tagset_name}
+      stack ${tagset_aws:cloudformation:stack-name}
       instance_id ${instance_id}
       az ${availability_zone}
     </record>
@@ -33,7 +34,8 @@ class EC2MetadataOutputTest < Test::Unit::TestCase
         aws_key_id aws_key
         aws_sec_key aws_sec
         <record>
-          name ${tagset_name}
+          name  ${tagset_name}
+          stack ${tagset_aws:cloudformation:stack-name}
         </record>
       ]
       d = create_driver(conf=c)
@@ -55,6 +57,7 @@ class EC2MetadataOutputTest < Test::Unit::TestCase
       assert_equal("subnet-00000000", d.instance.ec2_metadata['subnet_id'])
 
       assert_equal("instance-name", d.instance.ec2_metadata['tagset_name'])
+      assert_equal("mystack", d.instance.ec2_metadata['tagset_aws:cloudformation:stack-name'])
     end
   end
 
@@ -92,7 +95,12 @@ class EC2MetadataOutputTest < Test::Unit::TestCase
       assert_equal "i-0c0c0000.test", d.emits[1][0]
 
       # record
-      mapped = { 'instance_id' => 'i-0c0c0000', 'az' => 'ap-northeast-1b', 'name' => 'instance-name' }
+      mapped = {
+        'instance_id' => 'i-0c0c0000',
+        'az' => 'ap-northeast-1b',
+        'name' => 'instance-name',
+        'stack' => 'mystack'
+      }
       assert_equal [
         {"a" => 1}.merge(mapped),
         {"a" => 2}.merge(mapped),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ec2-metadata
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - SAKAMOTO Takumi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd