fluent-plugin-gcloud-metadata 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 135a1e2e9934318488499e58501d0cee9617691a
-  data.tar.gz: dcf9c91aae07f032a25d016a01f750eb5525907e
+  metadata.gz: 47ee345230427280907348cc13f19de2d84e0d66
+  data.tar.gz: ab55b3f5088396516edb8a1ca6e8c2e74d8ffbd1
 SHA512:
-  metadata.gz: feac76eca0f0401b2a8d2c2df41c3dfaac295a99f579e65dfd49b538c2d5834eb0d0cb078508857f4f1d81ff71c8688925327bb263825a9686677922fafad4ca
-  data.tar.gz: cccc34125a376067cf8e7e5e31687387bc5e71a5b65dc92a0a85c9d7fdcdab81b8d8d79d4dfca5a6f3768361aeed6aeca65ff377d917351643e96581b400b003
+  metadata.gz: 7230502168c622cbfeb21df0cf3fcb796a0ec9bc804ccf21647afe65c5f3b99809624c788efd7fc136e41ecd6c205c24160d28e83759fbed2a009dc62f06a579
+  data.tar.gz: 19fb51a4427ba319eec00556f602bbd96243da8b4c646591604aec587c69cde936c94d9b01b6f4419b9208c568dd93fc0a297c3890049abd7d305130b6ef5213

data/README.md

@@ -1,6 +1,6 @@
 # Fluentd GoogleCloud Metadata Filter Pluging
 
-[![Build Status](https://travis-ci.org/tourstream/fluentd-plugin-gcloud-metadata.svg?branch=master)](https://travis-ci.org/tourstream/fluentd-plugin-gcloud-metadata)
+[![Build Status](https://travis-ci.org/tourstream/fluent-plugin-gcloud-metadata.svg?branch=master)](https://travis-ci.org/tourstream/fluent-plugin-gcloud-metadata)
 
 
 The plugin uses the google cloud metadata api in [version1](https://cloud.google.com/compute/docs/storing-retrieving-metadata)

data/fluent-plugin-gcloud-metadata.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-gcloud-metadata'
-  s.version       = '1.0.0'
+  s.version       = '1.0.1'
   s.authors       = ['engerim']
   s.email         = ['alexander.miehe@tourstream.eu']
   s.description   = %q{gcloud metadata filter plugin for Fluent. The Plugin adds gcloud metadata to the record }
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = Gem::Requirement.new(">= 2.1".freeze)
 
-  s.add_runtime_dependency 'fluentd', '~> 0.14'
+  s.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 2']
 
   s.add_development_dependency 'rake', '~> 0'
   s.add_development_dependency 'webmock', '~> 2.3'

data/lib/fluent/plugin/filter_gcloud_metadata.rb

@@ -1,10 +1,10 @@
-require 'fluent/filter'
+require 'fluent/plugin/filter'
 require 'net/http'
 require 'uri'
 
-module Fluent
+module Fluent::Plugin
 
-  class GcloudMetadataFilter <  Fluent::Filter
+  class GcloudMetadataFilter <  Filter
     class ConnectionFailure < StandardError; end
     Fluent::Plugin.register_filter('gcloud_metadata', self)
 
@@ -53,4 +53,4 @@ module Fluent
     end
 
   end
-end
+end

data/test/plugin/test_filter_gcloud_metadata.rb

@@ -1,6 +1,7 @@
 require_relative '../helper'
 require 'test/unit'
 require 'fluent/test'
+require 'fluent/test/driver/filter'
 require 'fluent/plugin/filter_gcloud_metadata'
 require 'vcr'
 
@@ -11,7 +12,6 @@ end
 
 
 class TestGcloudMetadataFilter < Test::Unit::TestCase
-
   def setup
     Fluent::Test.setup
   end
@@ -23,8 +23,8 @@ class TestGcloudMetadataFilter < Test::Unit::TestCase
       </metadata>
     ]
 
-  def create_driver(conf = CONFIG, tag='test.input')
-    Fluent::Test::FilterTestDriver.new(Fluent::GcloudMetadataFilter, tag).configure(conf)
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Filter.new(Fluent::Plugin::GcloudMetadataFilter).configure(conf)
   end
 
   def test_filter_metadata
@@ -33,13 +33,13 @@ class TestGcloudMetadataFilter < Test::Unit::TestCase
 
     d = create_driver
     VCR.use_cassette('metadata', :allow_unused_http_interactions => false) do
-      d.run do
-        d.filter input
+      d.run(default_tag: "test.input") do
+        d.feed input
       end
     end
     expected = {'message' => 'foobar', 'gce_project' => 'foobar_project', 'environment' => 'testing'}
 
-    assert_equal expected, d.filtered_as_array[0][2]
+    assert_equal expected, d.filtered.map{|e| e.last}.first
   end
 
   def test_filter_metadata_with_cache
@@ -51,15 +51,18 @@ class TestGcloudMetadataFilter < Test::Unit::TestCase
 
     d = create_driver
     VCR.use_cassette('metadata', :allow_unused_http_interactions => false) do
-      d.run do
+      d.run(default_tag: "test.input") do
         inputs.each do |dat|
-          d.filter dat
+          d.feed dat
         end
       end
     end
-    expected = {'message' => 'foobar2', 'gce_project' => 'foobar_project', 'environment' => 'testing'}
+    expected = [
+      {'message' => 'foobar', 'gce_project' => 'foobar_project', 'environment' => 'testing'},
+      {'message' => 'foobar2', 'gce_project' => 'foobar_project', 'environment' => 'testing'}
+    ]
 
-    assert_equal expected, d.filtered_as_array[1][2]
+    assert_equal expected, d.filtered.map{|e| e.last}
   end
 
   def test_filter_return_orignal_record_for_error
@@ -67,12 +70,12 @@ class TestGcloudMetadataFilter < Test::Unit::TestCase
     input = {'message' => 'foobar'}
 
     d = create_driver
-    d.run do
-      d.filter input
+    d.run(default_tag: "test.input") do
+      d.feed input
     end
 
     expected = {'message' => 'foobar'}
 
-    assert_equal expected, d.filtered_as_array[0][2]
+    assert_equal expected, d.filtered.map{|e| e.last}.first
   end
-end
+end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gcloud-metadata
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - engerim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement