fluent-plugin-kubernetes-objects 1.0.0 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d39161509a5767c7b3bb242c99b750af77fd3d5999b37afc58fc8a450f9f68be
-  data.tar.gz: c87dd9f4fe3c9003cc56f5033d0492eb0f4c558ad2fefe00cb312c7ed8896910
+  metadata.gz: 23311c5c8d08571e1421a02d990106536269c56c13a7010eb33ff468374524d7
+  data.tar.gz: 30a04f002df00e89d8d7ba000f060d6d410d99ce6d1b9301d46b8309ef330561
 SHA512:
-  metadata.gz: 030e4ff7c8ed1a20fd6b27b10a8324e07e0e0d47c4ee36438c199a919ff8c71fadb728bd3c50ba91bf23db801acdd0873704d71201ad4c7321db94ee4e98cd79
-  data.tar.gz: 2eaa921a968b667d146b195239e8ed2661d7662116abc6c1388d8a1248abb1c75043dfa4bb3e3cafd431039867e7fb018219cfabc047358fd56ecade3622fbec
+  metadata.gz: 6dea9c0003540c9ed06b715c64cb7ba4fdce1fa538d3e0b5e11a3c0ab23b4b254f80074bd9872d26600e3b6b2fe181ea221ba33fac91c91b02925b2515a48c34
+  data.tar.gz: db71c9f00e2ff3b2d35f2340b95b7a4f826fe38f2ed3bc771d444296ea80748c0127b5b38b8b1d677253a9af9e7c420180ba1bb43f589f99141b7c412e056d42

data/Gemfile

@@ -1,6 +1,10 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+group :test do
+  gem 'simplecov', require: false
+end
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in fluent-plugin-kubernetes_objects_input.gemspec
 gemspec

data/Gemfile.lock

@@ -1,91 +1,106 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-objects (1.0.0)
-      fluentd (~> 1.0)
-      kubeclient (~> 3.0)
+    fluent-plugin-kubernetes-objects (1.1.4)
+      fluentd (~> 1.9.1)
+      http_parser.rb (= 0.5.3)
+      kubeclient (~> 4.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    cool.io (1.5.3)
+    concurrent-ruby (1.1.6)
+    cool.io (1.6.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    dig_rb (1.0.1)
-    domain_name (0.5.20170404)
+    docile (1.3.1)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    fluentd (1.1.0)
+    ffi (1.12.2)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    fluentd (1.9.2)
       cool.io (>= 1.4.5, < 2.0.0)
-      dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
-      msgpack (>= 0.7.0, < 2.0.0)
+      msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.0.4, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.2, < 1.0.0)
-      tzinfo (~> 1.0)
+      tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
       yajl-ruby (~> 1.0)
-    hashdiff (0.3.7)
-    http (2.2.2)
+    hashdiff (0.3.8)
+    http (4.3.0)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
-      http-form_data (~> 1.0.1)
-      http_parser.rb (~> 0.6.0)
+      http-form_data (~> 2.2)
+      http-parser (~> 1.2.0)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (1.0.3)
-    http_parser.rb (0.6.0)
-    kubeclient (3.0.0)
-      http (~> 2.2.2)
-      recursive-open-struct (~> 1.0.4)
+    http-form_data (2.2.0)
+    http-parser (1.2.1)
+      ffi-compiler (>= 1.0, < 2.0)
+    http_parser.rb (0.5.3)
+    json (2.3.1)
+    kubeclient (4.6.0)
+      http (>= 3.0, < 5.0)
+      recursive-open-struct (~> 1.0, >= 1.0.4)
       rest-client (~> 2.0)
-    mime-types (3.1)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2019.1009)
     minitest (5.11.3)
-    msgpack (1.2.4)
+    msgpack (1.3.3)
     netrc (0.11.0)
-    power_assert (1.1.1)
-    public_suffix (3.0.2)
-    rake (10.5.0)
-    recursive-open-struct (1.0.5)
-    rest-client (2.0.2)
+    power_assert (1.1.3)
+    public_suffix (3.0.3)
+    rake (13.0.1)
+    recursive-open-struct (1.1.0)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     safe_yaml (1.0.4)
-    serverengine (2.0.6)
+    serverengine (2.2.1)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     strptime (0.2.3)
-    test-unit (3.2.7)
+    test-unit (3.3.0)
       power_assert
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2018.3)
+    tzinfo (2.0.1)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
-    webmock (3.3.0)
+    unf_ext (0.0.7.6)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    yajl-ruby (1.3.1)
+    yajl-ruby (1.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0)
   fluent-plugin-kubernetes-objects!
-  minitest (~> 5.0)
-  rake (~> 10.0)
-  test-unit (~> 3.0)
-  webmock (~> 3.2)
+  minitest (~> 5.11)
+  rake (>= 12.0)
+  simplecov
+  test-unit (~> 3.3)
+  webmock (~> 3.5)
 
 BUNDLED WITH
-   1.16.1
+   2.1.4

data/README.md

@@ -1,4 +1,4 @@
-[ ![Codeship Status for splunk/fluent-plugin-kubernetes-objects](https://app.codeship.com/projects/8ae91f00-261e-0136-02ab-6e830b67b562/status?branch=master)](https://app.codeship.com/projects/286766)
+[![CircleCI](https://circleci.com/gh/git-lfs/git-lfs.svg?style=shield&circle-token=856152c2b02bfd236f54d21e1f581f3e4ebf47ad)](https://circleci.com/gh/splunk/fluent-plugin-kubernetes-objects)
 # fluent-plugin-kubernetes-objects
 
 [Fluentd](https://fluentd.org/) input plugin to collect [objects](https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/) in a kubernetes cluster.

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/VERSION

@@ -0,0 +1 @@
+1.1.4

data/fluent-plugin-kubernetes-objects.gemspec

@@ -1,43 +1,33 @@
 Gem::Specification.new do |spec|
-  spec.name          = "fluent-plugin-kubernetes-objects"
-  spec.version       = "1.0.0"
-  spec.authors       = ["Gimi Liang"]
-  spec.email         = ["zliang@splunk.com"]
+  spec.name          = 'fluent-plugin-kubernetes-objects'
+  spec.version       = File.read('VERSION')
+  spec.authors       = ['Splunk Inc.']
+  spec.email         = ['DataEdge@splunk.com']
 
-  spec.summary       = %q{Fluentd Plugin for Kubernetes Objects.}
-  spec.description   = %q{A Fluentd input plugin for collecting Kubernetes objects, e.g. pods, namespaces, events, etc. by pulling or watching.}
-  spec.homepage      = "https://github.com/splunk/fluent-plugin-kubernetes-objects"
-  spec.license       = "Apache-2.0"
+  spec.summary       = 'Fluentd Plugin for Kubernetes Objects.'
+  spec.description   = 'A Fluentd input plugin for collecting Kubernetes objects, e.g. pods, namespaces, events, etc. by pulling or watching.'
+  spec.homepage      = 'https://github.com/splunk/fluent-plugin-kubernetes-objects'
+  spec.license       = 'Apache-2.0'
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against " \
-  #     "public gem pushes."
-  # end
-
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
   spec.test_files    = Dir.glob('test/**/**.rb')
   spec.files         = %w[
     CODE_OF_CONDUCT.md README.md LICENSE
     fluent-plugin-kubernetes-objects.gemspec
     Gemfile Gemfile.lock
-    Rakefile
+    Rakefile VERSION
   ] + Dir.glob('lib/**/**').reject(&File.method(:directory?))
 
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-
   spec.required_ruby_version = '>= 2.3.0'
+  spec.add_runtime_dependency 'fluentd', '~> 1.9.1'
+  spec.add_runtime_dependency 'kubeclient', '~> 4.6.0'
+  spec.add_runtime_dependency 'http_parser.rb', '= 0.5.3'
 
-  spec.add_runtime_dependency "fluentd", "~> 1.0"
-  spec.add_runtime_dependency "kubeclient", "~> 3.0"
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "test-unit", "~> 3.0" # required by fluent/test.rb
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "webmock", "~> 3.2"
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'minitest', '~> 5.11'
+  spec.add_development_dependency 'rake', '>= 12.0'
+  spec.add_development_dependency 'test-unit', '~> 3.3' # required by fluent/test.rb
+  spec.add_development_dependency 'webmock', '~> 3.5'
 end

data/lib/fluent/plugin/in_kubernetes_objects.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "fluent/plugin/input"
+require 'fluent/plugin/input'
 require 'kubeclient'
 
 module Fluent::Plugin
   class KubernetesObjectsInput < Fluent::Plugin::Input
-    VERSION = "1.0.0"
+    VERSION = '1.1.2'.freeze
 
     Fluent::Plugin.register_input('kubernetes_objects', self)
 
@@ -72,21 +72,24 @@ module Fluent::Plugin
 
       desc 'A selector to restrict the list of returned objects by fields.'
       config_param :field_selector, :string, default: nil
+
+      desc 'The interval at which the objects will be watched.'
+      config_param :interval, :time, default: 15 * 60
     end
 
     config_section :storage do
       # use memory by default
-      config_set_default :usage, "checkpoints"
-      config_set_default :@type, "local"
+      config_set_default :usage, 'checkpoints'
+      config_set_default :@type, 'local'
       config_set_default :persistent, false
     end
 
     def configure(conf)
       super
 
-      raise Fluent::ConfigError, "At least one <pull> or <watch> is required, but found none." if @pull_objects.empty? && @watch_objects.empty?
+      raise Fluent::ConfigError, 'At least one <pull> or <watch> is required, but found none.' if @pull_objects.empty? && @watch_objects.empty?
 
-      @storage = storage_create usage: "checkpoints"
+      @storage = storage_create usage: 'checkpoints'
 
       parse_tag
       initialize_client
@@ -99,7 +102,6 @@ module Fluent::Plugin
     end
 
     def close
-      @watchers.each &:finish if @watchers
       super
     end
 
@@ -115,54 +117,69 @@ module Fluent::Plugin
       [@tag_prefix, item_name, @tag_suffix].join
     end
 
+    def init_with_kubeconfig()
+      options = {}
+      config = Kubeclient::Config.read @kubeconfig
+      current_context = config.context
+
+      @client = Kubeclient::Client.new(
+        current_context.api_endpoint,
+        current_context.api_version,
+        options.merge(
+          ssl_options: current_context.ssl_options,
+          auth_options: current_context.auth_options
+        )
+      )
+    end
+
     def initialize_client
       # mostly borrowed from Fluentd Kubernetes Metadata Filter Plugin
       if @kubernetes_url.nil?
-	# Use Kubernetes default service account if we're in a pod.
-	env_host = ENV['KUBERNETES_SERVICE_HOST']
-	env_port = ENV['KUBERNETES_SERVICE_PORT']
-	if env_host && env_port
-	  @kubernetes_url = "https://#{env_host}:#{env_port}/#{@api_version == 'v1' ? 'api' : 'apis'}"
-	end
+        # Use Kubernetes default service account if we're in a pod.
+        env_host = ENV['KUBERNETES_SERVICE_HOST']
+        env_port = ENV['KUBERNETES_SERVICE_PORT']
+        if env_host && env_port
+          @kubernetes_url = "https://#{env_host}:#{env_port}/#{@api_version == 'v1' ? 'api' : 'apis'}"
+        end
       end
 
-      raise Fluent::ConfigError, "kubernetes url is not set" unless @kubernetes_url
+      raise Fluent::ConfigError, 'kubernetes url is not set' unless @kubernetes_url
 
       # Use SSL certificate and bearer token from Kubernetes service account.
       if Dir.exist?(@secret_dir)
-	secret_ca_file = File.join(@secret_dir, 'ca.cert')
-	secret_token_file = File.join(@secret_dir, 'token')
+        secret_ca_file = File.join(@secret_dir, 'ca.crt')
+        secret_token_file = File.join(@secret_dir, 'token')
 
-	if @ca_file.nil? and File.exist?(secret_ca_file)
-	  @ca_file = secret_ca_file
-	end
+        if @ca_file.nil? && File.exist?(secret_ca_file)
+          @ca_file = secret_ca_file
+        end
 
-	if @bearer_token_file.nil? and File.exist?(secret_token_file)
-	  @bearer_token_file = secret_token_file
-	end
+        if @bearer_token_file.nil? && File.exist?(secret_token_file)
+          @bearer_token_file = secret_token_file
+        end
       end
 
       ssl_options = {
-	client_cert: @client_cert && OpenSSL::X509::Certificate.new(File.read(@client_cert)),
-	client_key:  @client_key && OpenSSL::PKey::RSA.new(File.read(@client_key)),
-	ca_file:     @ca_file,
-	verify_ssl:  @insecure_ssl ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
+        client_cert: @client_cert && OpenSSL::X509::Certificate.new(File.read(@client_cert)),
+        client_key: @client_key && OpenSSL::PKey::RSA.new(File.read(@client_key)),
+        ca_file: @ca_file,
+        verify_ssl: @insecure_ssl ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
       }
 
       auth_options = {}
       auth_options[:bearer_token] = File.read(@bearer_token_file) if @bearer_token_file
 
       @client = Kubeclient::Client.new(
-	@kubernetes_url, @api_version,
-	ssl_options: ssl_options,
-	auth_options: auth_options
+        @kubernetes_url, @api_version,
+        ssl_options: ssl_options,
+        auth_options: auth_options
       )
 
       begin
-	@client.api_valid?
+          @client.api_valid?
       rescue KubeException => kube_error
-	raise Fluent::ConfigError, "Invalid Kubernetes API #{@api_version} endpoint #{@kubernetes_url}: #{kube_error.message}"
-      end
+        raise Fluent::ConfigError, "Invalid Kubernetes API #{@api_version} endpoint #{@kubernetes_url}: #{kube_error.message}"
+        end
     end
 
     def start_pullers
@@ -170,16 +187,7 @@ module Fluent::Plugin
     end
 
     def start_watchers
-      @watchers = @watch_objects.map do |o|
-	o = o.to_h.dup
-	o[:as] = :raw
-	resource_name = o.delete(:resource_name)
-	version = @storage.get(resource_name)
-	o[:resource_version] = version if version
-	@client.public_send("watch_#{resource_name}", o).tap { |watcher|
-	  create_watcher_thread resource_name, watcher
-	}
-      end
+      @watch_objects.each(&method(:create_watcher_thread))
     end
 
     def create_pull_thread(conf)
@@ -189,49 +197,68 @@ module Fluent::Plugin
       pull_interval = options.delete :interval
 
       thread_create :"pull_#{resource_name}" do
-	tag = generate_tag resource_name
-	while thread_current_running?
-	  log.debug "Going to pull #{resource_name}"
-	  response = @client.public_send "get_#{resource_name}", options
-	  now = Fluent::Engine.now
-	  es = Fluent::MultiEventStream.new
-
-	  # code copied from kubeclient
-	  # kubeclient will create one open struct object for each item in the response,
-	  # but this is totally unecessary in this plugin, thus we use as: :raw.
-	  result = JSON.parse(response)
-
-	  resource_version = result.fetch('resourceVersion') {
-	    result.fetch('metadata', {})['resourceVersion']
-	  }
-
-	  update_op = if resource_version
-			->(item) { item['metadata'].update requestResourceVersion: resource_version }
-		      else
-			->(item) {}
-		      end
-
-	  # result['items'] might be nil due to https://github.com/kubernetes/kubernetes/issues/13096
-	  items = result['items'].to_a
-	  log.debug { "Received #{items.size} #{resource_name}" }
-	  items.each { |item| es.add now, item.tap(&update_op) }
-	  router.emit_stream(tag, es)
-
-	  sleep(pull_interval)
-	end
+        tag = generate_tag resource_name
+        while thread_current_running?
+          log.debug "Going to pull #{resource_name}"
+          response = @client.public_send "get_#{resource_name}", options
+          now = Fluent::Engine.now
+          es = Fluent::MultiEventStream.new
+
+          # code copied from kubeclient
+          # kubeclient will create one open struct object for each item in the response,
+          # but this is totally unecessary in this plugin, thus we use as: :raw.
+          result = JSON.parse(response)
+
+          resource_version = result.fetch('resourceVersion') do
+            result.fetch('metadata', {})['resourceVersion']
+          end
+
+          update_op = if resource_version
+                        ->(item) { item['metadata'].update requestResourceVersion: resource_version }
+                      else
+                        ->(item) {}
+                      end
+
+          # result['items'] might be nil due to https://github.com/kubernetes/kubernetes/issues/13096
+          items = result['items'].to_a
+          log.debug { "Received #{items.size} #{resource_name}" }
+          items.each { |item| es.add now, item.tap(&update_op) }
+          router.emit_stream(tag, es)
+
+          sleep(pull_interval)
+        end
       end
     end
 
-    def create_watcher_thread(object_name, watcher)
-      thread_create(:"watch_#{object_name}") {
-	tag = generate_tag "#{object_name}.watch"
-	watcher.each { |entity|
-	  log.trace { "Received new object from watching #{object_name}"}
-	  entity = JSON.parse(entity)
-	  router.emit tag, Fluent::Engine.now, entity
-	  @storage.put object_name, entity['object']['metadata']['resourceVersion']
-	}
-      }
+    def create_watcher_thread(conf)
+      options = conf.to_h.dup
+      options[:as] = :raw
+      resource_name = options[:resource_name]
+      version = @storage.get(resource_name)
+      if version
+        options[:resource_version] = version
+      else
+        options[:resource_version] = 0
+      end
+
+      thread_create :"watch_#{resource_name}" do
+        while thread_current_running?
+          @client.public_send("watch_#{resource_name}", options).tap do |watcher|
+            tag = generate_tag "#{resource_name}"
+            watcher.each do |entity|
+              begin
+                entity = JSON.parse(entity)
+                router.emit tag, Fluent::Engine.now, entity
+                options[:resource_version] = entity['object']['metadata']['resourceVersion']
+                @storage.put resource_name, entity['object']['metadata']['resourceVersion']
+              rescue => e
+                log.info "Got exception #{e} parsing entity #{entity}. Resetting watcher."
+              end
+            end
+          end
+        end
+      end
     end
   end
 end
+

data/test/fluent/plugin/in_kubernetes_objects_test.rb

@@ -1,4 +1,5 @@
 require "test_helper"
+require 'fluent/plugin/in_kubernetes_objects.rb'
 
 describe Fluent::Plugin::KubernetesObjectsInput do
   include Fluent::Test::Helpers
@@ -10,8 +11,10 @@ describe Fluent::Plugin::KubernetesObjectsInput do
   }
     
   it { expect(::Fluent::Plugin::KubernetesObjectsInput::VERSION).wont_be_nil }
+    puts 'Test: Version will not be nil'
 
   it "should require at least one <pull> or <watch> section" do
+    puts 'Test: should require at least one <pull> or <watch> section'
     expect{create_input_driver("kubernetes_url #{k8s_url}")}.must_raise Fluent::ConfigError
     expect(create_input_driver(<<~CONF)).wont_be_nil
     kubernetes_url #{k8s_url}
@@ -29,6 +32,7 @@ describe Fluent::Plugin::KubernetesObjectsInput do
 
   describe "config: kubernetes_url" do
     it "should read from environment variables by default" do
+      puts 'Test: should read from environment variables by default'
       ENV['KUBERNETES_SERVICE_HOST'] = k8s_host
       ENV['KUBERNETES_SERVICE_PORT'] = k8s_port
       expect(create_input_driver(<<~CONF).instance.kubernetes_url).must_equal k8s_url
@@ -39,6 +43,7 @@ describe Fluent::Plugin::KubernetesObjectsInput do
     end
 
     it "should panic if not set" do
+      puts 'Test: should panic if not set'
       ENV['KUBERNETES_SERVICE_HOST'] = nil
       ENV['KUBERNETES_SERVICE_PORT'] = nil
       expect{ create_input_driver(<<~CONF) }.must_raise Fluent::ConfigError
@@ -49,6 +54,7 @@ describe Fluent::Plugin::KubernetesObjectsInput do
     end
 
     it "should use pick the right path" do
+      puts 'Test: should use pick the right path'
       ENV['KUBERNETES_SERVICE_HOST'] = k8s_host
       ENV['KUBERNETES_SERVICE_PORT'] = k8s_port
       expect(create_input_driver(<<~CONF).instance.kubernetes_url).must_equal k8s_url('apis')
@@ -62,6 +68,7 @@ describe Fluent::Plugin::KubernetesObjectsInput do
 
   describe "emit events" do
     it "can pull one resource" do
+      puts 'Test: can pull one resource'
       d = create_input_driver(<<~CONF)
       kubernetes_url #{k8s_url}
       <pull>
@@ -76,6 +83,7 @@ describe Fluent::Plugin::KubernetesObjectsInput do
     end
 
     it "can pull multiple resources" do
+      puts 'Test: can pull multiple resources'
       d = create_input_driver(<<~CONF)
       kubernetes_url #{k8s_url}
       <pull>
@@ -94,6 +102,7 @@ describe Fluent::Plugin::KubernetesObjectsInput do
     end
 
     it "can watch resources" do
+      puts 'Test: can watch resources'
       d = create_input_driver(<<~CONF)
       kubernetes_url #{k8s_url}
       <watch>
@@ -101,33 +110,38 @@ describe Fluent::Plugin::KubernetesObjectsInput do
       </watch>
       CONF
 
+      stub_k8s_events params: {resourceVersion: "0"}
+      stub_k8s_events params: {resourceVersion: "6621683"}
+
       d.run expect_emits: 1, timeout: 3
       events = d.events
-      expect(events.all? { |e| e[0] == 'kubernetes.events.watch'}).must_equal true
+      expect(events.all? { |e| e[0] == 'kubernetes.events'}).must_equal true
     end
 
     it "should use checkpoints for watching" do
+      puts 'Test: should use checkpoints for watching'
       begin
-	require 'tempfile'
-	f = Tempfile.new("fluentd-k8s-objects-test", encoding: 'utf-8')
-	f.write('{"events": "123456"}')
-	f.close
-
-	d = create_input_driver(<<~CONF)
-	kubernetes_url #{k8s_url}
-	<storage>
-	   path #{f.path}
-	</storage>
-	<watch>
-	resource_name events
-	</watch>
-	CONF
-
-	stub_k8s_events params: {resourceVersion: "123456"}
-
-	d.run expect_emits: 1, timeout: 3
+        require 'tempfile'
+        f = Tempfile.new("fluentd-k8s-objects-test", encoding: 'utf-8')
+        f.write('{"events": "123456"}')
+        f.close
+
+        d = create_input_driver(<<~CONF)
+        kubernetes_url #{k8s_url}
+        <storage>
+           path #{f.path}
+        </storage>
+        <watch>
+        resource_name events
+        </watch>
+        CONF
+
+        stub_k8s_events params: {resourceVersion: "123456"}
+        stub_k8s_events params: {resourceVersion: "6621683"}
+
+        d.run expect_emits: 1, timeout: 3
       ensure
-	f.unlink
+        f.unlink
       end
     end
   end

data/test/test_helper.rb

@@ -1,18 +1,19 @@
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-#$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require 'simplecov'
+SimpleCov.start
 
-# suppress warning, when require the 'http' library, it shows circle require warnning,
+$LOAD_PATH.unshift(File.expand_path('..', __dir__))
+
+# suppress warning, when require the 'http' library shows circle require warning
 # which is pretty annoying (kubeclient depends on http for watch_stream)
 _verbose = $VERBOSE
 $VERBOSE = nil
-require "fluent/plugin/in_kubernetes_objects"
 $VERBOSE = _verbose
 
-require "fluent/test"
-require "fluent/test/driver/input"
-require "fluent/test/helpers"
-require "minitest/autorun"
-require "webmock/minitest"
+require 'fluent/test'
+require 'fluent/test/driver/input'
+require 'fluent/test/helpers'
+require 'minitest/autorun'
+require 'webmock/minitest'
 
 # make assertions from webmock available in minitest/spec
 module Minitest::Expectations
@@ -21,20 +22,27 @@ module Minitest::Expectations
 end
 
 module PluginTestHelper
-  def k8s_host() "127.0.0.1" end
-  def k8s_port() "8001" end
-  def k8s_url(path='api') "https://#{k8s_host}:#{k8s_port}/#{path}" end
+  def k8s_host
+    '127.0.0.1'
+  end
+
+  def k8s_port
+    '8001'
+  end
+
+  def k8s_url(path = 'api')
+    "https://#{k8s_host}:#{k8s_port}/#{path}"
+  end
 
   def fluentd_conf_for(*lines)
-    basic_config = [
-    ]
+    basic_config = []
     (basic_config + lines).join("\n")
   end
 
   def create_input_driver(*configs)
-    Fluent::Test::Driver::Input.new(Fluent::Plugin::KubernetesObjectsInput).tap { |d|
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::KubernetesObjectsInput).tap do |d|
       d.configure(fluentd_conf_for(*configs))
-    }
+    end
   end
 
   def stub_k8s_requests
@@ -49,47 +57,49 @@ module PluginTestHelper
   end
 
   def stub_k8s_api
-    open(File.expand_path('../api.json', __FILE__)).tap { |f|
+    File.open(File.expand_path('api.json', __dir__)).tap do |f|
       stub_request(:get, k8s_url).to_return(body: f.read)
-    }.close
+    end.close
   end
 
   def stub_k8s_apis
-    open(File.expand_path('../apis.json', __FILE__)).tap { |f|
+    File.open(File.expand_path('apis.json', __dir__)).tap do |f|
       stub_request(:get, k8s_url('apis')).to_return(body: f.read)
-    }.close
+    end.close
   end
 
   def stub_k8s_v1
-    open(File.expand_path('../v1.json', __FILE__)).tap { |f|
+    File.open(File.expand_path('v1.json', __dir__)).tap do |f|
       stub_request(:get, "#{k8s_url}/v1").to_return(body: f.read)
-    }.close
+    end.close
   end
 
   def stub_k8s_namespaces
-    open(File.expand_path('../namespaces.json', __FILE__)).tap { |f|
-      stub_request(:get, "#{k8s_url}/v1/namespaces").to_return(body: f.read())
-    }.close
+    File.open(File.expand_path('namespaces.json', __dir__)).tap do |f|
+      stub_request(:get, "#{k8s_url}/v1/namespaces").to_return(body: f.read)
+    end.close
   end
 
   def stub_k8s_nodes
-    open(File.expand_path('../nodes.json', __FILE__)).tap { |f|
-      stub_request(:get, "#{k8s_url}/v1/nodes").to_return(body: f.read())
-    }.close
+    File.open(File.expand_path('nodes.json', __dir__)).tap do |f|
+      stub_request(:get, "#{k8s_url}/v1/nodes").to_return(body: f.read)
+    end.close
   end
 
   def stub_k8s_pods
-    open(File.expand_path('../pods.json', __FILE__)).tap { |f|
-      stub_request(:get, "#{k8s_url}/v1/pods").to_return(body: f.read())
-    }.close
+    File.open(File.expand_path('pods.json', __dir__)).tap do |f|
+      stub_request(:get, "#{k8s_url}/v1/pods").to_return(body: f.read)
+    end.close
   end
 
   def stub_k8s_events(params: nil)
-    open(File.expand_path('../events.json', __FILE__)).tap { |f|
+    File.open(File.expand_path('events.json', __dir__)).tap do |f|
       url = "#{k8s_url}/v1/watch/events"
-      url << '?' << params.map { |k, v|  "#{k}=#{v}" }.join('&') if params
-      stub_request(:get, url).
-	to_return(body: f.read(), headers: {"Content-Type" => "application/json", "Transfer-Encoding" => "chunked"})
-    }.close
+      url << '?' << params.map { |k, v| "#{k}=#{v}" }.join('&') if params
+      stub_request(:get, url)
+        .to_return(body: f.read,
+                   headers: { 'Content-Type' => 'application/json',
+                              'Transfer-Encoding' => 'chunked' })
+    end.close
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes-objects
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.4
 platform: ruby
 authors:
-- Gimi Liang
+- Splunk Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,102 +16,116 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: kubeclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.6.0
+- !ruby/object:Gem::Dependency
+  name: http_parser.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.5'
 description: A Fluentd input plugin for collecting Kubernetes objects, e.g. pods,
   namespaces, events, etc. by pulling or watching.
 email:
-- zliang@splunk.com
+- DataEdge@splunk.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -122,6 +136,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- VERSION
 - fluent-plugin-kubernetes-objects.gemspec
 - lib/fluent/plugin/in_kubernetes_objects.rb
 - test/fluent/plugin/in_kubernetes_objects_test.rb
@@ -152,8 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: Fluentd Plugin for Kubernetes Objects.