Add TcpHost to ElasticsearchContainer (#956)

Applications have 2 ways to communicate with ElasticSearch:
- via REST client
- via transport client

ElasticsearchContainer currently only allows the usage of the REST client.

This allows the application to connect to the container via transport client.

Author: reda-alaoui

docs/usage/elasticsearch_container.md

@@ -16,13 +16,20 @@ ElasticsearchContainer container = new ElasticsearchContainer("docker.elastic.co
 // Start the container. This step might take some time...
 container.start();
 
-// Do whatever you want here.
+// Do whatever you want with the rest client ...
 final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
 credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "changeme"));
-RestClient client = RestClient.builder(HttpHost.create(container.getHttpHostAddress()))
+RestClient restClient = RestClient.builder(HttpHost.create(container.getHttpHostAddress()))
         .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider))
         .build();
-Response response = client.performRequest("GET", "/");
+Response response = restClient.performRequest("GET", "/");
+
+// ... or the transport client
+TransportAddress transportAddress = new TransportAddress(container.getTcpHost());
+Settings settings = Settings.builder().put("cluster.name", "docker-cluster").build();
+TransportClient transportClient = new PreBuiltTransportClient(settings)
+    .addTransportAddress(transportAddress);
+ClusterHealthResponse healths = transportClient.admin().cluster().prepareHealth().get();
 
 // Stop the container.
 container.stop();

modules/elasticsearch/build.gradle

@@ -3,4 +3,5 @@ description = "TestContainers :: elasticsearch"
 dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:6.4.1"
+    testCompile "org.elasticsearch.client:transport:6.4.1"
 }

modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java

@@ -4,6 +4,7 @@
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.utility.Base58;
 
+import java.net.InetSocketAddress;
 import java.time.Duration;
 
 import static java.net.HttpURLConnection.HTTP_OK;
@@ -58,4 +59,8 @@ public ElasticsearchContainer(String dockerImageName) {
     public String getHttpHostAddress() {
         return getContainerIpAddress() + ":" + getMappedPort(ELASTICSEARCH_DEFAULT_PORT);
     }
+
+    public InetSocketAddress getTcpHost() {
+        return new InetSocketAddress(getContainerIpAddress(), getMappedPort(ELASTICSEARCH_DEFAULT_TCP_PORT));
+    }
 }

modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java

@@ -7,10 +7,15 @@
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.util.EntityUtils;
+import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseException;
 import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.transport.TransportClient;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.transport.TransportAddress;
+import org.elasticsearch.transport.client.PreBuiltTransportClient;
 import org.junit.After;
 import org.junit.Test;
 
@@ -48,7 +53,7 @@ public void stopRestClient() throws IOException {
     public void elasticsearchDefaultTest() throws IOException {
         try (ElasticsearchContainer container = new ElasticsearchContainer()
             .withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
-        ){
+        ) {
             container.start();
             Response response = getClient(container).performRequest(new Request("GET", "/"));
             assertThat(response.getStatusLine().getStatusCode(), is(200));
@@ -87,17 +92,35 @@ public void elasticsearchOssImage() throws IOException {
         }
     }
 
+    @Test
+    public void transportClientClusterHealth() {
+        try (ElasticsearchContainer container = new ElasticsearchContainer()) {
+            container.start();
+
+            TransportAddress transportAddress = new TransportAddress(container.getTcpHost());
+            String expectedClusterName = "docker-cluster";
+            Settings settings = Settings.builder().put("cluster.name", expectedClusterName).build();
+            try (TransportClient transportClient = new PreBuiltTransportClient(settings)
+                .addTransportAddress(transportAddress)) {
+                ClusterHealthResponse healths = transportClient.admin().cluster().prepareHealth().get();
+                String clusterName = healths.getClusterName();
+                assertThat(clusterName, is(expectedClusterName));
+            }
+        }
+    }
+
     private RestClient getClient(ElasticsearchContainer container) {
         if (client == null) {
             final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
             credentialsProvider.setCredentials(AuthScope.ANY,
-                    new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD));
+                new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD));
 
             client = RestClient.builder(HttpHost.create(container.getHttpHostAddress()))
-                    .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider))
-                    .build();
+                .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider))
+                .build();
         }
 
         return client;
     }
+
 }