Skip to content

Migrate x-pack-deprecation REST tests #131444

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 16 commits into from
Aug 12, 2025
Merged

Migrate x-pack-deprecation REST tests #131444

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8ef12ad
(WIP) Migrate x-pack-deprecation REST tests
ldematte Jul 17, 2025
1c14a1c
Using default distribution
ldematte Jul 17, 2025
bfa219a
Merge remote-tracking branch 'upstream/main' into refactor-xpack-depr…
ldematte Jul 17, 2025
8730b91
Removing from legacy allow list
ldematte Jul 17, 2025
75820dd
Merge remote-tracking branch 'upstream/main' into refactor-xpack-depr…
ldematte Jul 18, 2025
9a79288
Move javaRestTest to common (parent) location; renamed test plugin pr…
ldematte Jul 18, 2025
ec8432a
Merge branch 'main' into refactor-xpack-deprecation-tests
ldematte Jul 18, 2025
1a3d914
Updated reason + comment
ldematte Jul 18, 2025
8ae9b2e
Merge branch 'refactor-xpack-deprecation-tests' of github.com:ldematt…
ldematte Jul 18, 2025
5f0bbb0
Added build scan link
ldematte Jul 18, 2025
2cb6e95
Renaming packages to avoid split packages problems
ldematte Jul 18, 2025
d59a5aa
Merge remote-tracking branch 'upstream/main' into refactor-xpack-depr…
ldematte Aug 5, 2025
a367de4
Trim down module/plugins dependency set
ldematte Aug 5, 2025
31dcf2f
Merge remote-tracking branch 'upstream/main' into refactor-xpack-depr…
ldematte Aug 5, 2025
cb21200
Merge branch 'main' into refactor-xpack-deprecation-tests
ldematte Aug 12, 2025
c10e780
Merge branch 'main' into refactor-xpack-deprecation-tests
ldematte Aug 12, 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
7 changes: 5 additions & 2 deletions x-pack/plugin/deprecation/qa/early-deprecation-rest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,16 @@ dependencies {
javaRestTestImplementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
javaRestTestImplementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")

clusterModules project(xpackModule('deprecation'))
clusterModules project(':x-pack:plugin:deprecation:qa:rest')
clusterPlugins project(':x-pack:plugin:deprecation:qa::early-deprecation-rest')
}

// let the javaRestTest see the classpath of main
GradleUtils.extendSourceSet(project, "main", "javaRestTest", tasks.named("javaRestTest"))

tasks.named('javaRestTest') {
usesDefaultDistribution("to be triaged")
}

restResources {
restApi {
include '_common', 'indices', 'index'
Expand Down
13 changes: 9 additions & 4 deletions ...src/javaRestTest/java/org/elasticsearch/xpack/deprecation/EarlyDeprecationIndexingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.cluster.ElasticsearchCluster;
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
import org.elasticsearch.test.rest.ESRestTestCase;
import org.junit.ClassRule;

Expand All @@ -39,16 +40,20 @@ public class EarlyDeprecationIndexingIT extends ESRestTestCase {

@ClassRule
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
.module("x-pack-deprecation")
.module("deprecation-test-plugin")
.distribution(DistributionType.DEFAULT)
.plugin("deprecation-test-plugin")
.setting("xpack.security.enabled", "false")
.setting("xpack.license.self_generated.type", "trial")
.setting("cluster.deprecation_indexing.enabled", "true")
.setting("cluster.deprecation_indexing.flush_interval", "1ms")
.setting("logger.org.elasticsearch.xpack.deprecation","TRACE")
.setting("logger.org.elasticsearch.xpack.deprecation.logging","TRACE")
.setting("logger.org.elasticsearch.xpack.deprecation", "TRACE")
.setting("logger.org.elasticsearch.xpack.deprecation.logging", "TRACE")
.build();

@Override
protected String getTestRestCluster() {
return cluster.getHttpAddresses();
}

/**
* In EarlyDeprecationTestPlugin#onNodeStarted we simulate a very early deprecation that can happen before the template is loaded
Expand Down
9 changes: 6 additions & 3 deletions x-pack/plugin/deprecation/qa/rest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ dependencies {
javaRestTestImplementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
javaRestTestImplementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")

clusterModules project(xpackModule('deprecation'))
clusterModules project(':x-pack:plugin:deprecation:qa:rest')
clusterModules project(':x-pack:plugin:ml')
clusterPlugins project(':x-pack:plugin:deprecation:qa:rest')
}

// let the javaRestTest see the classpath of main
Expand All @@ -37,6 +35,11 @@ restResources {
}
}

tasks.named('javaRestTest') {
usesDefaultDistribution("to be triaged")
}


// Test clusters run with security disabled
tasks.named("javaRestTest") {
buildParams.withFipsEnabledOnly(it)
Expand Down
5 changes: 3 additions & 2 deletions .../qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/DeprecationHttpIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.core.RestApiVersion;
import org.elasticsearch.test.cluster.ElasticsearchCluster;
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
import org.elasticsearch.test.rest.ESRestTestCase;
import org.elasticsearch.xcontent.XContentBuilder;
import org.elasticsearch.xcontent.json.JsonXContent;
Expand Down Expand Up @@ -66,8 +67,8 @@ public class DeprecationHttpIT extends ESRestTestCase {

@ClassRule
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
.module("x-pack-deprecation")
.module("deprecation-test-plugin")
.distribution(DistributionType.DEFAULT)
.plugin("deprecation-test-plugin")
.setting("cluster.deprecation_indexing.enabled", "true")
.setting("cluster.deprecation_indexing.flush_interval", "100ms")
.setting("xpack.security.enabled", "false")
Expand Down
6 changes: 3 additions & 3 deletions ...on/qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/MlDeprecationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.search.SearchModule;
import org.elasticsearch.test.cluster.ElasticsearchCluster;
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
import org.elasticsearch.test.rest.ESRestTestCase;
import org.elasticsearch.xcontent.NamedXContentRegistry;
import org.junit.After;
Expand All @@ -32,9 +33,8 @@ public class MlDeprecationIT extends ESRestTestCase {

@ClassRule
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
.module("x-pack-deprecation")
.module("deprecation-test-plugin")
.module("x-pack-ml")
.distribution(DistributionType.DEFAULT)
.plugin("deprecation-test-plugin")
.setting("cluster.deprecation_indexing.enabled", "true")
.setting("cluster.deprecation_indexing.flush_interval", "100ms")
.setting("xpack.security.enabled", "false")
Expand Down