Running elasticsearch only with platinum settings

Author: ezimuel

.ci/functions/imports.sh

@@ -27,9 +27,6 @@ if [[ -z $es_node_name ]]; then
   export elastic_password=changeme
   export elasticsearch_image=elasticsearch
   export elasticsearch_url=https://elastic:${elastic_password}@${es_node_name}:9200
-  if [[ $TEST_SUITE != "platinum" ]]; then
-    export elasticsearch_url=http://${es_node_name}:9200
-  fi
   export external_elasticsearch_url=${elasticsearch_url/$es_node_name/localhost}
   export elasticsearch_container="${elasticsearch_image}:${STACK_VERSION}"
 

.ci/run-elasticsearch.sh

@@ -40,37 +40,29 @@ environment=($(cat <<-END
   --env path.repo=/tmp
   --env repositories.url.allowed_urls=http://snapshot.test*
   --env action.destructive_requires_name=false
+  --env ELASTIC_PASSWORD=$elastic_password
+  --env xpack.license.self_generated.type=trial
+  --env xpack.security.enabled=true
+  --env xpack.security.http.ssl.enabled=true
+  --env xpack.security.http.ssl.verification_mode=certificate
+  --env xpack.security.http.ssl.key=certs/testnode.key
+  --env xpack.security.http.ssl.certificate=certs/testnode.crt
+  --env xpack.security.http.ssl.certificate_authorities=certs/ca.crt
+  --env xpack.security.transport.ssl.enabled=true
+  --env xpack.security.transport.ssl.verification_mode=certificate
+  --env xpack.security.transport.ssl.key=certs/testnode.key
+  --env xpack.security.transport.ssl.certificate=certs/testnode.crt
+  --env xpack.security.transport.ssl.certificate_authorities=certs/ca.crt
 END
 ))
-if [[ "$TEST_SUITE" == "platinum" ]]; then
-  environment+=($(cat <<-END
-    --env ELASTIC_PASSWORD=$elastic_password
-    --env xpack.license.self_generated.type=trial
-    --env xpack.security.enabled=true
-    --env xpack.security.http.ssl.enabled=true
-    --env xpack.security.http.ssl.verification_mode=certificate
-    --env xpack.security.http.ssl.key=certs/testnode.key
-    --env xpack.security.http.ssl.certificate=certs/testnode.crt
-    --env xpack.security.http.ssl.certificate_authorities=certs/ca.crt
-    --env xpack.security.transport.ssl.enabled=true
-    --env xpack.security.transport.ssl.verification_mode=certificate
-    --env xpack.security.transport.ssl.key=certs/testnode.key
-    --env xpack.security.transport.ssl.certificate=certs/testnode.crt
-    --env xpack.security.transport.ssl.certificate_authorities=certs/ca.crt
-END
-))
-  volumes+=($(cat <<-END
-    --volume $ssl_cert:/usr/share/elasticsearch/config/certs/testnode.crt
-    --volume $ssl_key:/usr/share/elasticsearch/config/certs/testnode.key
-    --volume $ssl_ca:/usr/share/elasticsearch/config/certs/ca.crt
+volumes+=($(cat <<-END
+  --volume $ssl_cert:/usr/share/elasticsearch/config/certs/testnode.crt
+  --volume $ssl_key:/usr/share/elasticsearch/config/certs/testnode.key
+  --volume $ssl_ca:/usr/share/elasticsearch/config/certs/ca.crt
 END
 ))
-fi
 
-cert_validation_flags=""
-if [[ "$TEST_SUITE" == "platinum" ]]; then
-  cert_validation_flags="--insecure --cacert /usr/share/elasticsearch/config/certs/ca.crt --resolve ${es_node_name}:443:127.0.0.1"
-fi
+cert_validation_flags="--insecure --cacert /usr/share/elasticsearch/config/certs/ca.crt --resolve ${es_node_name}:443:127.0.0.1"
 
 # Pull the container, retry on failures up to 5 times with
 # short delays between each attempt. Fixes most transient network errors.