logstash-integration-elastic_enterprise_search 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4473449751c6ce422faa5cdbbcec12e78677a54d40209e397c987d2e2e2d05f
-  data.tar.gz: d1774ea9414e64b243017fa4faac4a53c830b66098208762bb601d9e3a9ac834
+  metadata.gz: 3af93305f2ae422c91b82ccebe11ffc81f933a3e91c7e302537aa1e1583bac35
+  data.tar.gz: 350ddeeab933a4083137c5c618e186c6a7b25634c3153382f1723030818f969f
 SHA512:
-  metadata.gz: 8ed463da5b8975c4765a4688e684e2596a42161128a6bee3f087eff49a6404180051967e6c96f7893581bd7322ff13bdb2d8251f967b8b35496e4b85503e1f83
-  data.tar.gz: e0fcd1f80a3cd350508d9d78922a67e26fc31e01d0433f2fa764033fc2778925b0a8ebebd48e95802718047162630e2d65124395cbd7c7989a7182ce9482e429
+  metadata.gz: '097e1f1e9f13be33fd10d81cc606684dcfe8a9f605af21e6638abf55c17c77f3f1b9d0ec76089e8129fd7efe5a7553ec40e0155406ea47b8b7c126b3aa816522'
+  data.tar.gz: a9f34fbfccb259956dfb8efd8cdc0f7a43bca64364711f84f9a59c992022cd87041e7090698e5b91d092e837184583e823a19b46468fe26355919d65ecd9efad

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.0.3
+  - Allow enterprise-search dependency to pull 8.19 and newer versions [#27](https://github.com/logstash-plugins/logstash-integration-elastic_enterprise_search/pull/27)
+
+## 3.0.2
+  - Upgrades `elastic-enterprise-search` gem and tolerates `Elastic::Transport` client [#26](https://github.com/logstash-plugins/logstash-integration-elastic_enterprise_search/pull/26)
+
 ## 3.0.1
  - Add deprecation log for App Search and Workplace Search. Both products are removed from Elastic Stack in version 9 [#22](https://github.com/logstash-plugins/logstash-integration-elastic_enterprise_search/pull/22)
 

data/lib/logstash/plugin_mixins/enterprise_search/manticore_transport.rb

@@ -4,14 +4,29 @@ module LogStash::PluginMixins::EnterpriseSearch
   # It also provides common Manticore configurations such as :ssl.
   module ManticoreTransport
     def self.included(base)
-      if eps_version_7?
+      load_transport!
+
+      raise ArgumentError, "`#{base}` must inherit Elastic::EnterpriseSearch::Client" unless base < Elastic::EnterpriseSearch::Client
+      raise ArgumentError, "`#{base}` must respond to :params" unless base.instance_methods.include? :params
+    end
+
+    # `elasticsearch-transport` is old, `elastic-transport` is the replacement.
+    # LS-core updated `elasticsearch` > 8: https://github.com/elastic/logstash/pull/17161
+    # Following logic supports both `elasticsearch-transport` and `elastic-transport` gems.
+    def self.load_transport!
+      return if @transport_loaded
+      begin
         require 'elasticsearch/transport/transport/http/manticore'
-      else
+        @use_legacy_transport = true
+      rescue LoadError
         require 'elastic/transport/transport/http/manticore'
+        @use_legacy_transport = false
       end
+      @transport_loaded = true
+    end
 
-      raise ArgumentError, "`#{base}` must inherit Elastic::EnterpriseSearch::Client" unless base < Elastic::EnterpriseSearch::Client
-      raise ArgumentError, "`#{base}` must respond to :params" unless base.instance_methods.include? :params
+    def self.use_legacy_transport?
+      @use_legacy_transport
     end
 
     # overrides Elastic::EnterpriseSearch::Client#transport
@@ -33,22 +48,17 @@ module LogStash::PluginMixins::EnterpriseSearch
       )
     end
 
-    def self.eps_version_7?
-      Elastic::EnterpriseSearch::VERSION.start_with?('7')
-    end
-
     private
 
     def manticore_transport_klass
-      ManticoreTransport.eps_version_7? ? Elasticsearch::Transport::Transport::HTTP::Manticore : Elastic::Transport::Transport::HTTP::Manticore
+      ManticoreTransport.use_legacy_transport? ? Elasticsearch::Transport::Transport::HTTP::Manticore : Elastic::Transport::Transport::HTTP::Manticore
     end
 
     def transport_klass
-      case Elasticsearch::Transport::VERSION
-      when /^7\.1[123]/
-        Elasticsearch::Client
-      else
+      if ManticoreTransport.use_legacy_transport?
         Elasticsearch::Transport::Client
+      else
+        Elastic::Transport::Client
       end
     end
 

data/logstash-integration-elastic_enterprise_search.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-integration-elastic_enterprise_search'
-  s.version         = '3.0.1'
+  s.version         = ::File.read('version').split("\n").first
   s.licenses        = ['Apache-2.0']
   s.summary         = "Integration with Elastic Enterprise Search - output plugins"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline "+
                       "using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program."
   s.authors         = ["Elastic"]
   s.email           = 'info@elastic.co'
-  s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
+  s.homepage        = "https://www.elastic.co/logstash"
   s.require_paths   = ['lib', 'vendor/jar-dependencies']
 
   # Files
@@ -27,7 +27,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "manticore", '~> 0.8'
   s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
   s.add_runtime_dependency "logstash-codec-plain"
-  s.add_runtime_dependency 'elastic-enterprise-search', '>= 7.16', '< 9'
+  # elastic-enterprise-search is deprecated in v9 and gem for v9 is not released yet
+  s.add_runtime_dependency 'elastic-enterprise-search', '~> 8.19'
   s.add_runtime_dependency "logstash-mixin-deprecation_logger_support", '~>1.0'
   s.add_development_dependency "logstash-devutils"
 end

data/spec/unit/outputs/manticore_transport_spec.rb

@@ -29,7 +29,7 @@ describe LogStash::PluginMixins::EnterpriseSearch::ManticoreTransport do
 
         result = client.transport
 
-        if LogStash::PluginMixins::EnterpriseSearch::ManticoreTransport.eps_version_7?
+        if LogStash::PluginMixins::EnterpriseSearch::ManticoreTransport.use_legacy_transport?
           expect(result.transport).to be_a(Elasticsearch::Transport::Transport::HTTP::Manticore)
         else
           expect(result.transport).to be_a(Elastic::Transport::Transport::HTTP::Manticore)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-elastic_enterprise_search
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-03 00:00:00.000000000 Z
+date: 2026-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -55,23 +55,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7.16'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '8.19'
   name: elastic-enterprise-search
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7.16'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '8.19'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -134,7 +128,7 @@ files:
 - spec/unit/outputs/elastic_app_search_spec.rb
 - spec/unit/outputs/elastic_workplace_search_spec.rb
 - spec/unit/outputs/manticore_transport_spec.rb
-homepage: http://www.elastic.co/guide/en/logstash/current/index.html
+homepage: https://www.elastic.co/logstash
 licenses:
 - Apache-2.0
 metadata: