fluent-plugin-google-cloud 0.6.16 → 0.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc441330446e0c25bc08501530b66b7d6564dc37
-  data.tar.gz: 55a4592b58913b49b23cab5ddfc469a97afd5c4f
+  metadata.gz: '03907dea1776a461bfedccdc6bc8c05fa099e557'
+  data.tar.gz: 81d1c2a217900442793ae78dccf58ccafc88d21e
 SHA512:
-  metadata.gz: 55d494d4e51e821a800b06a3cf936fdbb0fa01305d4e04531f5c0f34001188be0da9b90ea8b84111a6d5f77abd9745f91cf3ec4465939c7af5d2ff11edd55b9f
-  data.tar.gz: 55566646fd0f2656df5fc9d8373d17fc6ddb364b527b74ae6a1be24173e7d0aaec141ea8e90c2bf0a4f7c66d7f471e8a85b9ecc4ef65d1985d164fb86b51126f
+  metadata.gz: 269987948317e7917f8e237132a741d363baa9a273e1e936b5170e551d39a27cb7c480ca59295a5eae6136eb49156ae0e0f2ece80c3a2c5870305127a1fbc2da
+  data.tar.gz: e9c791824dcc361f6d958aeb6dd423ec3d8f51168cc448883f777c775e6ac6c33aebe443912883c0dd61e9079cf501ab15b93fc3e474989ff5d1ab3df40050e5

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.6.16'
+  gem.version       = '0.6.17'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')

data/lib/fluent/plugin/out_google_cloud.rb

@@ -38,6 +38,27 @@ module Google
   end
 end
 
+module Google
+  module Auth
+    # Extract project_id in initialize.
+    class ServiceAccountCredentials
+      singleton_class.send(:alias_method, :super_make_creds, :make_creds)
+      def self.make_creds(options = {})
+        json_key_io, scope = options.values_at(:json_key_io, :scope)
+        if json_key_io
+          json_key = MultiJson.load(json_key_io.read)
+          project_id = json_key['project_id']
+        end
+        creds = super_make_creds(
+          json_key_io: StringIO.new(MultiJson.dump(json_key)), scope: scope)
+        creds.instance_variable_set(:@project_id, project_id) if project_id
+        creds
+      end
+      attr_reader :project_id
+    end
+  end
+end
+
 module Fluent
   # fluentd output plugin for the Stackdriver Logging API
   class GoogleCloudOutput < BufferedOutput
@@ -199,7 +220,7 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'.freeze
-    PLUGIN_VERSION = '0.6.16'.freeze
+    PLUGIN_VERSION = '0.6.17'.freeze
 
     # Name of the the Google cloud logging write scope.
     LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'.freeze
@@ -361,7 +382,7 @@ module Fluent
 
     # Whether to split log entries with different log tags into different
     # requests when talking to Stackdriver Logging API.
-    config_param :split_logs_by_tag, :bool, :default => true
+    config_param :split_logs_by_tag, :bool, :default => false
 
     # rubocop:enable Style/HashSyntax
 
@@ -611,7 +632,8 @@ module Fluent
           end
           combined_entries.concat(request[:entries])
         end
-        @write_request.call(entries: combined_entries)
+        @write_request.call(entries: combined_entries) unless
+          combined_entries.empty?
       end
     end
 
@@ -1412,6 +1434,9 @@ module Fluent
       # Returns the project ID (as a string) on success, or nil on failure.
       def self.project_id
         creds = Google::Auth.get_application_default(LOGGING_SCOPE)
+        if creds.respond_to?(:project_id)
+          return creds.project_id if creds.project_id
+        end
         if creds.issuer
           id = extract_project_id(creds.issuer)
           return id unless id.nil?

data/test/plugin/base_test.rb

@@ -227,7 +227,8 @@ module BaseTest
   def test_project_id_from_credentials
     %w(gce ec2).each do |platform|
       send("setup_#{platform}_metadata_stubs")
-      [IAM_CREDENTIALS, LEGACY_CREDENTIALS].each do |creds|
+      [IAM_CREDENTIALS, NEW_STYLE_CREDENTIALS, LEGACY_CREDENTIALS].each \
+      do |creds|
         ENV['GOOGLE_APPLICATION_CREDENTIALS'] = creds[:path]
         d = create_driver
         d.run
@@ -656,8 +657,8 @@ module BaseTest
   def test_configure_split_logs_by_tag
     setup_gce_metadata_stubs
     {
-      APPLICATION_DEFAULT_CONFIG => true,
-      DISABLE_SPLIT_LOGS_BY_TAG_CONFIG => false
+      APPLICATION_DEFAULT_CONFIG => false,
+      ENABLE_SPLIT_LOGS_BY_TAG_CONFIG => true
     }.each do |(config, split_logs_by_tag)|
       d = create_driver(config)
       assert_equal split_logs_by_tag,
@@ -672,14 +673,14 @@ module BaseTest
       "projects/test-project-id/logs/tag#{index}"
     end
     [
+      [APPLICATION_DEFAULT_CONFIG, 1, [''], dynamic_log_names],
       # [] returns nil for any index.
-      [APPLICATION_DEFAULT_CONFIG, log_entry_count, dynamic_log_names, []],
-      [DISABLE_SPLIT_LOGS_BY_TAG_CONFIG, 1, [''], dynamic_log_names]
+      [ENABLE_SPLIT_LOGS_BY_TAG_CONFIG, log_entry_count, dynamic_log_names, []]
     ].each do |(config, request_count, request_log_names, entry_log_names)|
       setup_prometheus
       setup_logging_stubs do
         @logs_sent = []
-        d = create_driver(config + PROMETHEUS_ENABLE_CONFIG, 'test', true)
+        d = create_driver(config + ENABLE_PROMETHEUS_CONFIG, 'test', true)
         log_entry_count.times do |i|
           d.emit("tag#{i}", 'message' => log_entry(i))
         end

data/test/plugin/constants.rb

@@ -133,6 +133,10 @@ module Constants
     path: 'test/plugin/data/iam-credentials.json',
     project_id: 'fluent-test-project'
   }.freeze
+  NEW_STYLE_CREDENTIALS = {
+    path: 'test/plugin/data/new-style-credentials.json',
+    project_id: 'fluent-test-project'
+  }.freeze
   LEGACY_CREDENTIALS = {
     path: 'test/plugin/data/credentials.json',
     project_id: '847859579879'
@@ -182,11 +186,11 @@ module Constants
     detect_subservice false
   ).freeze
 
-  DISABLE_SPLIT_LOGS_BY_TAG_CONFIG = %(
-    split_logs_by_tag false
+  ENABLE_SPLIT_LOGS_BY_TAG_CONFIG = %(
+    split_logs_by_tag true
   ).freeze
 
-  PROMETHEUS_ENABLE_CONFIG = %(
+  ENABLE_PROMETHEUS_CONFIG = %(
     enable_monitoring true
     monitoring_type prometheus
   ).freeze

data/test/plugin/data/new-style-credentials.json

@@ -0,0 +1,12 @@
+{
+  "type": "service_account",
+  "private_key_id": "5985985bcdfe958895bd8d76456fe90d8484789d",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIICdwIBADANBgkqhkiG9w0BAQEcAASCAmEwggJdAgEAAoGBAKizy6B+aJ0Wua0e\njZ3pkHV0a2Ce1prJGhzGL5NpkbUjk6J11Kwp1yvPikTwALyy4PtUIZ+23D/unVRM\nHlKa2MkHIGjJg+mykX5Bd7eRJOxdJ0iu+eRWh7HiH+mdDntHwaz4xXihJBog71qS\n+9N+r2hy1hicybechchMiXHhmWPbAgMBAAECgYEAnSzeI4qCZxEcLtnPcXeBWpz7\nycpTAWUpycMvsjTiRxR9YRhM65YT3cJ//VhqJ2S1ThOcPCt/KqViuX4tpiKUo7qA\nH1AI9APbTo66wiGpgy+qG0wPJkKIQC8PpITNNcHqcbbAsIr3/XQduihsqxP2W2mT\na0nk5XJghs1Wa0xt28ECQQDgMqZjVDcDQyqM+bcBKJUUc/247KusjpdK70r6sx2o\nkZJGy/w9exlM5QrB6DLpw34/p5x4MoecZ7lS3yHdmaEhAkEAwKHsV4k5SXTUp4+J\nWK6GlQVvnwc+PQdX5gzt4/gWSY0Op5EQ+YD6cC7Lkz+GzXUzvmdp35c0ahS93D1/\nZLTZewJBAIjOc3cHMNadyr5BtulPEUE0ro+EY/GlBS8lu/QlDmkJg2AOI3qEvliM\nvza58S9yKny/U5yJAPVw2cZ3ABxQHeECQDyBX8PrBURuXvE2o5RoVTtvlqziAi3X\nJaPLwdkOLqnxlX3KkgNcoM0l1amtlYDpZcRVcSs0+9TqKOyJoH8YUwsCQA4cJmv3\n119xcijXPM2HZOB5cCxTHj59MRtQlLboNZ2witDCJ20eG9AC3ZcH7csS0H9dz8Jr\nXGEoQMPD2ck4T0U\u003d\n-----END PRIVATE KEY-----\n",
+  "client_email": "account-name@fluent-test-project-1.iam.gserviceaccount.com",
+  "client_id": "275859789789367827863",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://accounts.google.com/o/oauth2/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "project_id": "fluent-test-project",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/account-name%40fluent-test-project.iam.gserviceaccount.com"
+}

data/test/plugin/test_out_google_cloud.rb

@@ -61,7 +61,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     stub_request(:post, WRITE_LOG_ENTRIES_URI)
       .to_return(status: root_error_code,
                  body: PARTIAL_SUCCESS_RESPONSE_BODY.to_json)
-    d = create_driver(PROMETHEUS_ENABLE_CONFIG)
+    d = create_driver(ENABLE_PROMETHEUS_CONFIG)
     4.times do |i|
       d.emit('message' => log_entry(i.to_s))
     end
@@ -123,7 +123,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
       stub_request(:post, WRITE_LOG_ENTRIES_URI)
         .to_return(status: code, body: 'Some Message')
       (1..request_count).each do
-        d = create_driver(PROMETHEUS_ENABLE_CONFIG)
+        d = create_driver(ENABLE_PROMETHEUS_CONFIG)
         (1..entry_count).each do |i|
           d.emit('message' => log_entry(i.to_s))
         end

data/test/plugin/test_out_google_cloud_grpc.rb

@@ -59,7 +59,7 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
       'User not authorized.', PARTIAL_SUCCESS_GRPC_METADATA) do
       # The API Client should not retry this and the plugin should consume
       # the exception.
-      d = create_driver(PROMETHEUS_ENABLE_CONFIG)
+      d = create_driver(ENABLE_PROMETHEUS_CONFIG)
       4.times do |i|
         d.emit('message' => log_entry(i.to_s))
       end
@@ -131,7 +131,7 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
       setup_prometheus
       (1..request_count).each do
         setup_logging_stubs(should_fail, code, 'SomeMessage') do
-          d = create_driver(USE_GRPC_CONFIG + PROMETHEUS_ENABLE_CONFIG, 'test')
+          d = create_driver(USE_GRPC_CONFIG + ENABLE_PROMETHEUS_CONFIG, 'test')
           (1..entry_count).each do |i|
             d.emit('message' => log_entry(i.to_s))
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.16
+  version: 0.6.17
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -212,7 +212,6 @@ extra_rdoc_files: []
 files:
 - CONTRIBUTING
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -226,6 +225,7 @@ files:
 - test/plugin/data/credentials.json
 - test/plugin/data/iam-credentials.json
 - test/plugin/data/invalid_credentials.json
+- test/plugin/data/new-style-credentials.json
 - test/plugin/test_driver.rb
 - test/plugin/test_out_google_cloud.rb
 - test/plugin/test_out_google_cloud_grpc.rb
@@ -261,6 +261,7 @@ test_files:
 - test/plugin/data/credentials.json
 - test/plugin/data/iam-credentials.json
 - test/plugin/data/invalid_credentials.json
+- test/plugin/data/new-style-credentials.json
 - test/plugin/test_driver.rb
 - test/plugin/test_out_google_cloud.rb
 - test/plugin/test_out_google_cloud_grpc.rb

data/Gemfile.lock

@@ -1,162 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fluent-plugin-google-cloud (0.6.16)
-      fluentd (~> 0.10)
-      google-api-client (~> 0.17)
-      google-cloud-logging (~> 1.3, >= 1.3.2)
-      googleapis-common-protos (~> 1.3)
-      googleauth (~> 0.6)
-      grpc (~> 1.0)
-      json (~> 1.8)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
-    cool.io (1.5.3)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    declarative (0.0.10)
-    declarative-option (0.1.0)
-    faraday (0.14.0)
-      multipart-post (>= 1.2, < 3)
-    fluentd (0.14.25)
-      cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
-      msgpack (>= 0.7.0, < 2.0.0)
-      ruby_dig (~> 0.0.2)
-      serverengine (>= 2.0.4, < 3.0.0)
-      sigdump (~> 0.2.2)
-      strptime (~> 0.1.7)
-      tzinfo (~> 1.0)
-      tzinfo-data (~> 1.0)
-      yajl-ruby (~> 1.0)
-    google-api-client (0.19.8)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.7.0)
-      httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-    google-cloud-core (1.2.0)
-      google-cloud-env (~> 1.0)
-    google-cloud-env (1.0.1)
-      faraday (~> 0.11)
-    google-cloud-logging (1.5.0)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.0)
-      stackdriver-core (~> 1.3)
-    google-gax (1.0.1)
-      google-protobuf (~> 3.2)
-      googleapis-common-protos (>= 1.3.5, < 2.0)
-      googleauth (~> 0.6.2)
-      grpc (>= 1.7.2, < 2.0)
-      rly (~> 0.2.3)
-    google-protobuf (3.5.1.2)
-    googleapis-common-protos (1.3.7)
-      google-protobuf (~> 3.0)
-      googleapis-common-protos-types (~> 1.0)
-      grpc (~> 1.0)
-    googleapis-common-protos-types (1.0.1)
-      google-protobuf (~> 3.0)
-    googleauth (0.6.2)
-      faraday (~> 0.12)
-      jwt (>= 1.4, < 3.0)
-      logging (~> 2.0)
-      memoist (~> 0.12)
-      multi_json (~> 1.11)
-      os (~> 0.9)
-      signet (~> 0.7)
-    grpc (1.9.1)
-      google-protobuf (~> 3.1)
-      googleapis-common-protos-types (~> 1.0.0)
-      googleauth (>= 0.5.1, < 0.7)
-    hashdiff (0.3.7)
-    http_parser.rb (0.6.0)
-    httpclient (2.8.3)
-    json (1.8.6)
-    jwt (2.1.0)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    memoist (0.16.0)
-    metaclass (0.0.4)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mocha (1.3.0)
-      metaclass (~> 0.0.1)
-    msgpack (1.2.2)
-    multi_json (1.13.1)
-    multipart-post (2.0.0)
-    os (0.9.6)
-    parser (2.5.0.2)
-      ast (~> 2.4.0)
-    power_assert (1.1.1)
-    powerpack (0.1.1)
-    prometheus-client (0.7.1)
-      quantile (~> 0.2.0)
-    public_suffix (3.0.2)
-    quantile (0.2.0)
-    rainbow (2.2.2)
-      rake
-    rake (10.5.0)
-    representable (3.0.4)
-      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.1.1)
-    rly (0.2.3)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    ruby_dig (0.0.2)
-    safe_yaml (1.0.4)
-    serverengine (2.0.6)
-      sigdump (~> 0.2.2)
-    sigdump (0.2.4)
-    signet (0.8.1)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    stackdriver-core (1.3.0)
-      google-cloud-core (~> 1.2)
-    strptime (0.1.9)
-    test-unit (3.2.7)
-      power_assert
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2018.3)
-      tzinfo (>= 1.0.0)
-    uber (0.1.0)
-    unicode-display_width (1.3.0)
-    webmock (2.3.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    yajl-ruby (1.3.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fluent-plugin-google-cloud!
-  mocha (~> 1.1)
-  prometheus-client (~> 0.7.1)
-  rake (~> 10.3)
-  rubocop (~> 0.39.0)
-  test-unit (~> 3.0)
-  webmock (~> 2.3.1)
-
-BUNDLED WITH
-   1.16.1