Save transport version when generating new initial version

When a release is finalized, generateInitialTransportVersion creates a
new transport version definition for the next release. In the old
transport version system the setCompatibleVersions task would have been
called to update TransportVersions.csv with the previous id to save it
for lookups from id to release version.

This commit adjusts generateInitialTransportVersion to first save the
current id into TransportVersions.csv. To accomplish that it needs the
release version to map it to, and the current "release version" is
renamed to next version. Additionally, the setCompatibleVersions task no
longer does anything, so it is removed.

Author: rjernst

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

@@ -133,11 +133,16 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
         referableAndReferencedTransportVersion("older_92", "8122000")
         referableAndReferencedTransportVersion("existing_92", "8123000,8012001")
         unreferableTransportVersion("initial_9.0.0", "8000000")
+        unreferableTransportVersion("initial_9.1.0", "8011000")
         unreferableTransportVersion("initial_8.19.7", "7123001")
         transportVersionUpperBound("9.2", "existing_92", "8123000")
         transportVersionUpperBound("9.1", "existing_92", "8012001")
         transportVersionUpperBound("9.0", "initial_9.0.0", "8000000")
         transportVersionUpperBound("8.19", "initial_8.19.7", "7123001")
+        javaResource("myserver", "org/elasticsearch/TransportVersions.csv", """
+            9.0.0,8000000
+            9.1.0,8012001
+        """)
         // a mock version of TransportVersion, just here so we can compile Dummy.java et al
         javaSource("myserver", "org.elasticsearch", "TransportVersion", "", """
             public static TransportVersion fromName(String name) {

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

@@ -48,7 +48,7 @@ class GenerateInitialTransportVersionFuncTest extends AbstractTransportVersionFu
 
     def "setup is valid"() {
         when:
-        def result = runGenerateAndValidateTask("--release-version", "9.0.0").build()
+        def result = runGenerateAndValidateTask("--release-version", "9.0.0", "--next-version", "9.1.0").build()
 
         then:
         assertGenerateAndValidateSuccess(result)
@@ -62,20 +62,18 @@ class GenerateInitialTransportVersionFuncTest extends AbstractTransportVersionFu
         versionPropertiesFile.text = versionPropertiesFile.text.replace("9.2.0", "9.3.0")
 
         when:
-        System.out.println("Running generation initial task")
-        def result = runGenerateAndValidateTask("--release-version", "9.2.0").build()
-        System.out.println("Done running generation task")
+        def result = runGenerateAndValidateTask("--release-version", "9.2.0", "--next-version", "9.3.0").build()
 
         then:
         assertGenerateAndValidateSuccess(result)
-        assertUnreferableDefinition("initial_9.2.0", "8124000")
-        assertUpperBound("9.2", "initial_9.2.0,8124000")
-        assertUpperBound("9.3", "initial_9.2.0,8124000")
+        assertUnreferableDefinition("initial_9.3.0", "8124000")
+        assertUpperBound("9.2", "existing_92,8123000")
+        assertUpperBound("9.3", "initial_9.3.0,8124000")
     }
 
     def "patch updates existing upper bound"() {
         when:
-        def result = runGenerateAndValidateTask("--release-version", "9.1.2").build()
+        def result = runGenerateAndValidateTask("--release-version", "9.1.1", "--next-version", "9.1.2").build()
 
         then:
         assertGenerateAndValidateSuccess(result)
@@ -85,7 +83,7 @@ class GenerateInitialTransportVersionFuncTest extends AbstractTransportVersionFu
 
     def "cannot create upper bound file for patch"() {
         when:
-        def result = runGenerateTask("--release-version", "9.3.7").buildAndFail()
+        def result = runGenerateTask("--release-version", "9.3.7", "--next-version", "9.3.7").buildAndFail()
 
         then:
         assertGenerateFailure(result, "Missing upper bound 9.3 for release version 9.3.7")

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/AbstractVersionsTask.java

@@ -114,7 +114,6 @@ private static void replaceDefaultJavaParserClassCsm() {
 
     private static final Logger LOGGER = Logging.getLogger(AbstractVersionsTask.class);
 
-    static final String TRANSPORT_VERSION_TYPE = "TransportVersion";
     static final String INDEX_VERSION_TYPE = "IndexVersion";
 
     static final String SERVER_MODULE_PATH = "server/src/main/java/";
@@ -123,7 +122,6 @@ private static void replaceDefaultJavaParserClassCsm() {
     static final String INDEX_VERSIONS_FILE_PATH = SERVER_MODULE_PATH + "org/elasticsearch/index/IndexVersions.java";
 
     static final String SERVER_RESOURCES_PATH = "server/src/main/resources/";
-    static final String TRANSPORT_VERSIONS_RECORD = SERVER_RESOURCES_PATH + "org/elasticsearch/TransportVersions.csv";
     static final String INDEX_VERSIONS_RECORD = SERVER_RESOURCES_PATH + "org/elasticsearch/index/IndexVersions.csv";
 
     final Path rootDir;

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/ReleaseToolsPlugin.java

@@ -52,7 +52,6 @@ public void apply(Project project) {
 
         project.getTasks().register("extractCurrentVersions", ExtractCurrentVersionsTask.class);
         project.getTasks().register("tagVersions", TagVersionsTask.class);
-        project.getTasks().register("setCompatibleVersions", SetCompatibleVersionsTask.class, t -> t.setThisVersion(version));
         project.getTasks().register("updateBranchesJson", UpdateBranchesJsonTask.class);
 
         final Directory changeLogDirectory = projectDirectory.dir("docs/changelog");

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/SetCompatibleVersionsTask.java

@@ -66,7 +66,6 @@ public void executeTask() throws IOException {
 
         for (var v : versions.entrySet()) {
             Path recordFile = switch (v.getKey()) {
-                case TRANSPORT_VERSION_TYPE -> rootDir.resolve(TRANSPORT_VERSIONS_RECORD);
                 case INDEX_VERSION_TYPE -> rootDir.resolve(INDEX_VERSIONS_RECORD);
                 default -> throw new IllegalArgumentException("Unknown version type " + v.getKey());
             };
@@ -95,7 +94,7 @@ private static Map<String, Integer> expandV7Version(Map<String, Integer> tagVers
         Integer v7Version = tagVersions.get("Version");
         if (v7Version == null) return tagVersions;
 
-        return Map.of(TRANSPORT_VERSION_TYPE, v7Version, INDEX_VERSION_TYPE, v7Version);
+        return Map.of(INDEX_VERSION_TYPE, v7Version);
     }
 
     private static final Pattern VERSION_LINE = Pattern.compile("(\\d+\\.\\d+\\.\\d+),(\\d+)");

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/TagVersionsTask.java

@@ -11,52 +11,69 @@
 
 import org.elasticsearch.gradle.Version;
 import org.gradle.api.DefaultTask;
+import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.services.ServiceReference;
 import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.options.Option;
 
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.StandardOpenOption;
 import java.util.List;
 
 public abstract class GenerateInitialTransportVersionTask extends DefaultTask {
 
     @ServiceReference("transportVersionResources")
     abstract Property<TransportVersionResourcesService> getResourceService();
 
+    @InputFile
+    public abstract RegularFileProperty getTransportVersionsFile();
+
     @Input
-    @Option(option = "release-version", description = "The Elasticsearch release version this transport version will be associated with")
+    @Option(option = "release-version", description = "The current Elasticsearch version being released")
     public abstract Property<String> getReleaseVersion();
 
+    @Input
+    @Option(option = "next-version", description = "The next Elasticsearch release version this transport version will be associated with")
+    public abstract Property<String> getNextVersion();
+
     @Input
     abstract Property<Version> getCurrentVersion();
 
     @TaskAction
     public void run() throws IOException {
         Version releaseVersion = Version.fromString(getReleaseVersion().get());
-        String upperBoundName = getUpperBoundName(releaseVersion);
+        Version nextVersion = Version.fromString(getNextVersion().get());
+        String baseUpperBoundName = getUpperBoundName(releaseVersion);
         TransportVersionResourcesService resources = getResourceService().get();
-        TransportVersionUpperBound baseUpperBound = resources.getUpperBoundFromGitBase(upperBoundName);
-        String initialDefinitionName = "initial_" + releaseVersion;
+        TransportVersionUpperBound baseUpperBound = resources.getUpperBoundFromGitBase(baseUpperBoundName);
+        String initialDefinitionName = "initial_" + nextVersion;
         TransportVersionDefinition existingDefinition = resources.getUnreferableDefinitionFromGitBase(initialDefinitionName);
 
         // This task runs on main and release branches. In release branches we will generate the exact same
         // upper bound result because we always look at the base branch (ie upstream/main).
         if (existingDefinition == null) {
             if (baseUpperBound == null) {
-                throw new RuntimeException("Missing upper bound " + upperBoundName + " for release version " + releaseVersion);
+                throw new RuntimeException("Missing upper bound " + baseUpperBoundName + " for release version " + releaseVersion);
             }
 
+            // Record the current transport version for the release version before creating the new one
+            int currentTransportVersionId = baseUpperBound.definitionId().complete();
+            addTransportVersionRecord(releaseVersion, currentTransportVersionId);
+
             // minors increment by 1000 to create a unique base, patches increment by 1 as other patches do
-            int increment = releaseVersion.getRevision() == 0 ? 1000 : 1;
-            var id = TransportVersionId.fromInt(baseUpperBound.definitionId().complete() + increment);
+            int increment = nextVersion.getRevision() == 0 ? 1000 : 1;
+            var id = TransportVersionId.fromInt(currentTransportVersionId + increment);
             var definition = new TransportVersionDefinition(initialDefinitionName, List.of(id), false);
             resources.writeDefinition(definition);
+            String upperBoundName = getUpperBoundName(nextVersion);
             var newUpperBound = new TransportVersionUpperBound(upperBoundName, initialDefinitionName, id);
             resources.writeUpperBound(newUpperBound);
 
-            if (releaseVersion.getRevision() == 0) {
+            if (nextVersion.getRevision() == 0) {
                 Version currentVersion = getCurrentVersion().get();
                 String currentUpperBoundName = getUpperBoundName(currentVersion);
                 var currentUpperBound = new TransportVersionUpperBound(currentUpperBoundName, initialDefinitionName, id);
@@ -65,6 +82,11 @@ public void run() throws IOException {
         }
     }
 
+    private void addTransportVersionRecord(Version releaseVersion, int transportVersionId) throws IOException {
+        String newEntry = releaseVersion + "," + transportVersionId + "\n";
+        Files.writeString(getTransportVersionsFile().getAsFile().get().toPath(), newEntry, StandardOpenOption.APPEND);
+    }
+
     private String getUpperBoundName(Version version) {
         return version.getMajor() + "." + version.getMinor();
     }

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

@@ -120,8 +120,10 @@ public void apply(Project project) {
         var generateInitialTask = project.getTasks()
             .register("generateInitialTransportVersion", GenerateInitialTransportVersionTask.class, t -> {
                 t.setGroup(taskGroup);
-                t.setDescription("(Re)generates an initial transport version for an Elasticsearch release version");
+                t.setDescription("Generates an initial transport version for an Elasticsearch release version");
                 t.getCurrentVersion().set(currentVersion);
+                t.getTransportVersionsFile()
+                    .set(project.getLayout().getProjectDirectory().file("src/main/resources/org/elasticsearch/TransportVersions.csv"));
             });
         validateTask.configure(t -> t.mustRunAfter(generateInitialTask));
     }