Skip to content

[7.17] Update to latest API spec, update ES test server to use SSL (#384) #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2022
Merged

[7.17] Update to latest API spec, update ES test server to use SSL (#384) #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions java-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ dependencies {

// MIT
// https://www.testcontainers.org/
testImplementation("org.testcontainers", "testcontainers", "1.17.2")
testImplementation("org.testcontainers", "elasticsearch", "1.17.2")
testImplementation("org.testcontainers", "testcontainers", "1.17.3")
testImplementation("org.testcontainers", "elasticsearch", "1.17.3")
}


Expand Down
53 changes: 48 additions & 5 deletions java-client/src/test/java/co/elastic/clients/elasticsearch/ElasticsearchTestServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import co.elastic.clients.json.jsonb.JsonbJsonpMapper;
import co.elastic.clients.transport.ElasticsearchTransport;
import co.elastic.clients.transport.JsonEndpoint;
import co.elastic.clients.transport.Version;
import co.elastic.clients.transport.endpoints.DelegatingJsonEndpoint;
import co.elastic.clients.transport.rest_client.RestClientTransport;
import org.apache.http.HttpHost;
Expand All @@ -34,12 +35,16 @@
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.elasticsearch.client.RestClient;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.utility.DockerImageName;

import javax.net.ssl.SSLContext;
import java.io.IOException;
import java.time.Duration;

public class ElasticsearchTestServer implements AutoCloseable {

private final String[] plugins;
private volatile ElasticsearchContainer container;
private int port;
private final JsonpMapper mapper = new JsonbJsonpMapper();
Expand All @@ -54,7 +59,7 @@ public static synchronized ElasticsearchTestServer global() {
System.out.println("Starting global ES test server.");
global = new ElasticsearchTestServer();
try {
global.setup();
global.start();
} catch (Exception e) {
e.printStackTrace();
throw e;
Expand All @@ -67,24 +72,62 @@ public static synchronized ElasticsearchTestServer global() {
return global;
}

private synchronized void setup() {
container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.17.4")
public ElasticsearchTestServer(String... plugins) {
this.plugins = plugins;
}

public synchronized ElasticsearchTestServer start() {
Version version = Version.VERSION.major() < 8 ? new Version(7,17,5,false) : new Version(8,3,3,false);

// Note we could use version.major() + "." + version.minor() + "-SNAPSHOT" but plugins won't install on a snapshot version
String esImage = "docker.elastic.co/elasticsearch/elasticsearch:" + version;

DockerImageName image;
if (plugins.length == 0) {
image = DockerImageName.parse(esImage);
} else {
String esWithPluginsImage = new ImageFromDockerfile()
.withDockerfileFromBuilder(b -> {
b.from(esImage);
for (String plugin : plugins) {
b.run("/usr/share/elasticsearch/bin/elasticsearch-plugin", "install", plugin);
}
}
).get();

image = DockerImageName
.parse(esWithPluginsImage)
.asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch");
}

container = new ElasticsearchContainer(image)
.withEnv("ES_JAVA_OPTS", "-Xms256m -Xmx256m")
.withEnv("path.repo", "/tmp") // for snapshots
.withStartupTimeout(Duration.ofSeconds(60))
.withPassword("changeme");
container.start();

port = container.getMappedPort(9200);

boolean useTLS = version.major() >= 8;
HttpHost host = new HttpHost("localhost", port, useTLS ? "https": "http");

SSLContext sslContext = useTLS ? container.createSslContextFromCa() : null;

BasicCredentialsProvider credsProv = new BasicCredentialsProvider();
credsProv.setCredentials(
AuthScope.ANY, new UsernamePasswordCredentials("elastic", "changeme")
);
restClient = RestClient.builder(new HttpHost("localhost", port))
.setHttpClientConfigCallback(hc -> hc.setDefaultCredentialsProvider(credsProv))
restClient = RestClient.builder(host)
.setHttpClientConfigCallback(hc -> hc
.setDefaultCredentialsProvider(credsProv)
.setSSLContext(sslContext)
)
.build();
transport = new RestClientTransport(restClient, mapper);
client = new ElasticsearchClient(transport);

return this;
}

/**
Expand Down
84 changes: 82 additions & 2 deletions java-client/src/test/java/co/elastic/clients/elasticsearch/spec_issues/SpecIssuesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,19 @@

package co.elastic.clients.elasticsearch.spec_issues;

import co.elastic.clients.documentation.usage.Product;
import co.elastic.clients.elasticsearch.ElasticsearchClient;
import co.elastic.clients.elasticsearch.ElasticsearchTestServer;
import co.elastic.clients.elasticsearch._types.ErrorResponse;
import co.elastic.clients.elasticsearch._types.Script;
import co.elastic.clients.elasticsearch._types.analysis.LimitTokenCountTokenFilter;
import co.elastic.clients.elasticsearch._types.mapping.Property;
import co.elastic.clients.elasticsearch._types.mapping.RuntimeField;
import co.elastic.clients.elasticsearch._types.mapping.RuntimeFieldType;
import co.elastic.clients.elasticsearch.cluster.ClusterStatsResponse;
import co.elastic.clients.elasticsearch.core.SearchRequest;
import co.elastic.clients.elasticsearch.core.SearchResponse;
import co.elastic.clients.elasticsearch.core.search.Suggester;
import co.elastic.clients.elasticsearch.indices.CreateIndexRequest;
import co.elastic.clients.elasticsearch.indices.GetFieldMappingRequest;
import co.elastic.clients.elasticsearch.indices.GetFieldMappingResponse;
Expand Down Expand Up @@ -75,11 +81,40 @@ public void i0201_restoreResponse() throws Exception {
RestoreResponse restoreResponse = fromJson("{\"acknowledged\":true}", RestoreResponse.class);
}

@Test
public void i0298_runtimeMappings() throws Exception {
ElasticsearchClient client = ElasticsearchTestServer.global().client();

String index = "i0298";

Product p = new Product("p1", "p2", 42.0);

client.index(ir -> ir
.index(index)
.document(p));

client.indices().flush(f -> f.index(index));

RuntimeField runtimeField = RuntimeField.of(rf -> rf
.type(RuntimeFieldType.Double)
.script(Script.of(s -> s
.inline(i -> i.
source("emit(doc['price'].value * 1.19)")
)
))
);

client.search(sr -> sr
.index(index)
.runtimeMappings("priceWithTax", runtimeField), // NOTE: the builder accepts only lists here
Product.class);
}

@Test
public void i0297_mappingSettings() {

CreateIndexRequest request = CreateIndexRequest.of(r -> r
.index("name")
.index("i0297")
.settings(s -> s
// This is "mapping" and not "mappings"
.mapping(m -> m.totalFields(totalFields -> totalFields.limit(1001)))
Expand Down Expand Up @@ -118,11 +153,56 @@ public void i0295_mappingSettings() {
"}";

CreateIndexRequest request = CreateIndexRequest.of(r -> r
.index("name")
.index("i0295")
.withJson(new StringReader(json))
);
}

@Test
public void i0254_suggesterTest() throws Exception {
new Suggester.Builder().suggesters("song-suggest", s -> s.completion(c->c.field("suggest"))).build();
}

@Test
public void i0249_variantKind() throws Exception {
try (ElasticsearchTestServer server = new ElasticsearchTestServer("analysis-icu").start()) {

ElasticsearchClient esClient = server.client();

esClient.indices().create(r -> r
.index("i0249")
.withJson(new StringReader("{\n" +
" \"mappings\": {\n" +
" \"properties\": {\n" +
" \"name\": { \n" +
" \"type\": \"text\",\n" +
" \"fields\": {\n" +
" \"sort\": { \n" +
" \"type\": \"icu_collation_keyword\",\n" +
" \"index\": false,\n" +
" \"language\": \"de\",\n" +
" \"country\": \"DE\",\n" +
" \"variant\": \"@collation=phonebook\"\n" +
" }\n" +
" }\n" +
" }\n" +
" }\n" +
" }\n" +
"}\n"))
);

GetFieldMappingResponse fm = esClient.indices().getFieldMapping(b -> b
.index("i0249")
.fields("*")
);

Property property = fm.get("i0249").mappings().get("name").mapping().get("name").text().fields().get("sort");

assertTrue(property._isCustom());
assertEquals("icu_collation_keyword", property._customKind());
}
}

@Test
public void i0199_consumeAllTokensOptional() {
// https://github.com/elastic/elasticsearch-java/issues/199
Expand Down