Adapt CI to run with security enabled when testing with Elasticsearch > 8 (#1039)

This commit enables SECURE_INTEGRATION environment flag for stack version 8 because ES 8 has security enabled by default.
Furthermore fixes the integration test to effectively read the ELASTIC_STACK_VERSION environment variable

Author: andsel

.ci/docker-compose.override.yml

@@ -10,6 +10,7 @@ services:
     environment:
         - INTEGRATION=${INTEGRATION:-false}
         - SECURE_INTEGRATION=${SECURE_INTEGRATION:-false}
+        - ELASTIC_STACK_VERSION=$ELASTIC_STACK_VERSION
 
   elasticsearch:
     build:

.travis.yml

@@ -7,5 +7,5 @@ env:
   - INTEGRATION=true ELASTIC_STACK_VERSION=6.x
   - INTEGRATION=true ELASTIC_STACK_VERSION=7.x
   - INTEGRATION=true ELASTIC_STACK_VERSION=7.x SNAPSHOT=true
-  - INTEGRATION=true ELASTIC_STACK_VERSION=8.x SNAPSHOT=true
+  - SECURE_INTEGRATION=true INTEGRATION=true ELASTIC_STACK_VERSION=8.x SNAPSHOT=true
   - SECURE_INTEGRATION=true INTEGRATION=true ELASTIC_STACK_VERSION=7.x

spec/es_spec_helper.rb

@@ -80,7 +80,7 @@ def self.es_version
   end
 
   def self.es_version_satisfies?(*requirement)
-    es_version = RSpec.configuration.filter[:es_version] || ENV['ES_VERSION'] || ENV['ELASTIC_STACK_VERSION']
+    es_version = nilify(RSpec.configuration.filter[:es_version]) || nilify(ENV['ES_VERSION']) || nilify(ENV['ELASTIC_STACK_VERSION'])
     if es_version.nil?
       puts "Info: ES_VERSION, ELASTIC_STACK_VERSION or 'es_version' tag wasn't set. Returning false to all `es_version_satisfies?` call."
       return false
@@ -89,6 +89,15 @@ def self.es_version_satisfies?(*requirement)
     Gem::Requirement.new(requirement).satisfied_by?(es_release_version)
   end
 
+  private
+  def self.nilify(str)
+    if str.nil?
+      return str
+    end
+    str.empty? ? nil : str
+  end
+
+  public
   def clean(client)
     client.indices.delete_template(:name => "*")
     client.indices.delete_index_template(:name => "logstash*") rescue nil