Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
jakelandis committed Jul 12, 2024
1 parent 55532c8 commit f46ca9b
Show file tree
Hide file tree
Showing 5 changed files with 389 additions and 94 deletions.
5 changes: 5 additions & 0 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3607,6 +3607,11 @@
<sha256 value="57d0a9e9286f82f4eaa851125186997f811befce0e2060ff0a15a77f5a9dd9a7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.javassist" name="javassist" version="3.30.2-GA">
<artifact name="javassist-3.30.2-GA.jar">
<sha256 value="eba37290994b5e4868f3af98ff113f6244a6b099385d9ad46881307d3cb01aaf" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jdom" name="jdom2" version="2.0.6">
<artifact name="jdom2-2.0.6.jar">
<sha256 value="1345f11ba606d15603d6740551a8c21947c0215640770ec67271fe78bea97cf5" origin="Generated by Gradle"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ public class ActionModule extends AbstractModule {
private final SettingsFilter settingsFilter;
private final List<ActionPlugin> actionPlugins;
private final Map<String, ActionHandler<?, ?>> actions;
private static Map<String, ActionHandler<?, ?>> debugActions; //testonly
private final ActionFilters actionFilters;
private final AutoCreateIndex autoCreateIndex;
private final DestructiveOperations destructiveOperations;
Expand Down Expand Up @@ -485,6 +486,9 @@ public ActionModule(
this.actionPlugins = actionPlugins;
this.threadPool = threadPool;
actions = setupActions(actionPlugins);
// if("true".equalsIgnoreCase(System.getProperty("testonly"))) {
debugActions = actions;
// }
actionFilters = setupActionFilters(actionPlugins);
autoCreateIndex = new AutoCreateIndex(settings, clusterSettings, indexNameExpressionResolver, systemIndices);
destructiveOperations = new DestructiveOperations(settings, clusterSettings);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,6 @@ interface RemoteClusterShardRequest extends IndicesRequest {
*/
Collection<ShardId> shards();
}


}
60 changes: 38 additions & 22 deletions x-pack/plugin/security/qa/consistency-checks/build.gradle
Original file line number Diff line number Diff line change
@@ -1,27 +1,43 @@
apply plugin: 'elasticsearch.standalone-test'

dependencies {
//since we are placing everything on the classpath for this test we need to force versions to converge or simply ignore them
configurations.all {
resolutionStrategy {
force "org.slf4j:slf4j-api:2.0.10"
force "commons-codec:commons-codec:1.16.1"
force "org.slf4j:slf4j-nop:2.0.10"
force "org.apache.commons:commons-lang3:3.14.0"
force "com.fasterxml.jackson.core:jackson-databind:2.15.0"
force "com.fasterxml.jackson.core:jackson-core:2.15.4"
force "com.fasterxml.jackson.core:jackson-annotations:2.15.4"
force "joda-time:joda-time:2.10.14"
force "org.ow2.asm:asm:8.0.1"
force "com.sun.mail:jakarta.mail:1.6.4"

exclude group: 'commons-logging', module: 'commons-logging'
exclude group: 'jakarta.xml.bind', module: 'jakarta.xml.bind-api'
exclude group: 'jakarta.activation', module: 'jakarta.activation-api'
}
}


dependencies {
testImplementation "org.reflections:reflections:0.10.2"
testImplementation "org.javassist:javassist:3.30.2-GA"
testImplementation(testArtifact(project(xpackModule('core'))))
testImplementation project(path: ':modules:ingest-common')
testImplementation project(path: ':modules:data-streams')
testImplementation project(path: ':modules:lang-mustache')
testImplementation project(path: ':modules:rank-eval')
testImplementation project(path: ':modules:reindex')
testImplementation project(path: xpackModule('analytics'))
testImplementation project(path: xpackModule('async-search'))
testImplementation project(path: xpackModule('autoscaling'))
testImplementation project(path: xpackModule('ccr'))
testImplementation project(path: xpackModule('downsample'))
testImplementation project(path: xpackModule('eql'))
testImplementation project(path: xpackModule('esql'))
testImplementation project(path: xpackModule('esql-core'))
testImplementation project(path: xpackModule('frozen-indices'))
testImplementation project(path: xpackModule('graph'))
testImplementation project(path: xpackModule('ilm'))
testImplementation project(path: xpackModule('inference'))
testImplementation project(path: xpackModule('profiling'))
testImplementation project(path: xpackModule('rollup'))
testImplementation project(path: xpackModule('slm'))
testImplementation project(path: xpackModule('sql'))

project.rootProject.subprojects.findAll { it.parent.path == ':modules' }.each { Project module ->
testImplementation module
}

Project xpack = project(':x-pack:plugin')
xpack.subprojects.findAll { it.parent == xpack }.each { Project xpackModule ->
testImplementation xpackModule
}

}

tasks.named("test").configure {
systemProperty 'tests.security.manager', 'false'
//TODO: add system property for registry debug
}
Loading

0 comments on commit f46ca9b

Please sign in to comment.