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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4efb3cf43c3d546d06bbc467466b6b9d9c3aae98
-  data.tar.gz: e821c6049fb4ef9fb1e8e653532667b739140864
+  metadata.gz: d1d9303278baab1ded1484eaa6c2974c5dbb3bc5
+  data.tar.gz: 313c3e168ab212dd65e276b0e0a3562e718fcaa1
 SHA512:
-  metadata.gz: 062c16f5280a6378de952a2f4c1f943cccc44f61f4fb118f69cc1672295fccbe67ee0af58b2b7aedc46c7cd7e0f467664a0c092f0c20e7322bca35c700e5303c
-  data.tar.gz: bfe2e60d895d989dddf2964261867cac2586ba30ae599af75d3c2b334c4ac10a649d50c91919de1f2d0adf5d45f34b01e0add5eace33f1231181f522fead426f
+  metadata.gz: 2a67095d29a49fb9b264a23f78949d98f28614428381ae4f85b886fb14d5b7d34d4974649ca8ab1c740dbc172e2e036ab64f2b788d4818d94dc3d50ba0529a8a
+  data.tar.gz: 3ec89701d9d83e380e90eb06f4b3d9a25a7d7b223420a1384dd07b110af43c8fb4aeccd59bdfaffda4140ba74bfc4b0d5804d4dc74b627b7527d8981205a7bc5

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.6.10.pre.2)
+    fluent-plugin-google-cloud (0.6.10)
       fluentd (~> 0.10)
       google-api-client (~> 0.14)
       google-cloud-logging (~> 1.2, >= 1.2.3)
       googleapis-common-protos (~> 1.3)
+      googleauth (~> 0.6)
       grpc (~> 1.0)
       json (~> 1.8)
 

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.2'
+  gem.version       = '0.6.10'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')
@@ -23,6 +23,7 @@ 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.6'
   gem.add_runtime_dependency 'grpc', '~> 1.0'
   gem.add_runtime_dependency 'json', '~> 1.8'
 

data/lib/fluent/plugin/out_google_cloud.rb

@@ -125,8 +125,6 @@ module Fluent
 
     # Internal constants.
     module InternalConstants
-      DEFAULT_LOGGING_API_URL = 'logging.googleapis.com'.freeze
-
       # The label name of local_resource_id in the json payload. When a record
       # has this field in the payload, we will use the value to retrieve
       # monitored resource from Stackdriver Metadata agent.
@@ -195,7 +193,7 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'.freeze
-    PLUGIN_VERSION = '0.6.10.pre.2'.freeze
+    PLUGIN_VERSION = '0.6.10'.freeze
 
     # Name of the the Google cloud logging write scope.
     LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'.freeze
@@ -323,15 +321,6 @@ module Fluent
                  :default => nil,
                  :secret => true
 
-    # The URL of Stackdriver Logging API. Right now this only works with the
-    # 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.
@@ -380,15 +369,6 @@ module Fluent
                   ' partial_success flag will be ignored.'
       end
 
-      # TODO(qingling128): Remove this warning after the support is added. Also
-      # remove the comment in the description of this configuration.
-      unless @logging_api_url == DEFAULT_LOGGING_API_URL || @use_grpc
-        @log.warn 'Detected customized logging_api_url while use_grpc is not' \
-                  ' enabled. Customized logging_api_url for the non-gRPC path' \
-                  ' is not supported. The logging_api_url option will be' \
-                  ' ignored.'
-      end
-
       # If monitoring is enabled, register metrics in the default registry
       # and store metric objects for future use.
       if @enable_monitoring
@@ -1733,16 +1713,12 @@ module Fluent
 
     def api_client
       if @use_grpc
-        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
+        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)
         @client = Google::Logging::V2::LoggingServiceV2::Stub.new(
-          @logging_api_url, creds)
+          'logging.googleapis.com', creds)
       else
         unless @client.authorization.expired?
           begin

data/test/plugin/base_test.rb

@@ -62,17 +62,6 @@ module BaseTest
     assert_equal 1, exception_count
   end
 
-  def test_configure_logging_api_url
-    setup_gce_metadata_stubs
-    {
-      APPLICATION_DEFAULT_CONFIG => DEFAULT_LOGGING_API_URL,
-      CUSTOM_LOGGING_API_URL_CONFIG => CUSTOM_LOGGING_API_URL
-    }.each do |(config, url)|
-      d = create_driver(config)
-      assert_equal url, d.instance.instance_variable_get(:@logging_api_url)
-    end
-  end
-
   def test_configure_custom_metadata
     setup_no_metadata_service_stubs
     d = create_driver(CUSTOM_METADATA_CONFIG)
@@ -1368,14 +1357,14 @@ module BaseTest
 
   def setup_auth_stubs
     # Used when loading credentials from a JSON file.
-    stub_request(:post, 'https://www.googleapis.com/oauth2/v3/token')
+    stub_request(:post, 'https://www.googleapis.com/oauth2/v4/token')
       .with(body: hash_including(grant_type: AUTH_GRANT_TYPE))
       .to_return(body: %({"access_token": "#{FAKE_AUTH_TOKEN}"}),
                  status: 200,
                  headers: { 'Content-Length' => FAKE_AUTH_TOKEN.length,
                             'Content-Type' => 'application/json' })
 
-    stub_request(:post, 'https://www.googleapis.com/oauth2/v3/token')
+    stub_request(:post, 'https://www.googleapis.com/oauth2/v4/token')
       .with(body: hash_including(grant_type: 'refresh_token'))
       .to_return(body: %({"access_token": "#{FAKE_AUTH_TOKEN}"}),
                  status: 200,

data/test/plugin/constants.rb

@@ -20,7 +20,6 @@ module Constants
 
   # Generic attributes.
   HOSTNAME = Socket.gethostname
-  CUSTOM_LOGGING_API_URL = 'custom.logging.googleapis.com'.freeze
 
   # TODO(qingling128) Separate constants into different submodules.
   # Attributes used for the GCE metadata service.
@@ -139,10 +138,6 @@ module Constants
   APPLICATION_DEFAULT_CONFIG = %(
   ).freeze
 
-  CUSTOM_LOGGING_API_URL_CONFIG = %(
-    logging_api_url #{CUSTOM_LOGGING_API_URL}
-  ).freeze
-
   DETECT_JSON_CONFIG = %(
     detect_json true
   ).freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.10.pre.2
+  version: 0.6.10
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -73,6 +73,20 @@ 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.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -229,9 +243,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8