Solved code style issues

Author: alexcams

CHANGELOG.md

@@ -1,5 +1,5 @@
 ## 4.3.1
-  - Support both, encoded and non encoded api-key formats on plugin configuration [#203](https://github.com/logstash-plugins/logstash-filter-elasticsearch/pull/203)
+  - Added support for encoded and non encoded api-key formats on plugin configuration [#203](https://github.com/logstash-plugins/logstash-filter-elasticsearch/pull/203)
 
 ## 4.3.0
   - ES|QL support [#194](https://github.com/logstash-plugins/logstash-filter-elasticsearch/pull/194)

lib/logstash/filters/elasticsearch/client.rb

@@ -103,16 +103,14 @@ def setup_basic_auth(user, password)
       def setup_api_key(api_key)
         return {} unless (api_key&.value)
 
-        token = is_base64?(api_key.value) ?  api_key.value : Base64.strict_encode64(api_key.value)
+        token = base64?(api_key.value) ? api_key.value : Base64.strict_encode64(api_key.value)
         { 'Authorization' => "ApiKey #{token}" }
       end
 
-      def is_base64?(string)
-        begin
-          string == Base64.strict_encode64(Base64.strict_decode64(string))
-        rescue ArgumentError
-          false
-        end
+      def base64?(string)
+        string == Base64.strict_encode64(Base64.strict_decode64(string))
+      rescue ArgumentError
+        false
       end
 
       def get_transport_client_class

spec/filters/elasticsearch_spec.rb

@@ -4,7 +4,6 @@
 require "logstash/filters/elasticsearch"
 require "logstash/json"
 require "cabin"
-require "manticore"
 require "webrick"
 require "uri"
 
@@ -325,26 +324,28 @@ def wait_receive_request
       end
 
       context "with ssl" do
-        let(:config) { super().merge("ssl_enabled" => true) }
-        encoded_api_key = Base64.strict_encode64('foo:bar')
+        let(:api_key_value) { nil }
+        let(:config) { super().merge("ssl_enabled" => true, 'api_key' => LogStash::Util::Password.new(api_key_value)) }
+        let(:encoded_api_key) { Base64.strict_encode64('foo:bar') }
 
-        scenarios = {
-          'with non-encoded api-key' => LogStash::Util::Password.new('foo:bar'),
-          'with encoded api-key' => LogStash::Util::Password.new(encoded_api_key)
-        }
+        shared_examples "a plugin that sets the ApiKey authorization header" do
+          it "correctly sets the Authorization header" do
+            plugin.register
+            client= plugin.send(:get_client).client
+            auth_header = extract_transport(client).options[:transport_options][:headers]['Authorization']
 
-        scenarios.each do |description, api_key_value|
-          context description do
-            let(:config) { super().merge('api_key' => api_key_value) }
+            expect(auth_header).to eql("ApiKey #{encoded_api_key}")
+          end
+        end
 
-            it "should set authorization" do
-              plugin.register
-              client= plugin.send(:get_client).client
-              auth_header = extract_transport(client).options[:transport_options][:headers]['Authorization']
+        context "with a non-encoded API key" do
+          let(:api_key_value) { "foo:bar" }
+          it_behaves_like "a plugin that sets the ApiKey authorization header"
+        end
 
-              expect(auth_header).to eql "ApiKey #{encoded_api_key}"
-            end
-          end
+        context "with an encoded API key" do
+          let(:api_key_value) { encoded_api_key }
+          it_behaves_like "a plugin that sets the ApiKey authorization header"
         end
 
         context 'user also set' do