Added the config for running Elasticsearch with XPack

Author: ezimuel

.travis.yml

@@ -17,22 +17,17 @@ matrix:
   fast_finish: true
   include:
     - php: 7.1
-      env: ES_VERSION="7.6.0"
+      env: TEST_SUITE="oss"
     - php: 7.2
-      env: ES_VERSION="7.6.0"
+      env: TEST_SUITE="oss"
     - php: 7.3
-      env: ES_VERSION="7.6.0"
+      env: TEST_SUITE="oss"
     - php: 7.4
-      env: ES_VERSION="7.6.0"
-    - php: 7.4
-      env: ES_VERSION="8.0.0-SNAPSHOT"
-  allow_failures:
-    - php: 7.4
-      env: ES_VERSION="8.0.0-SNAPSHOT"
+      env: TEST_SUITE="oss"
 
 env:
   global:
-    - ES_TEST_HOST=http://localhost:9200
+    - STACK_VERSION="7.x-SNAPSHOT"
 
 before_install:
   - ./travis/run_es_docker.sh

tests/Elasticsearch/Tests/ClientIntegrationTest.php

@@ -23,18 +23,29 @@
  */
 class ClientIntegrationTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * ArrayLogger
+     */
+    private $logger;
+
+    /**
+     * @var string
+     */
+    private $host;
+
     public function setUp()
     {
-        if (empty(getenv('ES_TEST_HOST'))) {
-            $this->markTestSkipped('I cannot execute integration test without ES_TEST_HOST env');
+        $this->host = Utility::getHost();
+        if (null == $this->host) {
+            $this->markTestSkipped('I cannot execute integration test without TEST_SUITE env');
         }
         $this->logger = new ArrayLogger();
     }
 
     public function testLogRequestSuccessHasInfoNotEmpty()
     {
         $client = ClientBuilder::create()
-            ->setHosts([getenv('ES_TEST_HOST')])
+            ->setHosts([$this->host])
             ->setLogger($this->logger)
             ->build();
 
@@ -46,7 +57,7 @@ public function testLogRequestSuccessHasInfoNotEmpty()
     public function testLogRequestSuccessHasPortInInfo()
     {
         $client = ClientBuilder::create()
-            ->setHosts([getenv('ES_TEST_HOST')])
+            ->setHosts([$this->host])
             ->setLogger($this->logger)
             ->build();
 
@@ -58,7 +69,7 @@ public function testLogRequestSuccessHasPortInInfo()
     public function testLogRequestFailHasWarning()
     {
         $client = ClientBuilder::create()
-            ->setHosts([getenv('ES_TEST_HOST')])
+            ->setHosts([$this->host])
             ->setLogger($this->logger)
             ->build();
 

tests/Elasticsearch/Tests/ConnectionPool/StaticConnectionPoolIntegrationTest.php

@@ -5,6 +5,7 @@
 namespace Elasticsearch\Tests\ConnectionPool;
 
 use Elasticsearch;
+use Elasticsearch\Tests\Utility;
 
 /**
  * Class StaticConnectionPoolIntegrationTest
@@ -18,20 +19,26 @@
  */
 class StaticConnectionPoolIntegrationTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var string
+     */
+    private $host;
+
     public function setUp()
     {
-        if (empty(getenv('ES_TEST_HOST'))) {
-            $this->markTestSkipped(
-                'Elasticsearch is not configured. Check the ES_TEST_HOST env in your phpunit.xml file.'
-            );
+        $this->host = Utility::getHost();
+        if (null == $this->host) {
+            $this->markTestSkipped(sprintf(
+                "I cannot execute %s without TEST_SUITE env", __CLASS__
+            ));
         }
     }
 
     // Issue #636
     public function test404Liveness()
     {
         $client = \Elasticsearch\ClientBuilder::create()
-            ->setHosts([getenv('ES_TEST_HOST')])
+            ->setHosts([$this->host])
             ->setConnectionPool(\Elasticsearch\ConnectionPool\StaticConnectionPool::class)
             ->build();
 

tests/Elasticsearch/Tests/Utility.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Elasticsearch\Tests;
+
+class Utility
+{
+    static public function getHost(): ?string
+    {
+        switch (getenv('TEST_SUITE')) {
+            case 'oss':
+                return 'http://localhost:9200';
+            case 'xpack':
+                return 'https://elastic:changeme@localhost:9200';
+        }
+        return null;
+    }
+}

tests/Elasticsearch/Tests/YamlRunnerTest.php

@@ -108,12 +108,12 @@ class YamlRunnerTest extends \PHPUnit\Framework\TestCase
      */
     public static function getHost(): string
     {
-        if (getenv('ES_TEST_HOST') !== false) {
-            return getenv('ES_TEST_HOST');
+        $host = Utility::getHost();
+        if (null == $host) {
+            echo 'Environment variable TEST_SUITE (oss, xpack) not defined.';
+            exit;
         }
-
-        echo 'Environment variable for elasticsearch test cluster (ES_TEST_HOST) not defined. Exiting yaml test';
-        exit;
+        return $host;
     }
 
     public static function setUpBeforeClass()

travis/certs/ca.crt

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDSTCCAjGgAwIBAgIUIwN+0zglsexRKwE1RGHvlCcmrdwwDQYJKoZIhvcNAQEL
+BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
+cmF0ZWQgQ0EwHhcNMTkwMjEzMDcyMjQwWhcNMjIwMjEyMDcyMjQwWjA0MTIwMAYD
+VQQDEylFbGFzdGljIENlcnRpZmljYXRlIFRvb2wgQXV0b2dlbmVyYXRlZCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANILs0JO0e7x29zeVx21qalK
+XKdX+AMlGJPH75wWO/Jq6YHtxt1wYIg762krOBXfG6JsFSOIwIv5VrzGGRGjSPt9
+OXQyXrDDiQvsBT3rpzLNdDs7KMl2tZswwv7w9ujgud0cYnS1MOpn81rfPc73DvMg
+xuhplofDx6fn3++PjVRU2FNiIVWyEoaxRjCeGPMBubKZYaYbQA6vYM4Z+ByG727B
+AyAER3t7xmvYti/EoO2hv2HQk5zgcj/Oq3AJKhnt8LH8fnfm3TnYNM1htvXqhN05
+vsvhvm2PHfnA5qLlSr/3W0aI/U/PqfsFDCgyRV097sMIaKkmavb0Ue7aQ7lgtp0C
+AwEAAaNTMFEwHQYDVR0OBBYEFDRKlCMowWR1rwxE0d1lTEQe5O71MB8GA1UdIwQY
+MBaAFDRKlCMowWR1rwxE0d1lTEQe5O71MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAKbCJ95EBpeuvF70KEt6QU70k/SH1NRvM9YzKryV0D975Jvu
+HOSm9HgSTULeAUFZIa4oYyf3QUfVoI+2T/aQrfXA3gfrJWsHURkyNmiHOFAbYHqi
+xA6i249G2GTEjc1+le/M2N2CcDKAmurW6vSGK4upXQbPd6KmnhHREX74zkWjnOa+
++tibbSSOCT4Tmja2DbBxAPuivU9IB1g/hIUmbYQqKffQrBJA0658tz6w63a/Q7xN
+pCvvbSgiMZ6qcVIcJkBT2IooYie+ax45pQECHthgIUcQAzfmIfqlU0Qfl8rDgAmn
+0c1o6HQjKGU2aVGgSRuaaiHaSZjbPIZVS51sOoI=
+-----END CERTIFICATE-----

travis/certs/ca.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDSTCCAjGgAwIBAgIUIwN+0zglsexRKwE1RGHvlCcmrdwwDQYJKoZIhvcNAQEL
+BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
+cmF0ZWQgQ0EwHhcNMTkwMjEzMDcyMjQwWhcNMjIwMjEyMDcyMjQwWjA0MTIwMAYD
+VQQDEylFbGFzdGljIENlcnRpZmljYXRlIFRvb2wgQXV0b2dlbmVyYXRlZCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANILs0JO0e7x29zeVx21qalK
+XKdX+AMlGJPH75wWO/Jq6YHtxt1wYIg762krOBXfG6JsFSOIwIv5VrzGGRGjSPt9
+OXQyXrDDiQvsBT3rpzLNdDs7KMl2tZswwv7w9ujgud0cYnS1MOpn81rfPc73DvMg
+xuhplofDx6fn3++PjVRU2FNiIVWyEoaxRjCeGPMBubKZYaYbQA6vYM4Z+ByG727B
+AyAER3t7xmvYti/EoO2hv2HQk5zgcj/Oq3AJKhnt8LH8fnfm3TnYNM1htvXqhN05
+vsvhvm2PHfnA5qLlSr/3W0aI/U/PqfsFDCgyRV097sMIaKkmavb0Ue7aQ7lgtp0C
+AwEAAaNTMFEwHQYDVR0OBBYEFDRKlCMowWR1rwxE0d1lTEQe5O71MB8GA1UdIwQY
+MBaAFDRKlCMowWR1rwxE0d1lTEQe5O71MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAKbCJ95EBpeuvF70KEt6QU70k/SH1NRvM9YzKryV0D975Jvu
+HOSm9HgSTULeAUFZIa4oYyf3QUfVoI+2T/aQrfXA3gfrJWsHURkyNmiHOFAbYHqi
+xA6i249G2GTEjc1+le/M2N2CcDKAmurW6vSGK4upXQbPd6KmnhHREX74zkWjnOa+
++tibbSSOCT4Tmja2DbBxAPuivU9IB1g/hIUmbYQqKffQrBJA0658tz6w63a/Q7xN
+pCvvbSgiMZ6qcVIcJkBT2IooYie+ax45pQECHthgIUcQAzfmIfqlU0Qfl8rDgAmn
+0c1o6HQjKGU2aVGgSRuaaiHaSZjbPIZVS51sOoI=
+-----END CERTIFICATE-----

travis/certs/testnode.crt

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDIjCCAgqgAwIBAgIUI4QU6jA1dYSCbdIA6oAb2TBEluowDQYJKoZIhvcNAQEL
+BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
+cmF0ZWQgQ0EwHhcNMTkwMjEzMDcyMzEzWhcNMjIwMjEyMDcyMzEzWjATMREwDwYD
+VQQDEwhpbnN0YW5jZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJeT
+yOy6EAScZxrULKjHePciiz38grivCrhFFV+dThaRCcl3DhDzb9Eny5q5iEw3WvLQ
+Rqmf01jncNIhaocTt66VqveXaMubbE8O0LcG6e4kpFO+JtnVF8JTARTc+ux/1uD6
+hO1VG/HItM7WQrQxh4hfB2u1AX2YQtoqEtXXEC+UHWfl4QzuzXjBnKCkO/L9/6Tf
+yNFQWXxKnIiTs8Xm9sEhhSCBJPlLTQu+MX4vR2Uwj5XZmflDUr+ZTenl9qYxL6b3
+SWhh/qEl4GAj1+tS7ZZOxE0237mUh3IIFYSWSaMm8K2m/BYHkLNWL5B1dMic0lsv
+osSoYrQuCef4HQMCitsCAwEAAaNNMEswHQYDVR0OBBYEFFMg4l1GLW8lYbwASY+r
+YeWYRzIiMB8GA1UdIwQYMBaAFDRKlCMowWR1rwxE0d1lTEQe5O71MAkGA1UdEwQC
+MAAwDQYJKoZIhvcNAQELBQADggEBAEQrgh1xALpumQTzsjxFRGque/vlKTgRs5Kh
+xtgapr6wjIbdq7dagee+4yNOKzS5lGVXCgwrJlHESv9qY0uumT/33vK2uduJ7NAd
+fR2ZzyBnhMX+mkYhmGrGYCTUMUIwOIQYa4Evis4W+LHmCIDG03l7gLHfdIBe9VMO
+pDZum8f6ng0MM49s8/rXODNYKw8kFyUhnfChqMi/2yggb1uUIfKlJJIchkgYjE13
+zuC+fjo029Pq1jeMIdxugLf/7I/8NiW1Yj9aCXevUXG1qzHFEuKAinBXYOZO/vWS
+LaEqOhwrzNynwgGpYAr7Rfgv4AflltYIIav4PZT03P7fbyAAf8s=
+-----END CERTIFICATE-----

travis/certs/testnode.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAl5PI7LoQBJxnGtQsqMd49yKLPfyCuK8KuEUVX51OFpEJyXcO
+EPNv0SfLmrmITDda8tBGqZ/TWOdw0iFqhxO3rpWq95doy5tsTw7Qtwbp7iSkU74m
+2dUXwlMBFNz67H/W4PqE7VUb8ci0ztZCtDGHiF8Ha7UBfZhC2ioS1dcQL5QdZ+Xh
+DO7NeMGcoKQ78v3/pN/I0VBZfEqciJOzxeb2wSGFIIEk+UtNC74xfi9HZTCPldmZ
++UNSv5lN6eX2pjEvpvdJaGH+oSXgYCPX61Ltlk7ETTbfuZSHcggVhJZJoybwrab8
+FgeQs1YvkHV0yJzSWy+ixKhitC4J5/gdAwKK2wIDAQABAoIBAQCRFTJna/xy/WUu
+59FLR4qAOj8++JgCwACpue4oU7/vl6nffSYokWoAr2+RzG4qTX2vFi3cpA8+dGCn
+sLZvTi8tWzKGxBTZdg2oakzaMzLr74SeZ052iCGyrZJGbvF6Ny7srr1XEXSq6+os
+ZCb6pMHOhO7saBdiKMAsY8MdjTl/33AduuE6ztqv+L92xTr2g4QlbT1KvWlEgppU
+k4Gy7zdETkPBTSH/17ZwyGJoJICIAhbL4IpmOM4dPIg8nFkVPPpy6p0z4uGjtgnK
+nreZ2EKMzCafBaHn7A77gpi0OrQdl6pe0fsGqv/323YjCJPbwwl5TsoNq44DzwiX
+3M7XiVJxAoGBAOCne56vdN4uZmCgLVGT2JSUNVPOu4bfjrxWH6cslzrPT2Zhp3lO
+M4axZ3gmcervV252YEZXntXDHHCSfrECllRN1WFD63XmyQ/CkhuvZkkeRHfzL1TE
+EdqHOTqs4sRETZ7+RITFC81DZQkWWOKeyXMjyPBqd7RnThQHijB1c8Y5AoGBAKy6
+CVKBx+zz5crVD0tz4UhOmz1wRNN0CL0l+FXRuFSgbzMIvwpfiqe25crgeLHe2M2/
+TogdWbjZ2nUZQTzoRsSkQ6cKHpj+G/gWurp/UcHHXFVwgLSPF7c3KHDtiYq7Vqw0
+bvmhM03LI6+ZIPRV7hLBr7WP7UmpAiREMF7tTnmzAoGBAIkx3w3WywFQxtblmyeB
+qbd7F2IaE23XoxyjX+tBEQ4qQqwcoSE0v8TXHIBEwjceeX+NLVhn9ClJYVniLRq+
+oL3VVqVyzB4RleJZCc98e3PV1yyFx/b1Uo3pHOsXX9lKeTjKwV9v0rhFGzPEgP3M
+yOvXA8TG0FnM6OLUg/D6GX0JAoGAMuHS4TVOGeV3ahr9mHKYiN5vKNgrzka+VEod
+L9rJ/FQOrfADpyCiDen5I5ygsXU+VM3oanyK88NpcVlxOGoMft0M+OYoQVWKE7lO
+ZKYhBX6fGqQ7pfUJPXXIOgwfmni5fZ0sm+j63g3bg10OsiumKGxaQJgXhL1+3gQg
+Y7ZwibUCgYEAlZoFFvkMLjpOSaHk1z5ZZnt19X0QUIultBwkumSqMPm+Ks7+uDrx
+thGUCoz4ecr/ci4bIUY7mB+zfAbqnBOMxreJqCRbAIuRypo1IlWkTp8DywoDOfMW
+NfzjVmzJ7EJu44nGmVAi1jw4Pbseivvi1ujMCoPgaE8I1uSh144bwN8=
+-----END RSA PRIVATE KEY-----

travis/run_es_docker.sh

@@ -1,20 +1,66 @@
 #!/bin/sh
-if [ -z $ES_VERSION ]; then
-    echo "No ES_VERSION specified";
+if [ -z $STACK_VERSION ]; then
+    echo "No STACK_VERSION specified";
     exit 1;
-fi;
+fi
+
+if [ "$TEST_SUITE" != "oss" ] && [ "$TEST_SUITE" != "xpack" ]; then
+    echo "TEST_SUITE must be oss or xpack";
+    exit 1;
+fi
+
+if [ "$TEST_SUITE" = "oss" ]; then
+    docker pull docker.elastic.co/elasticsearch/elasticsearch-oss:${STACK_VERSION}
+    docker network create esnet-oss;
+    docker run \
+      --rm \
+      --publish 9200:9200 \
+      --env "node.attr.testattr=test" \
+      --env "path.repo=/tmp" \
+      --env "repositories.url.allowed_urls=http://snapshot.*" \
+      --env "discovery.type=single-node" \
+      --network=esnet-oss \
+      --name=elasticsearch-oss \
+      --detach \
+      docker.elastic.co/elasticsearch/elasticsearch-oss:${STACK_VERSION}
+    docker run --network esnet-oss --rm appropriate/curl --max-time 120 --retry 120 --retry-delay 1 --retry-connrefused --show-error --silent http://elasticsearch-oss:9200
+else
+    repo=$(pwd)
+    testnodecrt="/travis/certs/testnode.crt"
+    testnodekey="/travis/certs/testnode.key"
+    cacrt="/travis/certs/ca.crt"
+
+    docker pull docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
+    docker network create esnet;
+
+    docker run \
+      --rm \
+      --publish 9200:9200 \
+      --env "node.attr.testattr=test" \
+      --env "path.repo=/tmp" \
+      --env "repositories.url.allowed_urls=http://snapshot.*" \
+      --env "discovery.type=single-node" \
+      --env "ES_JAVA_OPTS=-Xms1g -Xmx1g" \
+      --env "ELASTIC_PASSWORD=changeme" \
+      --env "xpack.security.enabled=true" \
+      --env "xpack.license.self_generated.type=trial" \
+      --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.key=certs/testnode.key" \
+      --env "xpack.security.transport.ssl.certificate=certs/testnode.crt" \
+      --env "xpack.security.transport.ssl.certificate_authorities=certs/ca.crt" \
+      --volume "$repo$testnodecrt:/usr/share/elasticsearch/config/certs/testnode.crt" \
+      --volume "$repo$testnodekey:/usr/share/elasticsearch/config/certs/testnode.key" \
+      --volume "$repo$cacrt:/usr/share/elasticsearch/config/certs/ca.crt" \
+      --network=esnet \
+      --name=elasticsearch \
+      --detach \
+      docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
+
+    docker run --network esnet --rm appropriate/curl --max-time 120 --retry 120 --retry-delay 1 --retry-connrefused --show-error --silent --insecure https://elastic:changeme@elasticsearch:9200
+fi
 
-docker pull docker.elastic.co/elasticsearch/elasticsearch-oss:${ES_VERSION}
-docker network create esnet-oss;
-docker run \
-  --rm \
-  --publish 9200:9200 \
-  --env "node.attr.testattr=test" \
-  --env "path.repo=/tmp" \
-  --env "repositories.url.allowed_urls=http://snapshot.*" \
-  --env "discovery.type=single-node" \
-  --network=esnet-oss \
-  --name=elasticsearch-oss \
-  --detach \
-  docker.elastic.co/elasticsearch/elasticsearch-oss:${ES_VERSION}
-docker run --network esnet-oss --rm appropriate/curl --max-time 120 --retry 120 --retry-delay 1 --retry-connrefused --show-error --silent http://elasticsearch-oss:9200