Use versioned sourceset for REST compat testing

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/test/rest/YamlRestCompatTestPluginFuncTest.groovy

@@ -82,7 +82,8 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
         String wrongTest = "wrong_version.yml"
         String additionalTest = "additional_test.yml"
         setupRestResources([wrongApi], [wrongTest]) //setups up resources for current version, which should not be used for this test
-        addRestTestsToProject([additionalTest], "yamlRestCompatTest")
+        String sourceSetName = "yamlRestTestV" + compatibleVersion + "Compat"
+        addRestTestsToProject([additionalTest], sourceSetName)
         //intentionally adding to yamlRestTest source set since the .classes are copied from there
         file("src/yamlRestTest/java/MockIT.java") << "import org.junit.Test;class MockIT { @Test public void doNothing() { }}"
 
@@ -107,17 +108,17 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
         file("/build/${testIntermediateDir}/original/rest-api-spec/test/" + test).exists()
         file("/build/${testIntermediateDir}/transformed/rest-api-spec/test/" + test).exists()
         file("/build/${testIntermediateDir}/transformed/rest-api-spec/test/" + test).text.contains("headers") //transformation adds this
-        file("/build/resources/yamlRestCompatTest/rest-api-spec/test/" + additionalTest).exists()
+        file("/build/resources/${sourceSetName}/rest-api-spec/test/" + additionalTest).exists()
 
         //additionalTest is not copied from the prior version, and thus not in the intermediate directory, nor transformed
-        file("/build/resources/yamlRestCompatTest/" + testIntermediateDir + "/rest-api-spec/test/" + additionalTest).exists() == false
-        file("/build/resources/yamlRestCompatTest/rest-api-spec/test/" + additionalTest).text.contains("headers") == false
+        file("/build/resources/${sourceSetName}/" + testIntermediateDir + "/rest-api-spec/test/" + additionalTest).exists() == false
+        file("/build/resources/${sourceSetName}/rest-api-spec/test/" + additionalTest).text.contains("headers") == false
 
         file("/build/classes/java/yamlRestTest/MockIT.class").exists() //The "standard" runner is used to execute the compat test
 
-        file("/build/resources/yamlRestCompatTest/rest-api-spec/api/" + wrongApi).exists() == false
-        file("/build/resources/yamlRestCompatTest/" + testIntermediateDir + "/rest-api-spec/test/" + wrongTest).exists() == false
-        file("/build/resources/yamlRestCompatTest/rest-api-spec/test/" + wrongTest).exists() == false
+        file("/build/resources/${sourceSetName}/rest-api-spec/api/" + wrongApi).exists() == false
+        file("/build/resources/${sourceSetName}/" + testIntermediateDir + "/rest-api-spec/test/" + wrongTest).exists() == false
+        file("/build/resources/${sourceSetName}/rest-api-spec/test/" + wrongTest).exists() == false
 
         result.task(':copyRestApiSpecsTask').outcome == TaskOutcome.NO_SOURCE
         result.task(':copyYamlTestsTask').outcome == TaskOutcome.NO_SOURCE

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/rest/compat/YamlRestCompatTestPlugin.java

@@ -21,12 +21,14 @@
 import org.elasticsearch.gradle.internal.test.rest.InternalYamlRestTestPlugin;
 import org.elasticsearch.gradle.testclusters.TestClustersPlugin;
 import org.elasticsearch.gradle.util.GradleUtils;
+import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.file.Directory;
+import org.gradle.api.file.FileTree;
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.SourceSet;
@@ -35,7 +37,11 @@
 
 import java.io.File;
 import java.nio.file.Path;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.elasticsearch.gradle.internal.test.rest.RestTestUtil.setupTestDependenciesDefaults;
 
@@ -44,7 +50,6 @@
  */
 public class YamlRestCompatTestPlugin implements Plugin<Project> {
     private static final String REST_COMPAT_CHECK_TASK_NAME = "checkRestCompat";
-    private static final String SOURCE_SET_NAME = "yamlRestCompatTest";
     private static final Path RELATIVE_API_PATH = Path.of("rest-api-spec/api");
     private static final Path RELATIVE_TEST_PATH = Path.of("rest-api-spec/test");
     private static final Path RELATIVE_REST_API_RESOURCES = Path.of("rest-api-spec/src/main/resources");
@@ -55,6 +60,7 @@ public class YamlRestCompatTestPlugin implements Plugin<Project> {
     @Override
     public void apply(Project project) {
         final int compatibleVersion = Version.fromString(VersionProperties.getVersions().get("elasticsearch")).getMajor() - 1;
+        final String sourceSetName = "yamlRestTestV" + compatibleVersion + "Compat";
         final Path compatRestResourcesDir = Path.of("restResources").resolve("v" + compatibleVersion);
         final Path compatSpecsDir = compatRestResourcesDir.resolve("yamlSpecs");
         final Path compatTestsDir = compatRestResourcesDir.resolve("yamlTests");
@@ -69,9 +75,9 @@ public void apply(Project project) {
 
         // create source set
         SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
-        SourceSet yamlCompatTestSourceSet = sourceSets.create(SOURCE_SET_NAME);
+        SourceSet yamlCompatTestSourceSet = sourceSets.create(sourceSetName);
         SourceSet yamlTestSourceSet = sourceSets.getByName(InternalYamlRestTestPlugin.SOURCE_SET_NAME);
-        GradleUtils.extendSourceSet(project, InternalYamlRestTestPlugin.SOURCE_SET_NAME, SOURCE_SET_NAME);
+        GradleUtils.extendSourceSet(project, InternalYamlRestTestPlugin.SOURCE_SET_NAME, sourceSetName);
 
         // copy compatible rest specs
         Configuration bwcMinorConfig = project.getConfigurations().create(BWC_MINOR_CONFIG_NAME);
@@ -138,7 +144,7 @@ public void apply(Project project) {
                 task.onlyIf(t -> isEnabled(project));
             });
 
-      
+
         // transform the copied tests task
         TaskProvider<RestCompatTestTransformTask> transformCompatTestTask = project.getTasks()
             .register("yamlRestTestV"+ compatibleVersion + "CompatTransform", RestCompatTestTransformTask.class, task -> {
@@ -163,7 +169,7 @@ public void apply(Project project) {
             .flatMap(CopyRestTestsTask::getOutputResourceDir);
 
         String testTaskName = "yamlRestTestV"+ compatibleVersion + "CompatTest";
-  
+
         // setup the test task
         Provider<RestIntegTestTask> yamlRestCompatTestTask = RestTestUtil.registerTestTask(project, yamlCompatTestSourceSet, testTaskName);
         project.getTasks().withType(RestIntegTestTask.class).named(testTaskName).configure(testTask -> {
@@ -178,11 +184,33 @@ public void apply(Project project) {
                     .minus(project.files(originalYamlSpecsDir))
                     .minus(project.files(originalYamlTestsDir))
             );
+
+            // Ensure no duplicates YAML tests on classpath since tests are sourced from the prior major and the local source set
+            testTask.doFirst(new Action<>() {
+                @Override
+                public void execute(Task task) {
+                    FileTree yamlTests = project.getTasks().withType(RestIntegTestTask.class)
+                        .getByName(testTaskName).getClasspath().getAsFileTree().matching(f -> f.include("**/*.yml"));
+                    Set<Path> found = new HashSet<>();
+                    Set<Path> duplicates = yamlTests.getFiles().stream().map(file -> {
+                        Path p = file.toPath();
+                        int partCount = p.getNameCount();
+                        return p.subpath(partCount - 2, partCount);
+                    }).filter(p -> found.add(p) == false).collect(Collectors.toSet());
+                    if (duplicates.isEmpty() == false) {
+                        throw new IllegalStateException("Found duplicated test(s) ["
+                            + duplicates.stream().map(Path::toString).collect(Collectors.joining(", "))
+                            + "] please ensure there not any duplicate YAML test files between the [" + compatibleVersion
+                            + ".x] branch and the [" + sourceSetName + "] tests. ");
+                    }
+                }
+            });
             // run compatibility tests after "normal" tests
             testTask.mustRunAfter(project.getTasks().named(InternalYamlRestTestPlugin.SOURCE_SET_NAME));
             testTask.onlyIf(t -> isEnabled(project));
         });
 
+
         setupTestDependenciesDefaults(project, yamlCompatTestSourceSet);
 
         // setup IDE

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestApiTask.java

@@ -12,6 +12,7 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.ArchiveOperations;
 import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.file.DuplicatesStrategy;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.file.FileTree;
@@ -126,13 +127,15 @@ void copy() {
 
         getLogger().debug("Rest specs for project [{}] will be copied to the test resources.", projectPath);
         fileSystemOperations.copy(c -> {
+            c.setDuplicatesStrategy(DuplicatesStrategy.FAIL);
             c.from(configToFileTree.apply(config));
             c.into(restSpecOutputDir);
             c.include(patternSet.getIncludes());
         });
         // copy any additional config
         if (additionalConfig != null) {
             fileSystemOperations.copy(c -> {
+                c.setDuplicatesStrategy(DuplicatesStrategy.FAIL);
                 c.from(additionalConfigToFileTree.apply(additionalConfig));
                 c.into(restSpecOutputDir);
             });

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestTestsTask.java

@@ -10,6 +10,7 @@
 import org.apache.tools.ant.filters.ReplaceTokens;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.file.DuplicatesStrategy;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.file.FileTree;
@@ -136,6 +137,7 @@ void copy() {
         if (includeCore.get().isEmpty() == false) {
             getLogger().debug("Rest tests for project [{}] will be copied to the test resources.", projectPath);
             fileSystemOperations.copy(c -> {
+                c.setDuplicatesStrategy(DuplicatesStrategy.FAIL);
                 c.from(coreConfigToFileTree.apply(coreConfig));
                 c.into(restTestOutputDir);
                 c.include(corePatternSet.getIncludes());
@@ -148,6 +150,7 @@ void copy() {
         if (includeXpack.get().isEmpty() == false) {
             getLogger().debug("X-pack rest tests for project [{}] will be copied to the test resources.", projectPath);
             fileSystemOperations.copy(c -> {
+                c.setDuplicatesStrategy(DuplicatesStrategy.FAIL);
                 c.from(xpackConfigToFileTree.apply(xpackConfig));
                 c.into(restTestOutputDir);
                 c.include(xpackPatternSet.getIncludes());
@@ -159,6 +162,7 @@ void copy() {
         // copy any additional config
         if (additionalConfig != null) {
             fileSystemOperations.copy(c -> {
+                c.setDuplicatesStrategy(DuplicatesStrategy.FAIL);
                 c.from(additionalConfigToFileTree.apply(additionalConfig));
                 c.into(restTestOutputDir);
                 if (substitutions != null) {

x-pack/plugin/build.gradle

@@ -1,6 +1,7 @@
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.util.GradleUtils
 import org.elasticsearch.gradle.internal.test.RestIntegTestTask
+import org.elasticsearch.gradle.VersionProperties
 
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
 apply plugin: 'elasticsearch.yaml-rest-compat-test'
@@ -18,7 +19,8 @@ dependencies {
 
 // let the yamlRestTests see the classpath of test
 GradleUtils.extendSourceSet(project, "test", "yamlRestTest", tasks.named("yamlRestTest"))
-GradleUtils.extendSourceSet(project, "test", "yamlRestCompatTest")
+int compatVersion = VersionProperties.getElasticsearchVersion().getMajor() - 1;
+GradleUtils.extendSourceSet(project, "test", "yamlRestTestV${compatVersion}Compat")
 
 restResources {
   restApi {