Add a fix to failing secured integration tests

Signed-off-by: Naveen Tatikonda <navtat@amazon.com>

Author: naveentatikonda

.github/workflows/CI.yml

@@ -35,7 +35,7 @@ jobs:
         logstash: [ "7.16.3" ]
         opensearch: [ "1.2.1" ]
         integration: [ true ]
-        secure: [ false ]
+        secure: [ true, false ]
     name: Integration Test for logstash-input-opensearch against OpenSearch
     runs-on: ubuntu-latest
     env:
@@ -62,7 +62,7 @@ jobs:
         logstash: [ "7.16.3" ]
         opendistro: [ "1.13.3" ]
         integration: [ true ]
-        secure: [ false ]
+        secure: [ true, false ]
     name: Integration Test for logstash-input-opensearch against OpenDistro
     runs-on: ubuntu-latest
     env:

lib/logstash/inputs/opensearch.rb

@@ -347,7 +347,8 @@ def hosts_default?(hosts)
   end
 
   def setup_ssl
-    @ssl && @ca_file ? { :ssl  => true, :ca_file => @ca_file } : {}
+    return { :ssl  => true, :ca_file => @ca_file } if @ssl && @ca_file
+    return { :ssl  => true, :verify => false } if @ssl  # Setting verify as false if ca_file is not provided
   end
 
   def setup_hosts

spec/inputs/integration/opensearch_spec.rb

@@ -59,11 +59,10 @@
   describe 'against a secured opensearch', :secure_integration => true do
     let(:user) { ENV['USER'] || 'admin' }
     let(:password) { ENV['PASSWORD'] || 'admin' }
-    let(:ca_file) { "spec/fixtures/test_certs/ca.crt" }
 
-    let(:client_options) { { :ca_file => ca_file, :user => user, :password => password } }
+    let(:client_options) { { :user => user, :password => password } }
 
-    let(:config) { super().merge('user' => user, 'password' => password, 'ssl' => true, 'ca_file' => ca_file) }
+    let(:config) { super().merge('user' => user, 'password' => password, 'ssl' => true) }
 
     it_behaves_like 'an opensearch index plugin'
 

spec/opensearch_helper.rb

@@ -16,15 +16,19 @@ def self.get_client(options)
     host_opts = { host: host, port: port, scheme: 'http' }
     ssl_opts = {}
 
+    if options[:user] && options[:password]
+      host_opts[:user] = options[:user]
+      host_opts[:password] = options[:password]
+      host_opts[:scheme] = 'https'
+      ssl_opts = { verify: false }
+    end
+
     if options[:ca_file]
       ssl_opts = { ca_file: options[:ca_file], version: 'TLSv1.2', verify: false }
       host_opts[:scheme] = 'https'
     end
 
-    if options[:user] && options[:password]
-      host_opts[:user] = options[:user]
-      host_opts[:password] = options[:password]
-    end
+
 
     OpenSearch::Client.new(hosts: [host_opts],
                               transport_options: { ssl: ssl_opts },