mvoe oss? and valid_es_license? into mixin

Author: colinsurprenant

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

@@ -70,10 +70,6 @@ def initialize(logger, adapter, initial_urls=[], options={})
       @stopping = false
     end
 
-    def oss?
-      LogStash::OSS
-    end
-    
     def start
       update_initial_urls
       start_resurrectionist
@@ -212,7 +208,6 @@ def address_str_to_uri(addr_str)
       end
     end
 
-
     def sniff_2x_1x(nodes)
       nodes.map do |id,info|
         # TODO Make sure this works with shield. Does that listed
@@ -252,13 +247,6 @@ def get_license(url)
       LogStash::Json.load(response.body)
     end
 
-    def valid_es_license?(url)
-      license = get_license(url)
-      license.fetch("license", {}).fetch("status", nil) == "active"
-    rescue => e
-      false
-    end
-
     def health_check_request(url)
       perform_request_to_url(url, :head, @healthcheck_path)
     end
@@ -285,9 +273,9 @@ def healthcheck!
               set_new_major_version(major)
             end
 
-            # defined in license_check.rb
+            # license_check in mixed in from LogStash::Outputs::ElasticSearchPoolMixin::LicenseChecker
+            # separately defined in the elasticsearch output and the elasticsearch_data_streams output.
             license_check!(url, meta)
-
           end
         rescue HostUnreachableError, BadResponseCodeError => e
           logger.warn("Attempted to resurrect connection to dead ES instance, but got an error.", url: url.sanitized.to_s, error_type: e.class, error: e.message)
@@ -299,10 +287,6 @@ def stop_resurrectionist
       @resurrectionist.join if @resurrectionist
     end
 
-    def log_license_deprecation_warn(url)
-      logger.warn("DEPRECATION WARNING: Connecting to an OSS distribution of Elasticsearch using the default distribution of Logstash will stop working in Logstash 8.0.0. Please upgrade to the default distribution of Elasticsearch, or use the OSS distribution of Logstash", :url => url.sanitized.to_s)
-    end
-
     def resurrectionist_alive?
       @resurrectionist ? @resurrectionist.alive? : nil
     end

lib/logstash/outputs/elasticsearch/license_check.rb

@@ -4,8 +4,10 @@ module ElasticSearchPoolMixin
       module LicenseChecker
 
         # This mixin is used to externalize the license checking behaviour of the LogStash::Outputs::ElasticSearch::HttpClient::Pool class.
+        # This mixin used the following Pool methods: get_license, logger. Make sure these are defined in the license_check_mixin_spec.rb
 
         # Perform a license check
+        # The license_check! methods is the method called from within the Pool class
         # @param url [LogStash::Util::SafeURI]
         # @param meta [Hash]
         def license_check!(url, meta)
@@ -23,6 +25,21 @@ def license_check!(url, meta)
             meta[:state] = :alive
           end
         end
+
+        def oss?
+          LogStash::OSS
+        end
+
+        def valid_es_license?(url)
+          license = get_license(url)
+          license.fetch("license", {}).fetch("status", nil) == "active"
+        rescue => e
+          false
+        end
+
+        def log_license_deprecation_warn(url)
+          logger.warn("DEPRECATION WARNING: Connecting to an OSS distribution of Elasticsearch using the default distribution of Logstash will stop working in Logstash 8.0.0. Please upgrade to the default distribution of Elasticsearch, or use the OSS distribution of Logstash", :url => url.sanitized.to_s)
+        end
       end
     end
   end