Update distribution checker

Allow support if distribution is opensearch or major_version == 7

Signed-off-by: Vijayan Balasubramanian <[email protected]>

Author: VijayanB

lib/logstash/outputs/opensearch/distribution_checker.rb

@@ -21,13 +21,8 @@ def initialize(logger)
     # @return [Boolean] true if supported
     def is_supported?(pool, url, major_version)
       distribution = get_distribution(pool, url)
-      case distribution
-      when 'opensearch'
+      if distribution == 'opensearch' || major_version == 7
         return true
-      when 'oss'
-        if major_version == 7
-          return true
-        end
       end
       log_not_supported(url, major_version, distribution)
       false

lib/logstash/outputs/opensearch/http_client/pool.rb

@@ -426,7 +426,7 @@ def get_version(url)
 
     def get_distribution(url)
       version_map = get_version_map(url)
-      version_map.has_key?('distribution') ? version_map['distribution'] : version_map['build_flavor'] # e.g. "opensearch or oss"
+      version_map['distribution']
     end
 
     def last_version

spec/unit/outputs/opensearch/http_client/pool_spec.rb

@@ -17,7 +17,7 @@
   let(:initial_urls) { [::LogStash::Util::SafeURI.new("http://localhost:9200")] }
   let(:options) { {:resurrect_delay => 2, :url_normalizer => proc {|u| u}} } # Shorten the delay a bit to speed up tests
   let(:node_versions) { [ "7.0.0" ] }
-  let(:get_distribution) { "oss" }
+  let(:get_distribution) { "opensearch" }
 
   subject { described_class.new(logger, adapter, initial_urls, options) }
 
@@ -260,38 +260,40 @@
 
     context 'when using opensearch' do
 
-      context "if cluster doesn't return a valid distribution" do
+      context "cluster doesn't return a valid distribution" do
         let(:get_distribution) { nil }
+        context "major version is not 7" do
+          let(:node_versions) { [ "6.0.0" ] }
 
-        it 'marks the url as dead' do
-          subject.update_initial_urls
-          expect(subject.alive_urls_count).to eq(0)
-        end
+          it 'marks the url as dead' do
+            subject.update_initial_urls
+            expect(subject.alive_urls_count).to eq(0)
+          end
 
-        it 'logs message' do
-          expect(subject.distribution_checker).to receive(:log_not_supported).once.and_call_original
-          subject.update_initial_urls
+          it 'logs message' do
+            expect(subject.distribution_checker).to receive(:log_not_supported).once.and_call_original
+            subject.update_initial_urls
+          end
         end
-      end
+        context "major version is  7" do
+          let(:node_versions) { [ "7.10.2" ] }
 
-      context 'if cluster returns opensearch' do
-        let(:get_distribution) { 'opensearch' }
+          it "marks the url as active" do
+            subject.update_initial_urls
+            expect(subject.alive_urls_count).to eq(1)
+          end
 
-        it "marks the url as active" do
-          subject.update_initial_urls
-          expect(subject.alive_urls_count).to eq(1)
-        end
+          it 'does not log message' do
+            expect(subject.distribution_checker).to_not receive(:log_not_supported)
+            subject.update_initial_urls
+          end
 
-        it 'does not log message' do
-          expect(subject.distribution_checker).to_not receive(:log_not_supported)
-          subject.update_initial_urls
         end
       end
+      context 'cluster returns valid distribution' do
+        let(:get_distribution) { 'opensearch' }
 
-      context 'if cluster returns oss' do
-        let(:get_distribution) { 'oss' }
-
-        it 'marks the url as active' do
+        it "marks the url as active" do
           subject.update_initial_urls
           expect(subject.alive_urls_count).to eq(1)
         end