iter

Author: JVerwolf

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy

@@ -9,8 +9,12 @@
 
 package org.elasticsearch.gradle.internal.transport
 
+import org.elasticsearch.gradle.util.Pair
+import org.gradle.internal.impldep.com.google.common.collect.Streams
 import org.gradle.testkit.runner.TaskOutcome
 
+import java.util.stream.Stream
+
 class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTest {
     def "test setup works"() {
         when:
@@ -19,6 +23,40 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
         result.task(":myserver:generateTransportVersionDefinition").outcome == TaskOutcome.SUCCESS
     }
 
+    def "A definition should be generated for an undefined reference"() {
+        given:
+        String tvName = "potato_tv"
+        when:
+        def result = gradleRunner("generateTransportVersionDefinition", "--name=" + tvName, "--increment=1").build()
+        then:
+        result.task(":myserver:generateTransportVersionDefinition").outcome == TaskOutcome.SUCCESS
+        validateDefinitionFile(tvName, List.of("9.2"))
+    }
+
+    void validateDefinitionFile(String name, List<String> branches) { // TODO add primary increment
+        String filename = "myserver/src/main/resources/transport/definitions/named/" + name + ".csv"
+        assert file(filename).exists()
+
+        String contents = file(filename).text
+        assert contents.strip().isEmpty() == false
+        String[] x = contents.strip().split(",")
+        Stream<Integer> ids = Arrays.stream(x).map(Integer::valueOf)
+        assert branches.size() == ids.count(): "The definition file does not have the correct number of ids"
+
+        def latestInfo = branches.stream()
+                .map { file("myserver/src/main/resources/transport/latest/${it}.csv").text }
+                .map { contents.strip().split(",") }
+                .map { Pair<String, Integer>.of(it.first(), Integer.valueOf(it.last())) }
+
+        Streams.zip(ids, latestInfo, { (id, latest) -> Pair.of(id, latest) })
+                .forEach {
+                    (id, Pair latest) -> {
+                        assert name == latest.left(): "The latest file should contain the same name as the new transport version"
+                        assert id == latest.right(): "The latest file should contain the same id as the new transport version"
+                    }
+                }
+    }
+
     /*
     TODO: Add tests that check that:
         - TVs added ontop of main in git, but are no longer referenced, are deleted

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/GenerateTransportVersionDefinitionTask.java

@@ -216,7 +216,7 @@ private List<String> getChangedDefinitionNames() throws IOException {
         String namedDefinitionsBasePath = TransportVersionUtils.getResourcePath(getResourcesProjectDir().get(), "definitions/named/");
         for (String changedResource : getChangedResources(namedDefinitionsBasePath)) {
             String definitionName = changedResource.substring(
-                changedResource.lastIndexOf(File.pathSeparator) + 1,
+                changedResource.lastIndexOf(File.separator) + 1,
                 changedResource.length() - 4 /* .csv */
             );
             changedDefinitionNames.add(definitionName);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionReference.java

@@ -26,7 +26,7 @@ record TransportVersionReference(String name, String location) {
     private static final Attribute<Boolean> REFERENCES_ATTRIBUTE = Attribute.of("transport-version-references", Boolean.class);
 
     static List<TransportVersionReference> listFromFile(Path file) throws IOException {
-        assert file.endsWith(".csv");
+        assert file.toString().endsWith(".csv") : file + " does not end in .csv";
         List<TransportVersionReference> results = new ArrayList<>();
         for (String line : Files.readAllLines(file, StandardCharsets.UTF_8)) {
             String[] parts = line.split(",", 2);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionReferencesPlugin.java

@@ -32,7 +32,7 @@ public void apply(Project project) {
                 t.setDescription("Collects all TransportVersion references used throughout the project");
                 SourceSet mainSourceSet = GradleUtils.getJavaSourceSets(project).findByName(SourceSet.MAIN_SOURCE_SET_NAME);
                 t.getClassPath().setFrom(mainSourceSet.getOutput());
-                t.getOutputFile().set(project.getLayout().getBuildDirectory().file("transport-version/references.txt"));
+                t.getOutputFile().set(project.getLayout().getBuildDirectory().file("transport-version/references.csv"));
             });
 
         Configuration tvReferencesConfig = project.getConfigurations().create("transportVersionReferences", c -> {