fluent-plugin-kubernetes_metadata_filter 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e681f40b4be02d8a14e5007db2a02b008a0d0c10
-  data.tar.gz: 90a8f673cc88889b277cdc82e324cf6010b61b9d
+SHA256:
+  metadata.gz: d31ac807f14fb0b2022253ea499c950cf3a549fa805b4145cc68704bf89f94c2
+  data.tar.gz: e4b1065aaa81240212171a9c661da46ec7df01ee6696531cf2a54a4b5c27864a
 SHA512:
-  metadata.gz: '036584634cb5609c106c3e6b6492958782a1701aea68f7a2ab5223dd3b9476c86a92c1e982ed49bfd4be2ab1f19f2a639515271982eea8dd2d993ba1c3fe98f7'
-  data.tar.gz: 0acf8ca916880e819bc197aa52a1de26dfa5bc7af1920d77a2b8d8cd931d2dfe2adba368561b6c297751572dfa5fc3954f379c927801579d38793061ab6712e0
+  metadata.gz: 1161bed66cd4da96c0baf942ad17fbb7fa67de144d2aa53a0c3984c3114adffcd67e47a91602869a491056faecb44beffa5ca04cec12df5493b6b55870b3378b
+  data.tar.gz: '0822363e158a8f0e970a068f72357bc1e2137c24dac17ba01be94463c6e111bb39f9f508187af6a08fddb1c265bced97411a511fadd7988b6d0e5804853b5647'

data/Gemfile

@@ -1,7 +1,11 @@
 source 'https://rubygems.org'
 
 gem 'codeclimate-test-reporter', '<1.0.0', :group => :test, :require => nil
-gem 'rubocop', require: false
+if RUBY_VERSION == "2.0.0"
+  gem 'rubocop', '<0.51.0', require: false
+else
+  gem 'rubocop', require: false
+end
 
 # Specify your gem's dependencies in fluent-plugin-add.gemspec
 gemspec

data/fluent-plugin-kubernetes_metadata_filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-kubernetes_metadata_filter"
-  gem.version       = "1.2.1"
+  gem.version       = "1.2.2"
   gem.authors       = ["Jimmi Dyson"]
   gem.email         = ["jimmidyson@gmail.com"]
   gem.description   = %q{Filter plugin to add Kubernetes metadata}
@@ -23,9 +23,18 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "fluentd", ">= 0.12.0"
   gem.add_runtime_dependency "lru_redux"
   gem.add_runtime_dependency "kubeclient", "~> 1.1.4"
+  if RUBY_VERSION == "2.0.0"
+    gem.add_runtime_dependency "public_suffix", "< 3"
+    gem.add_runtime_dependency "parallel", "< 1.14"
+    gem.add_runtime_dependency "rainbow", "< 3"
+  end
 
   gem.add_development_dependency "bundler", "~> 1.3"
-  gem.add_development_dependency "rake"
+  if RUBY_VERSION == "2.0.0"
+    gem.add_development_dependency "rake", "< 13"
+  else
+    gem.add_development_dependency "rake"
+  end
   gem.add_development_dependency "minitest", "~> 4.0"
   gem.add_development_dependency "test-unit", "~> 3.0.2"
   gem.add_development_dependency "test-unit-rr", "~> 1.0.3"

data/lib/fluent/plugin/filter_kubernetes_metadata.rb

@@ -126,7 +126,7 @@ module Fluent
             metadata = parse_namespace_metadata(metadata)
             @stats.bump(:namespace_cache_api_updates)
             log.trace("parsed metadata for #{namespace_name}: #{metadata}") if log.trace?
-             @namespace_cache[metadata['namespace_id']] = metadata
+            @namespace_cache[metadata['namespace_id']] = metadata
             return metadata
           rescue Exception => e
             log.debug(e)
@@ -154,7 +154,6 @@ module Fluent
       end
 
       require 'kubeclient'
-      require 'active_support/core_ext/object/blank'
       require 'lru_redux'
       @stats = KubernetesMetadata::Stats.new
 

data/lib/fluent/plugin/kubernetes_metadata_common.rb

@@ -103,3 +103,29 @@ module KubernetesMetadata
 
   end
 end
+
+# copied from activesupport
+class Object
+  # An object is blank if it's false, empty, or a whitespace string.
+  # For example, +nil+, '', '   ', [], {}, and +false+ are all blank.
+  #
+  # This simplifies
+  #
+  #   !address || address.empty?
+  #
+  # to
+  #
+  #   address.blank?
+  #
+  # @return [true, false]
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+
+  # An object is present if it's not blank.
+  #
+  # @return [true, false]
+  def present?
+    !blank?
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -249,8 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Fluentd filter plugin to add Kubernetes metadata