fluent-plugin-elasticsearch 5.1.4 → 5.2.1

data/test/plugin/test_elasticsearch_index_lifecycle_management.rb

@@ -6,12 +6,14 @@ class TestElasticsearchIndexLifecycleManagement < Test::Unit::TestCase
   include Fluent::Plugin::ElasticsearchIndexLifecycleManagement
 
   def setup
-    begin
-      require "elasticsearch/xpack"
-    rescue LoadError
-      omit "ILM testcase needs elasticsearch-xpack gem."
+    if Gem::Version.new(Elasticsearch::VERSION) < Gem::Version.new("7.14.0")
+      begin
+        require "elasticsearch/xpack"
+      rescue LoadError
+        omit "ILM testcase needs elasticsearch-xpack gem."
+      end
     end
-    if Gem::Version.create(::Elasticsearch::Transport::VERSION) < Gem::Version.create("7.4.0")
+    if Gem::Version.create(::TRANSPORT_CLASS::VERSION) < Gem::Version.create("7.4.0")
       omit "elastisearch-ruby v7.4.0 or later is needed for ILM."
     end
     Fluent::Plugin::ElasticsearchIndexLifecycleManagement.module_eval(<<-CODE)
@@ -27,50 +29,78 @@ class TestElasticsearchIndexLifecycleManagement < Test::Unit::TestCase
     CODE
   end
 
-  def stub_elastic_info(url="http://localhost:9200/", version="7.9.0")
+  def elasticsearch_version
+    if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+      TRANSPORT_CLASS::VERSION
+    else
+      '6.4.2'.freeze
+    end
+  end
+
+  def ilm_existence_endpoint(policy_id)
+    if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+      "_enrich/policy/#{policy_id}"
+    else
+      "_ilm/policy/%7B:policy_id=%3E%22#{policy_id}%22%7D"
+    end
+  end
+
+  def ilm_creation_endpoint(policy_id)
+    if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("8.0.0")
+      "_enrich/policy/#{policy_id}"
+    else
+      "_ilm/policy/#{policy_id}"
+    end
+  end
+
+  def stub_elastic_info(url="http://localhost:9200/", version=elasticsearch_version)
     body ="{\"version\":{\"number\":\"#{version}\", \"build_flavor\":\"default\"},\"tagline\" : \"You Know, for Search\"}"
-    stub_request(:get, url).to_return({:status => 200, :body => body, :headers => { 'Content-Type' => 'json' } })
+    stub_request(:get, url).to_return({:status => 200, :body => body, :headers => { 'Content-Type' => 'json', 'x-elastic-product' => 'Elasticsearch' } })
   end
 
   def test_xpack_info
     stub_request(:get, "http://localhost:9200/_xpack").
-      to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
+      to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json" })
     stub_elastic_info
     expected = {"features"=>{"ilm"=>{"available"=>true, "enabled"=>true}}}
-    assert_equal(expected, xpack_info)
+    if xpack_info.is_a?(Elasticsearch::API::Response)
+      assert_equal(expected, xpack_info.body)
+    else
+      assert_equal(expected, xpack_info)
+    end
   end
 
   def test_verify_ilm_working
     stub_request(:get, "http://localhost:9200/_xpack").
-      to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json"})
+      to_return(:status => 200, :body => '{"features":{"ilm":{"available":true,"enabled":true}}}', :headers => {"Content-Type"=> "application/json" })
     stub_elastic_info
     assert_nothing_raised { verify_ilm_working }
   end
 
   def test_ilm_policy_doesnt_exists
-    stub_request(:get, "http://localhost:9200/_ilm/policy/%7B:policy_id=%3E%22fluentd-policy%22%7D").
+    stub_request(:get, "http://localhost:9200/#{ilm_existence_endpoint("fluentd-policy")}").
       to_return(:status => 404, :body => "", :headers => {})
     stub_elastic_info
-    assert_false(ilm_policy_exists?(policy_id: "fluentd-policy"))
+    assert_false(ilm_policy_exists?("fluentd-policy"))
   end
 
   def test_ilm_policy_exists
-    stub_request(:get, "http://localhost:9200/_ilm/policy/%7B:policy_id=%3E%22fluent-policy%22%7D").
+    stub_request(:get, "http://localhost:9200/#{ilm_existence_endpoint("fluent-policy")}").
       to_return(:status => 200, :body => "", :headers => {})
     stub_elastic_info
-    assert_true(ilm_policy_exists?(policy_id: "fluent-policy"))
+    assert_true(ilm_policy_exists?("fluent-policy"))
   end
 
   def test_create_ilm_policy
-    stub_request(:get, "http://localhost:9200/_ilm/policy/fluent-policy").
+    stub_request(:get, "http://localhost:9200/#{ilm_creation_endpoint("fluent-policy")}").
       to_return(:status => 404, :body => "", :headers => {})
-    stub_request(:put, "http://localhost:9200/_ilm/policy/fluent-policy").
+    stub_request(:put, "http://localhost:9200/#{ilm_creation_endpoint("fluent-policy")}").
       with(:body => "{\"policy\":{\"phases\":{\"hot\":{\"actions\":{\"rollover\":{\"max_size\":\"50gb\",\"max_age\":\"30d\"}}}}}}",
          :headers => {'Content-Type'=>'application/json'}).
       to_return(:status => 200, :body => "", :headers => {})
     stub_elastic_info
     create_ilm_policy("fluent-policy")
 
-    assert_requested(:put, "http://localhost:9200/_ilm/policy/fluent-policy", times: 1)
+    assert_requested(:put, "http://localhost:9200/#{ilm_creation_endpoint("fluent-policy")}", times: 1)
   end
 end

data/test/plugin/test_in_elasticsearch.rb

@@ -31,9 +31,17 @@ class ElasticsearchInputTest < Test::Unit::TestCase
     @driver ||= Fluent::Test::Driver::Input.new(Fluent::Plugin::ElasticsearchInput).configure(conf)
   end
 
-  def stub_elastic_info(url="http://localhost:9200/", version="7.9.0")
+  def elasticsearch_version
+    if Gem::Version.new(TRANSPORT_CLASS::VERSION) >= Gem::Version.new("7.14.0")
+      TRANSPORT_CLASS::VERSION
+    else
+      '7.9.0'.freeze
+    end
+  end
+
+  def stub_elastic_info(url="http://localhost:9200/", version=elasticsearch_version)
     body ="{\"version\":{\"number\":\"#{version}\", \"build_flavor\":\"default\"},\"tagline\" : \"You Know, for Search\"}"
-    stub_request(:get, url).to_return({:status => 200, :body => body, :headers => { 'Content-Type' => 'json' } })
+    stub_request(:get, url).to_return({:status => 200, :body => body, :headers => { 'Content-Type' => 'json', 'x-elastic-product' => 'Elasticsearch' } })
   end
 
   def sample_response(index_name="fluentd")