Simplify test artifact compile classpath (#78238) (#78429)

breskeby · web-flow · commit 7d61f2c62d01 · 2021-09-29T12:22:34.000+02:00
- This fixes having transitive compile only dependencies on the classpath for consumers of test artifacts
- We remove compile dependencies from the testArtifact configuration dependencies here as this leaks implementation and compile only deps to consuming projects
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestArtifactExtension.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestArtifactExtension.java
@@ -39,8 +39,6 @@ public void registerTestArtifactFromSourceSet(SourceSet sourceSet) {
             featureSpec.disablePublication();
         });
 
-        Configuration testApiElements = project.getConfigurations().getByName(sourceSet.getApiElementsConfigurationName());
-        testApiElements.extendsFrom(project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName()));
         DependencyHandler dependencies = project.getDependencies();
         project.getPlugins().withType(JavaPlugin.class, javaPlugin -> {
             Dependency projectDependency = dependencies.create(project);
diff --git a/x-pack/plugin/analytics/build.gradle b/x-pack/plugin/analytics/build.gradle
@@ -8,10 +8,10 @@ esplugin {
 archivesBaseName = 'x-pack-analytics'
 
 dependencies {
-  compileOnly project(":server")
-
+  api 'org.apache.commons:commons-math3:3.6.1'
   compileOnly project(path: xpackModule('core'))
+  compileOnly project(":server")
   testImplementation(testArtifact(project(xpackModule('core'))))
-  api 'org.apache.commons:commons-math3:3.6.1'
+  testImplementation(project(":client:rest-high-level"))
 }
 
diff --git a/x-pack/plugin/async-search/build.gradle b/x-pack/plugin/async-search/build.gradle
@@ -16,6 +16,8 @@ dependencies {
   compileOnly project(path: xpackModule('core'))
   testImplementation(testArtifact(project(xpackModule('core'))))
   testImplementation project(path: xpackModule('async'))
+
+  internalClusterTestImplementation project(":modules:reindex")
 }
 
 
diff --git a/x-pack/plugin/async-search/qa/security/build.gradle b/x-pack/plugin/async-search/qa/security/build.gradle
@@ -4,6 +4,7 @@ dependencies {
   javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
   javaRestTestImplementation project(xpackModule('async-search'))
   javaRestTestImplementation project(':test:framework')
+  javaRestTestImplementation project(":client:rest-high-level")
 }
 
 testClusters.configureEach {
diff --git a/x-pack/plugin/build.gradle b/x-pack/plugin/build.gradle
@@ -13,6 +13,7 @@ archivesBaseName = 'x-pack'
 
 dependencies {
   testImplementation(testArtifact(project(xpackModule('core'))))
+  testImplementation project(':test:framework')
 }
 
 // let the yamlRestTest see the classpath of test
diff --git a/x-pack/plugin/ccr/build.gradle b/x-pack/plugin/ccr/build.gradle
@@ -33,6 +33,7 @@ dependencies {
   compileOnly project(path: xpackModule('core'))
   testImplementation(testArtifact(project(xpackModule('core'))))
   testImplementation(testArtifact(project(xpackModule('monitoring'))))
+  testImplementation(project(":modules:analysis-common"))
 }
 
 tasks.named("testingConventions").configure {
diff --git a/x-pack/plugin/eql/build.gradle b/x-pack/plugin/eql/build.gradle
@@ -31,6 +31,8 @@ dependencies {
   testImplementation project(path: ':plugins:transport-nio') // for http in RestEqlCancellationIT
 
   testImplementation 'io.ous:jtoml:2.0.0'
+
+  internalClusterTestImplementation project(":client:rest-high-level")
 }
 
 
diff --git a/x-pack/plugin/eql/qa/common/build.gradle b/x-pack/plugin/eql/qa/common/build.gradle
@@ -6,7 +6,7 @@ dependencies {
   api project(path: xpackModule('core'))
   api(testArtifact(project(xpackModule('core'))))
   api project(xpackModule('ql:test-fixtures'))
-
+  implementation project(":client:rest-high-level")
   // TOML parser for EqlActionIT tests
   api 'io.ous:jtoml:2.0.0'
 }
diff --git a/x-pack/plugin/eql/qa/correctness/build.gradle b/x-pack/plugin/eql/qa/correctness/build.gradle
@@ -10,6 +10,7 @@ dependencies {
   javaRestTestImplementation project(':test:framework')
   javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
   javaRestTestImplementation project(xpackModule('ql:test-fixtures'))
+  javaRestTestImplementation project(":client:rest-high-level")
   javaRestTestImplementation 'io.ous:jtoml:2.0.0'
 }
 
diff --git a/x-pack/plugin/identity-provider/build.gradle b/x-pack/plugin/identity-provider/build.gradle
@@ -13,9 +13,7 @@ archivesBaseName = 'x-pack-identity-provider'
 
 dependencies {
   compileOnly project(path: xpackModule('core'))
-  testImplementation(testArtifact(project(xpackModule('core'))))
-  // So that we can extend LocalStateCompositeXPackPlugin
-  testImplementation(testArtifact(project(xpackModule('security'))))
+
   // the following are all SAML dependencies - might as well download the whole internet
   api "org.opensaml:opensaml-core:3.4.5"
   api "org.opensaml:opensaml-saml-api:3.4.5"
@@ -49,6 +47,12 @@ dependencies {
 
   testImplementation 'org.elasticsearch:securemock:1.2'
   testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}"
+  testImplementation(testArtifact(project(xpackModule('core'))))
+  // So that we can extend LocalStateCompositeXPackPlugin
+  testImplementation(testArtifact(project(xpackModule('security'))))
+  testImplementation project(':modules:lang-mustache')
+  internalClusterTestImplementation project(":modules:analysis-common")
+
 }
 
 tasks.named("dependencyLicenses").configure {
diff --git a/x-pack/plugin/identity-provider/qa/idp-rest-tests/build.gradle b/x-pack/plugin/identity-provider/qa/idp-rest-tests/build.gradle
@@ -5,6 +5,7 @@ dependencies {
   javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
   //TODO: update javaRestTests to not rely on any code that it is testing
   javaRestTestImplementation project(path: xpackModule('identity-provider'))
+  javaRestTestImplementation project(":client:rest-high-level")
 }
 
 testClusters.configureEach {
diff --git a/x-pack/plugin/ilm/qa/multi-node/build.gradle b/x-pack/plugin/ilm/qa/multi-node/build.gradle
@@ -5,6 +5,7 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
 
 dependencies {
   javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
+  javaRestTestImplementation project(":client:rest-high-level")
 }
 
 File repoDir = file("$buildDir/testclusters/repo")
diff --git a/x-pack/plugin/ilm/qa/with-security/build.gradle b/x-pack/plugin/ilm/qa/with-security/build.gradle
@@ -4,6 +4,7 @@ apply plugin: 'elasticsearch.authenticated-testclusters'
 dependencies {
   javaRestTestImplementation project(path: xpackModule('core'))
   javaRestTestImplementation(testArtifact(project(xpackProject('plugin').path)))
+  javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
   javaRestTestImplementation project(":client:rest-high-level")
 }
 
diff --git a/x-pack/plugin/ml/build.gradle b/x-pack/plugin/ml/build.gradle
@@ -62,7 +62,10 @@ dependencies {
   testImplementation project(path: xpackModule('ilm'))
   testImplementation project(path: xpackModule('shutdown'))
   testImplementation project(path: xpackModule('data-streams'))
+  testImplementation project(path: xpackModule('monitoring'))
   testImplementation project(':modules:ingest-common')
+  testImplementation project(':modules:reindex')
+  testImplementation project(':modules:analysis-common')
   // This should not be here
   testImplementation(testArtifact(project(xpackModule('security'))))
   // ml deps
diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle b/x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle
@@ -4,9 +4,16 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
 dependencies {
   javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
   javaRestTestImplementation(testArtifact(project(xpackModule('ml'))))
+  javaRestTestImplementation(testArtifact(project(xpackModule('security'))))
   javaRestTestImplementation project(path: ':modules:ingest-common')
+  javaRestTestImplementation project(path: ':modules:reindex')
+  javaRestTestImplementation project(path: ':modules:transport-netty4')
+  javaRestTestImplementation project(path: xpackModule('autoscaling'))
   javaRestTestImplementation project(path: xpackModule('data-streams'))
+  javaRestTestImplementation project(path: xpackModule('ilm'))
+  javaRestTestImplementation project(path: xpackModule('monitoring'))
   javaRestTestImplementation project(path: xpackModule('transform'))
+  javaRestTestImplementation project(":client:rest-high-level")
 }
 
 // location for keys and certificates
diff --git a/x-pack/plugin/monitoring/build.gradle b/x-pack/plugin/monitoring/build.gradle
@@ -12,16 +12,17 @@ archivesBaseName = 'x-pack-monitoring'
 
 dependencies {
   compileOnly project(path: xpackModule('core'))
-  testImplementation(testArtifact(project(xpackModule('core'))))
 
   // monitoring deps
   api project(':client:rest')
   api project(':client:sniffer')
 
   // baz - this goes away after we separate out the actions #27759
+  testImplementation project(":modules:analysis-common")
   testImplementation project(xpackModule('watcher'))
-
   testImplementation project(xpackModule('ilm'))
+  testImplementation project(xpackModule('data-streams'))
+  testImplementation(testArtifact(project(xpackModule('core'))))
 }
 
 
diff --git a/x-pack/plugin/ql/build.gradle b/x-pack/plugin/ql/build.gradle
@@ -15,11 +15,11 @@ ext {
 archivesBaseName = 'x-pack-ql'
 
 dependencies {
+  api "org.antlr:antlr4-runtime:${antlrVersion}"
   compileOnly project(path: xpackModule('core'))
-  testImplementation project(':test:framework')
-  testImplementation(testArtifact(project(xpackModule('core'))))
-  testImplementation(project(xpackModule('ql:test-fixtures'))) {
+  testApi(project(xpackModule('ql:test-fixtures'))) {
     exclude group: 'org.elasticsearch.plugin', module: 'ql'
   }
-  api "org.antlr:antlr4-runtime:${antlrVersion}"
+  testImplementation project(':test:framework')
+  testImplementation(testArtifact(project(xpackModule('core'))))
 }
diff --git a/x-pack/plugin/repository-encrypted/qa/azure/build.gradle b/x-pack/plugin/repository-encrypted/qa/azure/build.gradle
@@ -0,0 +1,11 @@
+apply plugin: 'elasticsearch.internal-cluster-test'
+apply plugin: 'elasticsearch.java'
+
+dependencies {
+    internalClusterTestImplementation testArtifact(project(':plugins:repository-azure'), 'internalClusterTest')
+    internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test')
+    internalClusterTestImplementation project(':server')
+    internalClusterTestImplementation project(':test:framework')
+    internalClusterTestImplementation project(':x-pack:plugin:core')
+    internalClusterTestImplementation testArtifact(project(':x-pack:plugin:core'))
+}
diff --git a/x-pack/plugin/repository-encrypted/qa/gcs/build.gradle b/x-pack/plugin/repository-encrypted/qa/gcs/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'elasticsearch.internal-cluster-test'
+apply plugin: 'elasticsearch.java'
+
+dependencies {
+    internalClusterTestImplementation testArtifact(project(':plugins:repository-gcs'), 'internalClusterTest')
+    internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test')
+    internalClusterTestImplementation project(':server')
+    internalClusterTestImplementation project(':test:framework')
+    internalClusterTestImplementation project(':x-pack:plugin:core')
+    internalClusterTestImplementation testArtifact(project(':x-pack:plugin:core'))
+
+}
diff --git a/x-pack/plugin/repository-encrypted/qa/s3/build.gradle b/x-pack/plugin/repository-encrypted/qa/s3/build.gradle
@@ -0,0 +1,11 @@
+apply plugin: 'elasticsearch.internal-cluster-test'
+apply plugin: 'elasticsearch.java'
+
+dependencies {
+    internalClusterTestImplementation testArtifact(project(':plugins:repository-s3'), 'internalClusterTest')
+    internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test')
+    internalClusterTestImplementation project(':server')
+    internalClusterTestImplementation project(':test:framework')
+    internalClusterTestImplementation project(':x-pack:plugin:core')
+    internalClusterTestImplementation testArtifact(project(':x-pack:plugin:core'))
+}
diff --git a/x-pack/plugin/security/build.gradle b/x-pack/plugin/security/build.gradle
@@ -24,6 +24,9 @@ dependencies {
   testImplementation project(path: xpackModule('spatial'))
   testImplementation project(path: ':modules:percolator')
   testImplementation project(path: xpackModule('sql:sql-action'))
+  testImplementation project(path: ':modules:analysis-common')
+  testImplementation project(path: ':modules:reindex')
+  testImplementation project(":client:rest-high-level")
 
   testImplementation(testArtifact(project(xpackModule('core'))))
   internalClusterTestImplementation(testArtifact(project(xpackModule('core'))))
diff --git a/x-pack/plugin/security/cli/build.gradle b/x-pack/plugin/security/cli/build.gradle
@@ -16,7 +16,8 @@ dependencies {
   }
   testRuntimeOnly "com.google.guava:guava:${versions.jimfs_guava}"
   testImplementation project(":test:framework")
-testImplementation(testArtifact(project(xpackModule('core'))))}
+  testImplementation(testArtifact(project(xpackModule('core'))))
+}
 
 tasks.named("dependencyLicenses").configure {
   mapping from: /bc.*/, to: 'bouncycastle'
diff --git a/x-pack/plugin/security/qa/security-basic/build.gradle b/x-pack/plugin/security/qa/security-basic/build.gradle
@@ -6,6 +6,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams
 dependencies {
   javaRestTestImplementation(testArtifact(project(xpackModule('security'))))
   javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
+  javaRestTestImplementation project(":client:rest-high-level")
 }
 
 if (BuildParams.inFipsJvm){
diff --git a/x-pack/plugin/security/qa/security-trial/build.gradle b/x-pack/plugin/security/qa/security-trial/build.gradle
@@ -3,6 +3,8 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
 dependencies {
   javaRestTestImplementation project(path: xpackModule('core'))
   javaRestTestImplementation(testArtifact(project(xpackModule('security'))))
+  javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
+  javaRestTestImplementation project(":client:rest-high-level")
 }
 
 testClusters.matching { it.name == 'javaRestTest' }.configureEach {
diff --git a/x-pack/plugin/security/qa/smoke-test-all-realms/build.gradle b/x-pack/plugin/security/qa/smoke-test-all-realms/build.gradle
@@ -11,6 +11,7 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
 dependencies {
   javaRestTestImplementation(testArtifact(project(xpackModule('security'))))
   javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
+  javaRestTestImplementation(project(":client:rest-high-level"))
 }
 
 testClusters.matching { it.name == 'javaRestTest' }.configureEach {
diff --git a/x-pack/plugin/transform/build.gradle b/x-pack/plugin/transform/build.gradle
@@ -9,12 +9,14 @@ esplugin {
 
 dependencies {
   compileOnly project(":server")
-
   compileOnly project(path: xpackModule('core'))
+
   testImplementation(testArtifact(project(xpackModule('core'))))
   testImplementation project(path: xpackModule('analytics'))
   testImplementation project(path: ':modules:aggs-matrix-stats')
   testImplementation project(path: xpackModule('spatial'))
+
+  internalClusterTestImplementation project(":modules:reindex")
 }
 
 addQaCheckDependencies()
diff --git a/x-pack/plugin/watcher/build.gradle b/x-pack/plugin/watcher/build.gradle
@@ -29,6 +29,8 @@ dependencies {
 
   testImplementation(testArtifact(project(xpackModule('core'))))
   testImplementation project(xpackModule('ilm'))
+  testImplementation project(xpackModule('data-streams'))
+  testImplementation project(':modules:lang-mustache')
 
   // watcher deps
   api 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20191001.1'
@@ -42,6 +44,8 @@ dependencies {
   testImplementation 'org.subethamail:subethasmtp:3.1.7'
   // needed for subethasmtp, has @GuardedBy annotation
   testImplementation 'com.google.code.findbugs:jsr305:3.0.2'
+
+  internalClusterTestImplementation project(":modules:analysis-common")
 }
 
 // classes are missing, e.g. com.ibm.icu.lang.UCharacter
diff --git a/x-pack/qa/evil-tests/build.gradle b/x-pack/qa/evil-tests/build.gradle
@@ -1,6 +1,16 @@
 apply plugin: 'elasticsearch.standalone-test'
 
 dependencies {
+  testImplementation(project(xpackModule('core')))
+  testImplementation("org.apache.kerby:kerb-admin:1.1.1")
+  testImplementation("org.apache.kerby:kerb-client:1.1.1")
+  testImplementation("org.apache.kerby:kerb-common:1.1.1")
+  testImplementation("org.apache.kerby:kerb-core:1.1.1")
+  testImplementation("org.apache.kerby:kerb-server:1.1.1")
+  testImplementation("org.apache.kerby:kerb-simplekdc:1.1.1")
+  testImplementation("org.apache.kerby:kerb-util:1.1.1")
+  testImplementation("org.apache.kerby:kerby-config:1.1.1")
+
   testImplementation(testArtifact(project(xpackModule('security'))))
 }
 
diff --git a/x-pack/qa/reindex-tests-with-security/build.gradle b/x-pack/qa/reindex-tests-with-security/build.gradle
@@ -8,7 +8,8 @@ apply plugin: 'elasticsearch.rest-resources'
 dependencies {
   testImplementation(testArtifact(project(xpackModule('core'))))
   testImplementation(testArtifact(project(xpackModule('security'))))
-  testImplementation project(path: ':modules:reindex')
+  testImplementation(project(':modules:reindex'))
+  testImplementation(project(":client:rest-high-level"))
 }
 
 tasks.named("forbiddenPatterns").configure {
diff --git a/x-pack/qa/runtime-fields/with-security/build.gradle b/x-pack/qa/runtime-fields/with-security/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'elasticsearch.authenticated-testclusters'
 
 dependencies {
   javaRestTestImplementation(testArtifact(project(xpackModule('core'))))
+  javaRestTestImplementation project(":client:rest-high-level")
 }
 
 testClusters.configureEach {
diff --git a/x-pack/qa/security-tools-tests/build.gradle b/x-pack/qa/security-tools-tests/build.gradle
@@ -1,7 +1,9 @@
 apply plugin: 'elasticsearch.standalone-test'
 
 dependencies {
+  testImplementation project(xpackModule('core'))
   testImplementation project(xpackModule('security'))
+  testImplementation(testArtifact(project(xpackModule('core'))))
   testImplementation(testArtifact(project(xpackModule('security'))))
   testImplementation "com.google.jimfs:jimfs:${versions.jimfs}"
   testRuntimeOnly "com.google.guava:guava:${versions.jimfs_guava}"
diff --git a/x-pack/qa/third-party/active-directory/build.gradle b/x-pack/qa/third-party/active-directory/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'elasticsearch.standalone-test'
 apply plugin: 'elasticsearch.test.fixtures'
 
 dependencies {
+  testImplementation project(xpackModule('core'))
   testImplementation project(xpackModule('security'))
   testImplementation(testArtifact(project(xpackModule('security'))))}
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ dependencies {`
`16`	`16`	`compileOnly project(path: xpackModule('core'))`
`17`	`17`	`testImplementation(testArtifact(project(xpackModule('core'))))`
`18`	`18`	`testImplementation project(path: xpackModule('async'))`
	`19`	`+`
	`20`	`+ internalClusterTestImplementation project(":modules:reindex")`
`19`	`21`	`}`
`20`	`22`
`21`	`23`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ dependencies {`
`4`	`4`	`javaRestTestImplementation(testArtifact(project(xpackModule('core'))))`
`5`	`5`	`javaRestTestImplementation project(xpackModule('async-search'))`
`6`	`6`	`javaRestTestImplementation project(':test:framework')`
	`7`	`+ javaRestTestImplementation project(":client:rest-high-level")`
`7`	`8`	`}`
`8`	`9`
`9`	`10`	`testClusters.configureEach {`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ archivesBaseName = 'x-pack'`
`13`	`13`
`14`	`14`	`dependencies {`
`15`	`15`	`testImplementation(testArtifact(project(xpackModule('core'))))`
	`16`	`+ testImplementation project(':test:framework')`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`// let the yamlRestTest see the classpath of test`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ dependencies {`
`33`	`33`	`compileOnly project(path: xpackModule('core'))`
`34`	`34`	`testImplementation(testArtifact(project(xpackModule('core'))))`
`35`	`35`	`testImplementation(testArtifact(project(xpackModule('monitoring'))))`
	`36`	`+ testImplementation(project(":modules:analysis-common"))`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`tasks.named("testingConventions").configure {`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ dependencies {`
`31`	`31`	`testImplementation project(path: ':plugins:transport-nio') // for http in RestEqlCancellationIT`
`32`	`32`
`33`	`33`	`testImplementation 'io.ous:jtoml:2.0.0'`
	`34`	`+`
	`35`	`+ internalClusterTestImplementation project(":client:rest-high-level")`
`34`	`36`	`}`
`35`	`37`
`36`	`38`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ dependencies {`
`6`	`6`	`api project(path: xpackModule('core'))`
`7`	`7`	`api(testArtifact(project(xpackModule('core'))))`
`8`	`8`	`api project(xpackModule('ql:test-fixtures'))`
`9`		`-`
	`9`	`+ implementation project(":client:rest-high-level")`
`10`	`10`	`// TOML parser for EqlActionIT tests`
`11`	`11`	`api 'io.ous:jtoml:2.0.0'`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ dependencies {`
`10`	`10`	`javaRestTestImplementation project(':test:framework')`
`11`	`11`	`javaRestTestImplementation(testArtifact(project(xpackModule('core'))))`
`12`	`12`	`javaRestTestImplementation project(xpackModule('ql:test-fixtures'))`
	`13`	`+ javaRestTestImplementation project(":client:rest-high-level")`
`13`	`14`	`javaRestTestImplementation 'io.ous:jtoml:2.0.0'`
`14`	`15`	`}`
`15`	`16`