fluent-plugin-google-cloud 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dadd696dfee96381dd5df223d4efc1743a5c93b41d15fd01eb4dfd4750fb850
-  data.tar.gz: 427541e49c3583f26bfb87bda103436031fbaf5c9a964dbf8d9f41fc15f68ed5
+  metadata.gz: 121ed882fad27b0eb910d9fb8e95e7840fce8430d20ee7b85e53b39280b8f68c
+  data.tar.gz: aa3d64df2c47d080323032bbbf7aa7faee7b7fd58cb5796007bbdb4fac84d02c
 SHA512:
-  metadata.gz: 30bd43a8ae586faee4b738ba04c441b539bdaf91ddfc990e3b653e98d9e7b10d1805b6d8ab877d7e8c26c9107ff6ebf83861b5571d91eba0b7c118c275c6da4c
-  data.tar.gz: adb926e5e6fa7c0ee06e9222d4f3b31f84dda7e602ebe250c2472f6cb61a656195a2ea01d3d5441350d381083dae9c82bdff5eb2cfbfdd89d4db22c9c2d9fe93
+  metadata.gz: b94c6ac4c29f6d7f2312ab9976dd1dabab6f532ccb52e717191a6b225dd65defef117623067131648d72e2494ae5f380a6475d633db87c568dd9153932895c94
+  data.tar.gz: 2bda121660d6d9eebac56db54283ef49cbfb4db1d482e933fb33549fd1eac4fa33038b0f1024555c05ee0f4d3333953b9ead825e9afc468d27a31fc7beee7fc0

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.7.12)
-      fluentd (= 1.2.5)
+    fluent-plugin-google-cloud (0.7.13)
+      fluentd (= 1.4.2)
       google-api-client (= 0.28.4)
       google-cloud-logging (= 1.6.0)
       google-protobuf (= 3.6.1)
       googleapis-common-protos (= 1.3.7)
-      googleauth (= 0.6.6)
+      googleauth (= 0.8.1)
       grpc (= 1.14.2)
       json (= 2.1.0)
 
@@ -26,7 +26,7 @@ GEM
     dig_rb (1.0.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    fluentd (1.2.5)
+    fluentd (1.4.2)
       cool.io (>= 1.4.5, < 2.0.0)
       dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -68,10 +68,10 @@ GEM
       grpc (~> 1.0)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
-    googleauth (0.6.6)
+    googleauth (0.8.1)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.12)
+      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
@@ -82,7 +82,7 @@ GEM
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
     json (2.1.0)
-    jwt (2.1.0)
+    jwt (2.2.1)
     memoist (0.16.0)
     metaclass (0.0.4)
     mime-types (3.2.2)

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.7.12'
+  gem.version       = '0.7.13'
   gem.authors       = ['Stackdriver Agents Team']
   gem.email         = ['stackdriver-agents@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.2')
@@ -19,9 +19,9 @@ eos
   gem.test_files    = gem.files.grep(/^(test)/)
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'fluentd', '1.2.5'
+  gem.add_runtime_dependency 'fluentd', '1.4.2'
   gem.add_runtime_dependency 'googleapis-common-protos', '1.3.7'
-  gem.add_runtime_dependency 'googleauth', '0.6.6'
+  gem.add_runtime_dependency 'googleauth', '0.8.1'
   gem.add_runtime_dependency 'google-api-client', '0.28.4'
   gem.add_runtime_dependency 'google-cloud-logging', '1.6.0'
   gem.add_runtime_dependency 'google-protobuf', '3.6.1'

data/lib/fluent/plugin/out_google_cloud.rb

@@ -40,23 +40,12 @@ module Google
   end
 end
 
+# Patch the gcloud command used by googleauth to avoid spamming stderr.
 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
+    module CredentialsLoader
+      GCLOUD_CONFIG_COMMAND =
+        'config config-helper --format json --verbosity none'.freeze
     end
   end
 end

data/test/plugin/base_test.rb

@@ -29,12 +29,13 @@ module BaseTest
     # delete environment variables that googleauth uses to find credentials.
     ENV.delete(CREDENTIALS_PATH_ENV_VAR)
     # service account env.
-    ENV.delete('PRIVATE_KEY_VAR')
-    ENV.delete('CLIENT_EMAIL_VAR')
+    ENV.delete(PRIVATE_KEY_VAR)
+    ENV.delete(CLIENT_EMAIL_VAR)
+    ENV.delete(PROJECT_ID_VAR)
     # authorized_user env.
-    ENV.delete('CLIENT_ID_VAR')
-    ENV.delete('CLIENT_SECRET_VAR')
-    ENV.delete('REFRESH_TOKEN_VAR')
+    ENV.delete(CLIENT_ID_VAR)
+    ENV.delete(CLIENT_SECRET_VAR)
+    ENV.delete(REFRESH_TOKEN_VAR)
     # home var, which is used to find $HOME/.gcloud/...
     ENV.delete('HOME')
 

data/test/plugin/constants.rb

@@ -232,6 +232,14 @@ module Constants
     project_id: ''
   }.freeze
 
+  # Special googleauth environment variables.
+  PROJECT_ID_VAR = 'GOOGLE_PROJECT_ID'.freeze
+  PRIVATE_KEY_VAR = 'GOOGLE_PRIVATE_KEY'.freeze
+  CLIENT_EMAIL_VAR = 'GOOGLE_CLIENT_EMAIL'.freeze
+  CLIENT_ID_VAR = 'GOOGLE_CLIENT_ID'.freeze
+  CLIENT_SECRET_VAR = 'GOOGLE_CLIENT_SECRET'.freeze
+  REFRESH_TOKEN_VAR = 'GOOGLE_REFRESH_TOKEN'.freeze
+
   # Configuration files for various test scenarios.
   APPLICATION_DEFAULT_CONFIG = %(
   ).freeze

data/test/plugin/test_out_google_cloud_grpc.rb

@@ -377,9 +377,9 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
   class GRPCLoggingMockFailingService <
       Google::Cloud::Logging::V2::LoggingServiceV2Client
     def initialize(error, failed_attempts)
+      super()
       @error = error
       @failed_attempts = failed_attempts
-      super()
     end
 
     # rubocop:disable Lint/UnusedMethodArgument

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.13
 platform: ruby
 authors:
 - Stackdriver Agents Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: googleapis-common-protos
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement