fluent-plugin-google-cloud 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8625be40328ad3c14dd4596985a1017092c2884a
-  data.tar.gz: d39dc933fdc5c0db8830c83ed94bd19f1db147da
+  metadata.gz: d5af03ce7a0e466c5bf132e69b7720f11edc41c7
+  data.tar.gz: c6726cb7a73c3cdae27e24ec78b444d82123790f
 SHA512:
-  metadata.gz: d60286af889814e55fa15012b8fcdd5d1114ea2e14c420fdce8d7942d33479378e26cf2074cb02b2ab08a1943052a1f4ce3fa5de75a4526eeb0974c17c3e4da3
-  data.tar.gz: 67d62b7f2292cdc4d1a98aa5a7591d7d838ce923764c5055c5da3a92c00edbb84558b1e73535e758f7c335b29074c743c48a6439de42db1cff29d9cdab63788c
+  metadata.gz: cbf1f33d49a88fcba407d75e564120c32bed24353fb88c4c383314e3f17d0437995c5abf05bc55feff9f18fff4ffa6bcfd97018a88c45b552a251b0a0c1720bf
+  data.tar.gz: c9b2d17c4dba28ee407a7beef3d3a1081379da96a4e108e495bc5db0390bee4bde7bbed45321c8e614841c5664cf2cbc4f7d52f5733c9a0ab545a5527bc30824

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.4.10)
-      fluentd (>= 0.10)
-      google-api-client (~> 0.8.6)
+    fluent-plugin-google-cloud (0.4.11)
+      fluentd (~> 0.10)
+      google-api-client (>= 0.8.6, <= 0.9)
       googleauth (~> 0.4)
-      json (~> 1.8.2)
+      json (~> 1.8)
 
 GEM
   remote: https://rubygems.org/
@@ -58,10 +58,11 @@ GEM
       memoist (~> 0.12)
       multi_json (~> 1.11)
       signet (~> 0.6)
+    hashdiff (0.2.2)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
     json (1.8.3)
-    jwt (1.5.1)
+    jwt (1.5.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     little-plugger (1.1.4)
@@ -70,20 +71,20 @@ GEM
       multi_json (~> 1.10)
     memoist (0.12.0)
     metaclass (0.0.4)
-    minitest (5.8.1)
+    minitest (5.8.2)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     msgpack (0.5.12)
     multi_json (1.11.2)
     multipart-post (2.0.0)
-    parser (2.2.2.6)
+    parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
-    power_assert (0.2.4)
+    power_assert (0.2.5)
     powerpack (0.1.1)
     rainbow (2.0.0)
     rake (10.4.2)
     retriable (1.4.1)
-    rubocop (0.33.0)
+    rubocop (0.34.2)
       astrolabe (~> 1.3)
       parser (>= 2.2.2.5, < 3.0)
       powerpack (~> 0.1)
@@ -99,16 +100,17 @@ GEM
       jwt (~> 1.5)
       multi_json (~> 1.10)
     string-scrub (0.0.5)
-    test-unit (3.0.9)
+    test-unit (3.1.5)
       power_assert
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     tzinfo-data (1.2015.7)
       tzinfo (>= 1.0.0)
-    webmock (1.21.0)
+    webmock (1.22.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
     yajl-ruby (1.2.1)
 
 PLATFORMS
@@ -117,10 +119,10 @@ PLATFORMS
 DEPENDENCIES
   fluent-plugin-google-cloud!
   mocha (~> 1.1)
-  rake (>= 10.3.2)
-  rubocop (~> 0.33.0)
-  test-unit (~> 3.0.2)
-  webmock (>= 1.17.0)
+  rake (~> 10.3)
+  rubocop (= 0.34.2)
+  test-unit (~> 3.0)
+  webmock (~> 1.17)
 
 BUNDLED WITH
    1.10.6

data/fluent-plugin-google-cloud.gemspec

@@ -10,7 +10,7 @@ eos
   gem.homepage      = \
     'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
   gem.license       = 'Apache 2.0'
-  gem.version       = '0.4.10'
+  gem.version       = '0.4.11'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
 
@@ -18,14 +18,14 @@ eos
   gem.test_files    = gem.files.grep(/^(test)/)
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'fluentd', '>= 0.10'
-  gem.add_runtime_dependency 'google-api-client', '~> 0.8.6'
+  gem.add_runtime_dependency 'fluentd', '~> 0.10'
+  gem.add_runtime_dependency 'google-api-client', '>= 0.8.6', '<= 0.9'
   gem.add_runtime_dependency 'googleauth', '~> 0.4'
-  gem.add_runtime_dependency 'json', '~> 1.8.2'
+  gem.add_runtime_dependency 'json', '~> 1.8'
 
   gem.add_development_dependency 'mocha', '~> 1.1'
-  gem.add_development_dependency 'rake', '>= 10.3.2'
-  gem.add_development_dependency 'rubocop', '~> 0.33.0'
-  gem.add_development_dependency 'webmock', '>= 1.17.0'
-  gem.add_development_dependency 'test-unit', '~> 3.0.2'
+  gem.add_development_dependency 'rake', '~> 10.3'
+  gem.add_development_dependency 'rubocop', '= 0.34.2'
+  gem.add_development_dependency 'webmock', '~> 1.17'
+  gem.add_development_dependency 'test-unit', '~> 3.0'
 end

data/lib/fluent/plugin/out_google_cloud.rb

@@ -195,6 +195,14 @@ module Fluent
         fail Fluent::ConfigError, 'Unknown platform ' + @platform
       end
 
+      # If we still don't have a project ID, try to obtain it from the
+      # credentials.
+      if @project_id.nil?
+        @project_id = CredentialsInfo.project_id
+        @log.info 'Set Project ID from credentials: ', @project_id unless
+          @project_id.nil?
+      end
+
       # all metadata parameters must now be set
       unless @project_id && @zone && @vm_id
         missing = []
@@ -264,6 +272,11 @@ module Fluent
         common_labels["#{COMPUTE_SERVICE}/resource_id"] = @vm_id
         common_labels["#{COMPUTE_SERVICE}/resource_name"] = @vm_name
       end
+
+      # Log an informational message containing the Logs viewer URL
+      @log.info 'Logs viewer address: ',
+                'https://console.developers.google.com/project/', @project_id,
+                '/logs?service=', @service_name, '&key1=instance&key2=', @vm_id
     end
 
     def start
@@ -550,9 +563,7 @@ module Fluent
         @platform == Platform::GCE
       # See https://cloud.google.com/compute/docs/metadata
       open('http://' + METADATA_SERVICE_ADDR + '/computeMetadata/v1/' +
-           metadata_path, 'Metadata-Flavor' => 'Google') do |f|
-        f.read
-      end
+           metadata_path, 'Metadata-Flavor' => 'Google', &:read)
     end
 
     def fetch_ec2_metadata
@@ -566,6 +577,37 @@ module Fluent
       end
     end
 
+    # TODO: This functionality should eventually be available in another
+    # library, but implement it ourselves for now.
+    module CredentialsInfo
+      # Determine the project ID from the credentials, if possible.
+      # Returns the project ID (as a string) on success, or nil on failure.
+      def self.project_id
+        return nil if @auth_method == 'private_key'
+        creds = Google::Auth.get_application_default(LOGGING_SCOPE)
+        if creds.issuer
+          id = extract_project_id(creds.issuer)
+          return id unless id.nil?
+        end
+        if creds.client_id
+          id = extract_project_id(creds.client_id)
+          return id unless id.nil?
+        end
+        nil
+      end
+
+      # Extracts the project id from str.  Assumes the project ID is at the
+      # front of str, and consists of a string of digits terminated by a
+      # dash (-) which is not part of the project ID.  Example:
+      # 270694816269-1l1r2hb813leuppurdeik0apglbs80sv.apps.googleusercontent.com
+      # Returns the project ID (as a string) on success, or nil on failure.
+      def self.extract_project_id(str)
+        @project_regexp = /^(?<project_id>\d+)-/
+        match_data = @project_regexp.match(str)
+        match_data ? match_data['project_id'] : nil
+      end
+    end
+
     def detect_cloudfunctions(attributes)
       return unless attributes.include?('gcf_region')
       # Cloud Functions detected
@@ -729,7 +771,7 @@ module Fluent
     def init_api_client
       @client = Google::APIClient.new(
         application_name: 'Fluentd Google Cloud Logging plugin',
-        application_version: '0.4.10',
+        application_version: '0.4.11',
         retries: 1)
 
       if @auth_method == 'private_key'

data/test/plugin/test_out_google_cloud.rb

@@ -82,6 +82,14 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   AUTH_GRANT_TYPE = 'urn:ietf:params:oauth:grant-type:jwt-bearer'
   FAKE_AUTH_TOKEN = 'abc123'
 
+  # Paths to test credentials files
+  CREDENTIALS_FILE = 'test/plugin/data/credentials.json'
+  INVALID_CREDENTIALS_FILE = 'test/plugin/data/invalid_credentials.json'
+
+  # Project ID for the test credentials.
+  # This must match the prefix of 'client_id' in CREDENTIALS_FILE.
+  CREDENTIALS_PROJECT_ID = '847859579879'
+
   # Configuration files for various test scenarios
   APPLICATION_DEFAULT_CONFIG = %(
   )
@@ -491,6 +499,14 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     assert_equal 1, exception_count
   end
 
+  def test_ec2_metadata_project_id_from_credentials
+    setup_ec2_metadata_stubs
+    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = CREDENTIALS_FILE
+    d = create_driver
+    d.run
+    assert_equal CREDENTIALS_PROJECT_ID, d.instance.project_id
+  end
+
   def test_one_log
     setup_gce_metadata_stubs
     setup_logging_stubs
@@ -503,7 +519,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   def test_one_log_with_json_credentials
     setup_gce_metadata_stubs
     setup_logging_stubs
-    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = 'test/plugin/data/credentials.json'
+    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = CREDENTIALS_FILE
     d = create_driver
     d.emit('message' => log_entry(0))
     d.run
@@ -513,8 +529,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   def test_one_log_with_invalid_json_credentials
     setup_gce_metadata_stubs
     setup_logging_stubs
-    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = \
-      'test/plugin/data/invalid_credentials.json'
+    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = INVALID_CREDENTIALS_FILE
     d = create_driver
     d.emit('message' => log_entry(0))
     exception_count = 0
@@ -540,7 +555,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     # don't set up any metadata stubs, so the test will fail if we try to
     # fetch metadata (and explicitly check this as well).
     Fluent::GoogleCloudOutput.any_instance.expects(:fetch_metadata).never
-    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = 'test/plugin/data/credentials.json'
+    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = CREDENTIALS_FILE
     setup_logging_stubs
     d = create_driver(NO_METADATA_SERVICE_CONFIG + CUSTOM_METADATA_CONFIG)
     d.emit('message' => log_entry(0))
@@ -549,7 +564,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   end
 
   def test_one_log_ec2
-    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = 'test/plugin/data/credentials.json'
+    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = CREDENTIALS_FILE
     setup_ec2_metadata_stubs
     setup_logging_stubs
     d = create_driver(CONFIG_EC2_PROJECT_ID)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Todd Derr
@@ -9,36 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.6
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.6
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -85,58 +91,58 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.33.0
+        version: 0.34.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.33.0
+        version: 0.34.2
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '3.0'
 description: |2
      Fluentd output plugin for the Google Cloud Logging API, which will make
      logs viewable in the Developer Console's log viewer and can optionally