fluent-plugin-kubernetes_metadata_filter 2.5.0 → 2.7.0

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 (25) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +7 -7
  3. data/.rubocop.yml +57 -0
  4. data/Gemfile +4 -2
  5. data/Gemfile.lock +50 -42
  6. data/README.md +4 -2
  7. data/Rakefile +15 -11
  8. data/fluent-plugin-kubernetes_metadata_filter.gemspec +25 -27
  9. data/lib/fluent/plugin/filter_kubernetes_metadata.rb +110 -121
  10. data/lib/fluent/plugin/kubernetes_metadata_cache_strategy.rb +22 -18
  11. data/lib/fluent/plugin/kubernetes_metadata_common.rb +44 -63
  12. data/lib/fluent/plugin/kubernetes_metadata_stats.rb +6 -6
  13. data/lib/fluent/plugin/kubernetes_metadata_test_api_adapter.rb +68 -0
  14. data/lib/fluent/plugin/kubernetes_metadata_util.rb +53 -0
  15. data/lib/fluent/plugin/kubernetes_metadata_watch_namespaces.rb +75 -59
  16. data/lib/fluent/plugin/kubernetes_metadata_watch_pods.rb +92 -64
  17. data/test/helper.rb +20 -2
  18. data/test/plugin/test_cache_stats.rb +10 -13
  19. data/test/plugin/test_cache_strategy.rb +158 -160
  20. data/test/plugin/test_filter_kubernetes_metadata.rb +366 -346
  21. data/test/plugin/test_utils.rb +56 -0
  22. data/test/plugin/test_watch_namespaces.rb +188 -125
  23. data/test/plugin/test_watch_pods.rb +282 -202
  24. data/test/plugin/watch_test.rb +14 -15
  25. metadata +49 -66
data/test/plugin/watch_test.rb CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  #
2
4
  # Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
3
5
  # Kubernetes metadata
@@ -17,10 +19,8 @@
17
19
  # limitations under the License.
18
20
  #
19
21
  require_relative '../helper'
20
- require 'ostruct'
21
22
 
22
23
  class WatchTest < Test::Unit::TestCase
23
-
24
24
  def thread_current_running?
25
25
  true
26
26
  end
@@ -37,26 +37,23 @@ class WatchTest < Test::Unit::TestCase
37
37
  Thread.current[:namespace_watch_retry_count] = 0
38
38
 
39
39
  @client = OpenStruct.new
40
- def @client.resourceVersion
41
- '12345'
42
- end
43
- def @client.watch_pods(options = {})
40
+ def @client.watch_pods(_options = {})
44
41
  []
45
42
  end
46
- def @client.watch_namespaces(options = {})
43
+
44
+ def @client.watch_namespaces(_options = {})
47
45
  []
48
46
  end
49
- def @client.get_namespaces(options = {})
50
- self
51
- end
52
- def @client.get_pods(options = {})
53
- self
47
+
48
+ def @client.get_namespaces(_options = {})
49
+ { items: [], metadata: { resourceVersion: '12345' } }
54
50
  end
55
51
 
56
- @exception_raised = OpenStruct.new
57
- def @exception_raised.each
58
- raise Exception
52
+ def @client.get_pods(_options = {})
53
+ { items: [], metadata: { resourceVersion: '12345' } }
59
54
  end
55
+
56
+ @exception_raised = :blow_up_when_used
60
57
  end
61
58
 
62
59
  def watcher=(value)
@@ -66,8 +63,10 @@ class WatchTest < Test::Unit::TestCase
66
63
  logger = {}
67
64
  def logger.debug(message)
68
65
  end
66
+
69
67
  def logger.info(message, error)
70
68
  end
69
+
71
70
  def logger.error(message, error)
72
71
  end
73
72
  logger
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-kubernetes_metadata_filter
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.0
4
+ version: 2.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jimmi Dyson
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-07-01 00:00:00.000000000 Z
11
+ date: 2021-05-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fluentd
@@ -19,7 +19,7 @@ dependencies:
19
19
  version: 0.14.0
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
- version: '1.12'
22
+ version: '1.13'
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,21 @@ dependencies:
29
29
  version: 0.14.0
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
- version: '1.12'
32
+ version: '1.13'
33
+ - !ruby/object:Gem::Dependency
34
+ name: kubeclient
35
+ requirement: !ruby/object:Gem::Requirement
36
+ requirements:
37
+ - - "<"
38
+ - !ruby/object:Gem::Version
39
+ version: '5'
40
+ type: :runtime
41
+ prerelease: false
42
+ version_requirements: !ruby/object:Gem::Requirement
43
+ requirements:
44
+ - - "<"
45
+ - !ruby/object:Gem::Version
46
+ version: '5'
33
47
  - !ruby/object:Gem::Dependency
34
48
  name: lru_redux
35
49
  requirement: !ruby/object:Gem::Requirement
@@ -45,19 +59,19 @@ dependencies:
45
59
  - !ruby/object:Gem::Version
46
60
  version: '0'
47
61
  - !ruby/object:Gem::Dependency
48
- name: kubeclient
62
+ name: bump
49
63
  requirement: !ruby/object:Gem::Requirement
50
64
  requirements:
51
- - - "<"
65
+ - - ">="
52
66
  - !ruby/object:Gem::Version
53
- version: '5'
54
- type: :runtime
67
+ version: '0'
68
+ type: :development
55
69
  prerelease: false
56
70
  version_requirements: !ruby/object:Gem::Requirement
57
71
  requirements:
58
- - - "<"
72
+ - - ">="
59
73
  - !ruby/object:Gem::Version
60
- version: '5'
74
+ version: '0'
61
75
  - !ruby/object:Gem::Dependency
62
76
  name: bundler
63
77
  requirement: !ruby/object:Gem::Requirement
@@ -73,7 +87,7 @@ dependencies:
73
87
  - !ruby/object:Gem::Version
74
88
  version: '2.0'
75
89
  - !ruby/object:Gem::Dependency
76
- name: rake
90
+ name: copyright-header
77
91
  requirement: !ruby/object:Gem::Requirement
78
92
  requirements:
79
93
  - - ">="
@@ -101,61 +115,47 @@ dependencies:
101
115
  - !ruby/object:Gem::Version
102
116
  version: '4.0'
103
117
  - !ruby/object:Gem::Dependency
104
- name: test-unit
118
+ name: rake
105
119
  requirement: !ruby/object:Gem::Requirement
106
120
  requirements:
107
- - - "~>"
121
+ - - ">="
108
122
  - !ruby/object:Gem::Version
109
- version: 3.0.2
123
+ version: '0'
110
124
  type: :development
111
125
  prerelease: false
112
126
  version_requirements: !ruby/object:Gem::Requirement
113
127
  requirements:
114
- - - "~>"
128
+ - - ">="
115
129
  - !ruby/object:Gem::Version
116
- version: 3.0.2
130
+ version: '0'
117
131
  - !ruby/object:Gem::Dependency
118
- name: test-unit-rr
132
+ name: test-unit
119
133
  requirement: !ruby/object:Gem::Requirement
120
134
  requirements:
121
135
  - - "~>"
122
136
  - !ruby/object:Gem::Version
123
- version: 1.0.3
137
+ version: 3.0.2
124
138
  type: :development
125
139
  prerelease: false
126
140
  version_requirements: !ruby/object:Gem::Requirement
127
141
  requirements:
128
142
  - - "~>"
129
143
  - !ruby/object:Gem::Version
130
- version: 1.0.3
131
- - !ruby/object:Gem::Dependency
132
- name: copyright-header
133
- requirement: !ruby/object:Gem::Requirement
134
- requirements:
135
- - - ">="
136
- - !ruby/object:Gem::Version
137
- version: '0'
138
- type: :development
139
- prerelease: false
140
- version_requirements: !ruby/object:Gem::Requirement
141
- requirements:
142
- - - ">="
143
- - !ruby/object:Gem::Version
144
- version: '0'
144
+ version: 3.0.2
145
145
  - !ruby/object:Gem::Dependency
146
- name: webmock
146
+ name: test-unit-rr
147
147
  requirement: !ruby/object:Gem::Requirement
148
148
  requirements:
149
- - - ">="
149
+ - - "~>"
150
150
  - !ruby/object:Gem::Version
151
- version: '0'
151
+ version: 1.0.3
152
152
  type: :development
153
153
  prerelease: false
154
154
  version_requirements: !ruby/object:Gem::Requirement
155
155
  requirements:
156
- - - ">="
156
+ - - "~>"
157
157
  - !ruby/object:Gem::Version
158
- version: '0'
158
+ version: 1.0.3
159
159
  - !ruby/object:Gem::Dependency
160
160
  name: vcr
161
161
  requirement: !ruby/object:Gem::Requirement
@@ -171,7 +171,7 @@ dependencies:
171
171
  - !ruby/object:Gem::Version
172
172
  version: '0'
173
173
  - !ruby/object:Gem::Dependency
174
- name: bump
174
+ name: webmock
175
175
  requirement: !ruby/object:Gem::Requirement
176
176
  requirements:
177
177
  - - ">="
@@ -207,6 +207,7 @@ extra_rdoc_files: []
207
207
  files:
208
208
  - ".circleci/config.yml"
209
209
  - ".gitignore"
210
+ - ".rubocop.yml"
210
211
  - Gemfile
211
212
  - Gemfile.lock
212
213
  - LICENSE.txt
@@ -217,6 +218,8 @@ files:
217
218
  - lib/fluent/plugin/kubernetes_metadata_cache_strategy.rb
218
219
  - lib/fluent/plugin/kubernetes_metadata_common.rb
219
220
  - lib/fluent/plugin/kubernetes_metadata_stats.rb
221
+ - lib/fluent/plugin/kubernetes_metadata_test_api_adapter.rb
222
+ - lib/fluent/plugin/kubernetes_metadata_util.rb
220
223
  - lib/fluent/plugin/kubernetes_metadata_watch_namespaces.rb
221
224
  - lib/fluent/plugin/kubernetes_metadata_watch_pods.rb
222
225
  - test/cassettes/invalid_api_server_config.yml
@@ -237,6 +240,7 @@ files:
237
240
  - test/plugin/test_cache_stats.rb
238
241
  - test/plugin/test_cache_strategy.rb
239
242
  - test/plugin/test_filter_kubernetes_metadata.rb
243
+ - test/plugin/test_utils.rb
240
244
  - test/plugin/test_watch_namespaces.rb
241
245
  - test/plugin/test_watch_pods.rb
242
246
  - test/plugin/watch_test.rb
@@ -244,7 +248,7 @@ homepage: https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter
244
248
  licenses:
245
249
  - Apache-2.0
246
250
  metadata: {}
247
- post_install_message:
251
+ post_install_message:
248
252
  rdoc_options: []
249
253
  require_paths:
250
254
  - lib
@@ -252,36 +256,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
252
256
  requirements:
253
257
  - - ">="
254
258
  - !ruby/object:Gem::Version
255
- version: 2.1.0
259
+ version: 2.5.0
256
260
  required_rubygems_version: !ruby/object:Gem::Requirement
257
261
  requirements:
258
262
  - - ">="
259
263
  - !ruby/object:Gem::Version
260
264
  version: '0'
261
265
  requirements: []
262
- rubygems_version: 3.0.8
263
- signing_key:
266
+ rubygems_version: 3.1.4
267
+ signing_key:
264
268
  specification_version: 4
265
269
  summary: Fluentd filter plugin to add Kubernetes metadata
266
- test_files:
267
- - test/cassettes/invalid_api_server_config.yml
268
- - test/cassettes/kubernetes_docker_metadata_annotations.yml
269
- - test/cassettes/kubernetes_docker_metadata_dotted_labels.yml
270
- - test/cassettes/kubernetes_get_api_v1.yml
271
- - test/cassettes/kubernetes_get_api_v1_using_token.yml
272
- - test/cassettes/kubernetes_get_namespace_default.yml
273
- - test/cassettes/kubernetes_get_namespace_default_using_token.yml
274
- - test/cassettes/kubernetes_get_pod.yml
275
- - test/cassettes/kubernetes_get_pod_using_token.yml
276
- - test/cassettes/metadata_from_tag_and_journald_fields.yml
277
- - test/cassettes/metadata_from_tag_journald_and_kubernetes_fields.yml
278
- - test/cassettes/valid_kubernetes_api_server.yml
279
- - test/cassettes/valid_kubernetes_api_server_using_token.yml
280
- - test/helper.rb
281
- - test/plugin/test.token
282
- - test/plugin/test_cache_stats.rb
283
- - test/plugin/test_cache_strategy.rb
284
- - test/plugin/test_filter_kubernetes_metadata.rb
285
- - test/plugin/test_watch_namespaces.rb
286
- - test/plugin/test_watch_pods.rb
287
- - test/plugin/watch_test.rb
270
+ test_files: []