fluent-plugin-google-cloud 0.6.10.pre.1 → 0.6.10.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39661a11e58b52f626ece8c74056504cc8357f85
-  data.tar.gz: db78d67f4c56435d85011a66332f01c4fd6d69df
+  metadata.gz: 4efb3cf43c3d546d06bbc467466b6b9d9c3aae98
+  data.tar.gz: e821c6049fb4ef9fb1e8e653532667b739140864
 SHA512:
-  metadata.gz: 2d856be37dcd8bf41c8c35dec9a1e712bf05e684cf2d824dc76a75c279c5f65ea8ebc9b8f3d01922f6e15479cfd0aa2fa87359f407c56227364a40922d0c9037
-  data.tar.gz: 58c0e3b7eba803069baa7bc411269e0f829a43cf76d8555427f03d8cc350e3151e567216504daa4ea10c91162af1e0a375e03ac58e263383a76b85a0667c25e8
+  metadata.gz: 062c16f5280a6378de952a2f4c1f943cccc44f61f4fb118f69cc1672295fccbe67ee0af58b2b7aedc46c7cd7e0f467664a0c092f0c20e7322bca35c700e5303c
+  data.tar.gz: bfe2e60d895d989dddf2964261867cac2586ba30ae599af75d3c2b334c4ac10a649d50c91919de1f2d0adf5d45f34b01e0add5eace33f1231181f522fead426f

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.6.10.pre.1)
+    fluent-plugin-google-cloud (0.6.10.pre.2)
       fluentd (~> 0.10)
       google-api-client (~> 0.14)
       google-cloud-logging (~> 1.2, >= 1.2.3)
       googleapis-common-protos (~> 1.3)
-      googleauth (~> 0.4, < 0.5.2)
       grpc (~> 1.0)
       json (~> 1.8)
 
@@ -23,7 +22,7 @@ GEM
     declarative-option (0.1.0)
     faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
-    fluentd (0.14.22)
+    fluentd (0.14.23)
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       msgpack (>= 0.7.0, < 2.0.0)
@@ -41,31 +40,30 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    google-cloud-core (1.0.0)
+    google-cloud-core (1.1.0)
       google-cloud-env (~> 1.0)
-      googleauth (~> 0.5.1)
     google-cloud-env (1.0.1)
       faraday (~> 0.11)
-    google-cloud-logging (1.2.3)
-      google-cloud-core (~> 1.0)
-      google-gax (~> 0.8.0)
+    google-cloud-logging (1.3.1)
+      google-cloud-core (~> 1.1)
+      google-gax (~> 0.10.1)
       stackdriver-core (~> 1.2)
-    google-gax (0.8.10)
+    google-gax (0.10.1)
       google-protobuf (~> 3.2)
-      googleapis-common-protos (~> 1.3.5)
-      googleauth (~> 0.5.1)
-      grpc (~> 1.0)
+      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.4.1.1)
+    google-protobuf (3.5.0)
     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.5.1)
-      faraday (~> 0.9)
-      jwt (~> 1.4)
+    googleauth (0.6.2)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
       logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
@@ -79,7 +77,7 @@ GEM
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
     json (1.8.6)
-    jwt (1.5.6)
+    jwt (2.1.0)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)

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.10.pre.1'
+  gem.version       = '0.6.10.pre.2'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')
@@ -23,7 +23,6 @@ eos
   gem.add_runtime_dependency 'googleapis-common-protos', '~> 1.3'
   gem.add_runtime_dependency 'google-api-client', '~> 0.14'
   gem.add_runtime_dependency 'google-cloud-logging', '~> 1.2', '>= 1.2.3'
-  gem.add_runtime_dependency 'googleauth', '~> 0.4', '< 0.5.2'
   gem.add_runtime_dependency 'grpc', '~> 1.0'
   gem.add_runtime_dependency 'json', '~> 1.8'
 

data/lib/fluent/plugin/out_google_cloud.rb

@@ -195,7 +195,7 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'.freeze
-    PLUGIN_VERSION = '0.6.10.pre.1'.freeze
+    PLUGIN_VERSION = '0.6.10.pre.2'.freeze
 
     # Name of the the Google cloud logging write scope.
     LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'.freeze
@@ -327,6 +327,11 @@ module Fluent
     # gRPC path (use_grpc = true).
     config_param :logging_api_url, :string, :default => DEFAULT_LOGGING_API_URL
 
+    # Whether to use a secure channel when talking to the Logging API. This
+    # should only be false if the Stackdriver Logging Agent is set up to talk
+    # to a mocked / stubbed Logging API. Otherwise the requests will fail.
+    config_param :use_secure_channel, :bool, :default => true
+
     # Whether to collect metrics about the plugin usage. The mechanism for
     # collecting and exposing metrics is controlled by the monitoring_type
     # parameter.
@@ -1728,10 +1733,14 @@ module Fluent
 
     def api_client
       if @use_grpc
-        ssl_creds = GRPC::Core::ChannelCredentials.new
-        authentication = Google::Auth.get_application_default
-        creds = GRPC::Core::CallCredentials.new(authentication.updater_proc)
-        creds = ssl_creds.compose(creds)
+        if @use_secure_channel
+          ssl_creds = GRPC::Core::ChannelCredentials.new
+          authentication = Google::Auth.get_application_default
+          creds = GRPC::Core::CallCredentials.new(authentication.updater_proc)
+          creds = ssl_creds.compose(creds)
+        else
+          creds = :this_channel_is_insecure
+        end
         @client = Google::Logging::V2::LoggingServiceV2::Stub.new(
           @logging_api_url, creds)
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.10.pre.1
+  version: 0.6.10.pre.2
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -73,26 +73,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.3
-- !ruby/object:Gem::Dependency
-  name: googleauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement