Skip to content

[9.0] Convert ingest-geoip file based update tests to new testing framework (#125632) #125702

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 2 commits into from
Mar 26, 2025
Merged

[9.0] Convert ingest-geoip file based update tests to new testing framework (#125632) #125702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b24ead
Convert ingest-geoip file based update tests to new testing framework…
mark-vieira Mar 26, 2025
68d953b
Merge branch '9.0' into backport/9.0/pr-125632
mark-vieira Mar 26, 2025
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
18 changes: 3 additions & 15 deletions modules/ingest-geoip/qa/file-based-update/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,8 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/

apply plugin: 'elasticsearch.legacy-java-rest-test'
apply plugin: 'elasticsearch.internal-java-rest-test'

testClusters.configureEach {
testDistribution = 'DEFAULT'
setting 'resource.reload.interval.high', '100ms'
setting 'xpack.security.enabled', 'true'
user username: 'admin', password: 'admin-password', role: 'superuser'
}

tasks.named("javaRestTest").configure {
systemProperty 'tests.security.manager', 'false' // Allows the test the add databases to config directory.
nonInputProperties.systemProperty 'tests.config.dir', testClusters.named("javaRestTest").map(c -> c.singleNode().getConfigDir())
}

tasks.named("forbiddenPatterns").configure {
exclude '**/*.mmdb'
dependencies {
clusterModules project(':modules:ingest-geoip')
}
26 changes: 17 additions & 9 deletions ...-based-update/src/javaRestTest/java/org/elasticsearch/ingest/geoip/UpdateDatabasesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
package org.elasticsearch.ingest.geoip;

import org.elasticsearch.client.Request;
import org.elasticsearch.common.settings.SecureString;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.core.PathUtils;
import org.elasticsearch.test.cluster.ElasticsearchCluster;
import org.elasticsearch.test.rest.ESRestTestCase;
import org.elasticsearch.xcontent.ObjectPath;
import org.junit.ClassRule;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;

import java.io.IOException;
import java.nio.file.Files;
Expand All @@ -29,6 +29,16 @@
import static org.hamcrest.Matchers.nullValue;

public class UpdateDatabasesIT extends ESRestTestCase {
public static TemporaryFolder configDir = new TemporaryFolder();

public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
.module("ingest-geoip")
.withConfigDir(() -> configDir.getRoot().toPath())
.setting("resource.reload.interval.high", "100ms")
.build();

@ClassRule
public static RuleChain ruleChain = RuleChain.outerRule(configDir).around(cluster);

public void test() throws Exception {
String body = """
Expand All @@ -51,7 +61,7 @@ public void test() throws Exception {
assertThat(stats, nullValue());
}

Path configPath = PathUtils.get(System.getProperty("tests.config.dir"));
Path configPath = configDir.getRoot().toPath();
assertThat(Files.exists(configPath), is(true));
Path ingestGeoipDatabaseDir = configPath.resolve("ingest-geoip");
Files.createDirectory(ingestGeoipDatabaseDir);
Expand Down Expand Up @@ -82,9 +92,7 @@ public void test() throws Exception {
}

@Override
protected Settings restClientSettings() {
String token = basicAuthHeaderValue("admin", new SecureString("admin-password".toCharArray()));
return Settings.builder().put(ThreadContext.PREFIX + ".Authorization", token).build();
protected String getTestRestCluster() {
return cluster.getHttpAddresses();
}

}