fluent-plugin-google-cloud 0.2.4 → 0.3.0

data/fluent-plugin-google-cloud.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Fluentd plugin to stream logs to the Google Cloud Platform's logging API}
   gem.homepage      = 'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
   gem.license       = 'Apache 2.0'
-  gem.version       = '0.2.4'
+  gem.version       = '0.3.0'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
 

data/lib/fluent/plugin/out_google_cloud.rb

@@ -36,10 +36,10 @@ module Fluent
     config_param :private_key_path, :string, :default => nil
     config_param :private_key_passphrase, :string, :default => 'notasecret'
 
-    # If fetch_gce_metadata is set to true, we obtain the project_id, zone,
+    # If use_metadata_service is set to true, we obtain the project_id, zone,
     # and vm_id from the GCE metadata service.  Otherwise, those parameters
     # must be specified in the config file explicitly.
-    config_param :fetch_gce_metadata, :bool, :default => true
+    config_param :use_metadata_service, :bool, :default => true
     config_param :project_id, :string, :default => nil
     config_param :zone, :string, :default => nil
     config_param :vm_id, :string, :default => nil
@@ -86,10 +86,10 @@ module Fluent
         end
       end
 
-      unless @fetch_gce_metadata
+      unless @use_metadata_service
         unless @project_id && @zone && @vm_id
           raise Fluent::ConfigError,
-              ('Please specify "project_id", "zone" and "vm_id" if you set "fetch_gce_metadata" to false')
+              ('Please specify "project_id", "zone" and "vm_id" if you set "use_metadata_service" to false')
         end
       end
     end
@@ -101,7 +101,7 @@ module Fluent
 
       @successful_call = false
 
-      if @fetch_gce_metadata
+      if @use_metadata_service
         # Grab metadata about the Google Compute Engine instance that we're on.
         @project_id = fetch_metadata('project/project-id')
         fully_qualified_zone = fetch_metadata('instance/zone')
@@ -114,7 +114,7 @@ module Fluent
       # If this is running on a Managed VM, grab the relevant App Engine
       # metadata as well.
       # TODO: Add config options for these to allow for running outside GCE?
-      attributes_string = @fetch_gce_metadata ?
+      attributes_string = @use_metadata_service ?
           fetch_metadata('instance/attributes/') : ""
       attributes = attributes_string.split
       if (attributes.include?('gae_backend_name') &&
@@ -335,7 +335,7 @@ module Fluent
     def init_api_client
       @client = Google::APIClient.new(
         :application_name => 'Fluentd Google Cloud Logging plugin',
-        :application_version => '0.2.4',
+        :application_version => '0.3.0',
         :retries => 1)
 
       if @auth_method == 'private_key'

data/test/plugin/test_out_google_cloud.rb

@@ -51,7 +51,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   ]
 
   CUSTOM_METADATA_CONFIG = %[
-    fetch_gce_metadata false
+    use_metadata_service false
     project_id #{CUSTOM_PROJECT_ID}
     zone #{CUSTOM_ZONE}
     vm_id #{CUSTOM_VM_ID}
@@ -66,7 +66,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     private_key_path /fake/path/to/key
   ]
   INVALID_CONFIG_MISSING_METADATA_VM_ID = %[
-    fetch_gce_metadata false
+    use_metadata_service false
     project_id #{CUSTOM_PROJECT_ID}
     zone #{CUSTOM_ZONE}
   ]
@@ -156,7 +156,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     begin
       d = create_driver(INVALID_CONFIG_MISSING_METADATA_VM_ID)
     rescue Fluent::ConfigError => error
-      assert error.message.include? 'fetch_gce_metadata'
+      assert error.message.include? 'use_metadata_service'
       exception_count += 1
     end
     assert_equal 1, exception_count
@@ -185,7 +185,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     assert_equal MANAGED_VM_BACKEND_VERSION, d.instance.gae_backend_version
   end
 
-  def test_gce_metadata_does_not_load_when_fetch_gce_metadata_is_false
+  def test_gce_metadata_does_not_load_when_use_metadata_service_is_false
     Fluent::GoogleCloudOutput.any_instance.expects(:fetch_metadata).never
     d = create_driver(CUSTOM_METADATA_CONFIG)
     d.run
@@ -554,6 +554,14 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
                 :status => 200,
                 :headers => {'Content-Length' => FAKE_AUTH_TOKEN.length,
                              'Content-Type' => 'application/json' })
+
+    stub_request(:post, 'https://www.googleapis.com/oauth2/v3/token').
+      with(:body => hash_including({:grant_type => 'refresh_token'})).
+      to_return(:body => "{\"access_token\": \"#{FAKE_AUTH_TOKEN}\"}",
+                :status => 200,
+                :headers => {'Content-Length' => FAKE_AUTH_TOKEN.length,
+                             'Content-Type' => 'application/json' })
+
     # Used for 'private_key' auth.
     stub_request(:post, 'https://accounts.google.com/o/oauth2/token').
       with(:body => hash_including({:grant_type => AUTH_GRANT_TYPE})).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -144,7 +144,6 @@ files:
 - fluent-plugin-google-cloud.gemspec
 - lib/fluent/plugin/out_google_cloud.rb
 - CONTRIBUTING
-- Gemfile.lock
 - Gemfile
 - README.rdoc
 homepage: https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud

data/Gemfile.lock

@@ -1,107 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fluent-plugin-google-cloud (0.2.4)
-      fluentd (>= 0.10)
-      google-api-client (>= 0.8)
-      googleauth (~> 0.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.3.8)
-    autoparse (0.3.3)
-      addressable (>= 2.3.1)
-      extlib (>= 0.9.15)
-      multi_json (>= 1.0.0)
-    cool.io (1.3.0)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    extlib (0.9.16)
-    faraday (0.9.1)
-      multipart-post (>= 1.2, < 3)
-    fluentd (0.12.8)
-      cool.io (>= 1.2.2, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
-      json (>= 1.4.3)
-      msgpack (>= 0.5.11, < 0.6.0)
-      sigdump (~> 0.2.2)
-      string-scrub (>= 0.0.3)
-      tzinfo (>= 1.0.0)
-      tzinfo-data (>= 1.0.0)
-      yajl-ruby (~> 1.0)
-    google-api-client (0.8.6)
-      activesupport (>= 3.2)
-      addressable (~> 2.3)
-      autoparse (~> 0.3)
-      extlib (~> 0.9)
-      faraday (~> 0.9)
-      googleauth (~> 0.3)
-      launchy (~> 2.4)
-      multi_json (~> 1.10)
-      retriable (~> 1.4)
-      signet (~> 0.6)
-    googleauth (0.4.1)
-      faraday (~> 0.9)
-      jwt (~> 1.4)
-      logging (~> 2.0)
-      memoist (~> 0.12)
-      multi_json (= 1.11)
-      signet (~> 0.6)
-    http_parser.rb (0.6.0)
-    i18n (0.7.0)
-    json (1.8.2)
-    jwt (1.4.1)
-    launchy (2.4.3)
-      addressable (~> 2.3)
-    little-plugger (1.1.3)
-    logging (2.0.0)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    memoist (0.12.0)
-    metaclass (0.0.4)
-    minitest (5.6.1)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    msgpack (0.5.11)
-    multi_json (1.11.0)
-    multipart-post (2.0.0)
-    power_assert (0.2.3)
-    rake (10.4.2)
-    retriable (1.4.1)
-    safe_yaml (1.0.4)
-    sigdump (0.2.2)
-    signet (0.6.0)
-      addressable (~> 2.3)
-      extlib (~> 0.9)
-      faraday (~> 0.9)
-      jwt (~> 1.0)
-      multi_json (~> 1.10)
-    string-scrub (0.0.5)
-    test-unit (3.0.9)
-      power_assert
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2015.4)
-      tzinfo (>= 1.0.0)
-    webmock (1.21.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-    yajl-ruby (1.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fluent-plugin-google-cloud!
-  mocha (~> 1.1)
-  rake (>= 10.3.2)
-  test-unit (~> 3.0.2)
-  webmock (>= 1.17.0)