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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +15 -17
  3. data/fluent-plugin-google-cloud.gemspec +1 -2
  4. data/lib/fluent/plugin/out_google_cloud.rb +14 -5
  5. metadata +2 -22
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 39661a11e58b52f626ece8c74056504cc8357f85
4
- data.tar.gz: db78d67f4c56435d85011a66332f01c4fd6d69df
3
+ metadata.gz: 4efb3cf43c3d546d06bbc467466b6b9d9c3aae98
4
+ data.tar.gz: e821c6049fb4ef9fb1e8e653532667b739140864
5
5
  SHA512:
6
- metadata.gz: 2d856be37dcd8bf41c8c35dec9a1e712bf05e684cf2d824dc76a75c279c5f65ea8ebc9b8f3d01922f6e15479cfd0aa2fa87359f407c56227364a40922d0c9037
7
- data.tar.gz: 58c0e3b7eba803069baa7bc411269e0f829a43cf76d8555427f03d8cc350e3151e567216504daa4ea10c91162af1e0a375e03ac58e263383a76b85a0667c25e8
6
+ metadata.gz: 062c16f5280a6378de952a2f4c1f943cccc44f61f4fb118f69cc1672295fccbe67ee0af58b2b7aedc46c7cd7e0f467664a0c092f0c20e7322bca35c700e5303c
7
+ data.tar.gz: bfe2e60d895d989dddf2964261867cac2586ba30ae599af75d3c2b334c4ac10a649d50c91919de1f2d0adf5d45f34b01e0add5eace33f1231181f522fead426f
data/Gemfile.lock CHANGED
@@ -1,12 +1,11 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- fluent-plugin-google-cloud (0.6.10.pre.1)
4
+ fluent-plugin-google-cloud (0.6.10.pre.2)
5
5
  fluentd (~> 0.10)
6
6
  google-api-client (~> 0.14)
7
7
  google-cloud-logging (~> 1.2, >= 1.2.3)
8
8
  googleapis-common-protos (~> 1.3)
9
- googleauth (~> 0.4, < 0.5.2)
10
9
  grpc (~> 1.0)
11
10
  json (~> 1.8)
12
11
 
@@ -23,7 +22,7 @@ GEM
23
22
  declarative-option (0.1.0)
24
23
  faraday (0.13.1)
25
24
  multipart-post (>= 1.2, < 3)
26
- fluentd (0.14.22)
25
+ fluentd (0.14.23)
27
26
  cool.io (>= 1.4.5, < 2.0.0)
28
27
  http_parser.rb (>= 0.5.1, < 0.7.0)
29
28
  msgpack (>= 0.7.0, < 2.0.0)
@@ -41,31 +40,30 @@ GEM
41
40
  mime-types (~> 3.0)
42
41
  representable (~> 3.0)
43
42
  retriable (>= 2.0, < 4.0)
44
- google-cloud-core (1.0.0)
43
+ google-cloud-core (1.1.0)
45
44
  google-cloud-env (~> 1.0)
46
- googleauth (~> 0.5.1)
47
45
  google-cloud-env (1.0.1)
48
46
  faraday (~> 0.11)
49
- google-cloud-logging (1.2.3)
50
- google-cloud-core (~> 1.0)
51
- google-gax (~> 0.8.0)
47
+ google-cloud-logging (1.3.1)
48
+ google-cloud-core (~> 1.1)
49
+ google-gax (~> 0.10.1)
52
50
  stackdriver-core (~> 1.2)
53
- google-gax (0.8.10)
51
+ google-gax (0.10.1)
54
52
  google-protobuf (~> 3.2)
55
- googleapis-common-protos (~> 1.3.5)
56
- googleauth (~> 0.5.1)
57
- grpc (~> 1.0)
53
+ googleapis-common-protos (>= 1.3.5, < 2.0)
54
+ googleauth (~> 0.6.2)
55
+ grpc (>= 1.7.2, < 2.0)
58
56
  rly (~> 0.2.3)
59
- google-protobuf (3.4.1.1)
57
+ google-protobuf (3.5.0)
60
58
  googleapis-common-protos (1.3.7)
61
59
  google-protobuf (~> 3.0)
62
60
  googleapis-common-protos-types (~> 1.0)
63
61
  grpc (~> 1.0)
64
62
  googleapis-common-protos-types (1.0.1)
65
63
  google-protobuf (~> 3.0)
66
- googleauth (0.5.1)
67
- faraday (~> 0.9)
68
- jwt (~> 1.4)
64
+ googleauth (0.6.2)
65
+ faraday (~> 0.12)
66
+ jwt (>= 1.4, < 3.0)
69
67
  logging (~> 2.0)
70
68
  memoist (~> 0.12)
71
69
  multi_json (~> 1.11)
@@ -79,7 +77,7 @@ GEM
79
77
  http_parser.rb (0.6.0)
80
78
  httpclient (2.8.3)
81
79
  json (1.8.6)
82
- jwt (1.5.6)
80
+ jwt (2.1.0)
83
81
  little-plugger (1.1.4)
84
82
  logging (2.2.2)
85
83
  little-plugger (~> 1.1)
data/fluent-plugin-google-cloud.gemspec CHANGED
@@ -10,7 +10,7 @@ eos
10
10
  gem.homepage =
11
11
  'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
12
12
  gem.license = 'Apache-2.0'
13
- gem.version = '0.6.10.pre.1'
13
+ gem.version = '0.6.10.pre.2'
14
14
  gem.authors = ['Todd Derr', 'Alex Robinson']
15
15
  gem.email = ['salty@google.com']
16
16
  gem.required_ruby_version = Gem::Requirement.new('>= 2.0')
@@ -23,7 +23,6 @@ eos
23
23
  gem.add_runtime_dependency 'googleapis-common-protos', '~> 1.3'
24
24
  gem.add_runtime_dependency 'google-api-client', '~> 0.14'
25
25
  gem.add_runtime_dependency 'google-cloud-logging', '~> 1.2', '>= 1.2.3'
26
- gem.add_runtime_dependency 'googleauth', '~> 0.4', '< 0.5.2'
27
26
  gem.add_runtime_dependency 'grpc', '~> 1.0'
28
27
  gem.add_runtime_dependency 'json', '~> 1.8'
29
28
 
data/lib/fluent/plugin/out_google_cloud.rb CHANGED
@@ -195,7 +195,7 @@ module Fluent
195
195
  Fluent::Plugin.register_output('google_cloud', self)
196
196
 
197
197
  PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'.freeze
198
- PLUGIN_VERSION = '0.6.10.pre.1'.freeze
198
+ PLUGIN_VERSION = '0.6.10.pre.2'.freeze
199
199
 
200
200
  # Name of the the Google cloud logging write scope.
201
201
  LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'.freeze
@@ -327,6 +327,11 @@ module Fluent
327
327
  # gRPC path (use_grpc = true).
328
328
  config_param :logging_api_url, :string, :default => DEFAULT_LOGGING_API_URL
329
329
 
330
+ # Whether to use a secure channel when talking to the Logging API. This
331
+ # should only be false if the Stackdriver Logging Agent is set up to talk
332
+ # to a mocked / stubbed Logging API. Otherwise the requests will fail.
333
+ config_param :use_secure_channel, :bool, :default => true
334
+
330
335
  # Whether to collect metrics about the plugin usage. The mechanism for
331
336
  # collecting and exposing metrics is controlled by the monitoring_type
332
337
  # parameter.
@@ -1728,10 +1733,14 @@ module Fluent
1728
1733
 
1729
1734
  def api_client
1730
1735
  if @use_grpc
1731
- ssl_creds = GRPC::Core::ChannelCredentials.new
1732
- authentication = Google::Auth.get_application_default
1733
- creds = GRPC::Core::CallCredentials.new(authentication.updater_proc)
1734
- creds = ssl_creds.compose(creds)
1736
+ if @use_secure_channel
1737
+ ssl_creds = GRPC::Core::ChannelCredentials.new
1738
+ authentication = Google::Auth.get_application_default
1739
+ creds = GRPC::Core::CallCredentials.new(authentication.updater_proc)
1740
+ creds = ssl_creds.compose(creds)
1741
+ else
1742
+ creds = :this_channel_is_insecure
1743
+ end
1735
1744
  @client = Google::Logging::V2::LoggingServiceV2::Stub.new(
1736
1745
  @logging_api_url, creds)
1737
1746
  else
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-google-cloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.10.pre.1
4
+ version: 0.6.10.pre.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Todd Derr
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-11-13 00:00:00.000000000 Z
12
+ date: 2017-11-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: fluentd
@@ -73,26 +73,6 @@ dependencies:
73
73
  - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: 1.2.3
76
- - !ruby/object:Gem::Dependency
77
- name: googleauth
78
- requirement: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - "~>"
81
- - !ruby/object:Gem::Version
82
- version: '0.4'
83
- - - "<"
84
- - !ruby/object:Gem::Version
85
- version: 0.5.2
86
- type: :runtime
87
- prerelease: false
88
- version_requirements: !ruby/object:Gem::Requirement
89
- requirements:
90
- - - "~>"
91
- - !ruby/object:Gem::Version
92
- version: '0.4'
93
- - - "<"
94
- - !ruby/object:Gem::Version
95
- version: 0.5.2
96
76
  - !ruby/object:Gem::Dependency
97
77
  name: grpc
98
78
  requirement: !ruby/object:Gem::Requirement