split into separate task

Author: rjernst

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", "--next-version", "9.1.0").build()
+        def result = runGenerateAndValidateTask("--stack-version", "9.1.0").build()
 
         then:
         assertGenerateAndValidateSuccess(result)
@@ -62,7 +62,7 @@ class GenerateInitialTransportVersionFuncTest extends AbstractTransportVersionFu
         versionPropertiesFile.text = versionPropertiesFile.text.replace("9.2.0", "9.3.0")
 
         when:
-        def result = runGenerateAndValidateTask("--release-version", "9.2.0", "--next-version", "9.3.0").build()
+        def result = runGenerateAndValidateTask("--stack-version", "9.3.0").build()
 
         then:
         assertGenerateAndValidateSuccess(result)
@@ -73,7 +73,7 @@ class GenerateInitialTransportVersionFuncTest extends AbstractTransportVersionFu
 
     def "patch updates existing upper bound"() {
         when:
-        def result = runGenerateAndValidateTask("--release-version", "9.1.1", "--next-version", "9.1.2").build()
+        def result = runGenerateAndValidateTask("--stack-version", "9.1.2").build()
 
         then:
         assertGenerateAndValidateSuccess(result)
@@ -83,9 +83,9 @@ class GenerateInitialTransportVersionFuncTest extends AbstractTransportVersionFu
 
     def "cannot create upper bound file for patch"() {
         when:
-        def result = runGenerateTask("--release-version", "9.3.7", "--next-version", "9.3.7").buildAndFail()
+        def result = runGenerateTask("--stack-version", "9.3.7").buildAndFail()
 
         then:
-        assertGenerateFailure(result, "Missing upper bound 9.3 for release version 9.3.7")
+        assertGenerateFailure(result, "Missing upper bound 9.3 for release version 9.3.6")
     }
 }

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

@@ -11,69 +11,55 @@
 
 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 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();
+    @Option(option = "stack-version", description = "The Elasticsearch version to generate an initial transport version for")
+    public abstract Property<String> getStackVersion();
 
     @Input
     abstract Property<Version> getCurrentVersion();
 
     @TaskAction
     public void run() throws IOException {
-        Version releaseVersion = Version.fromString(getReleaseVersion().get());
-        Version nextVersion = Version.fromString(getNextVersion().get());
-        String baseUpperBoundName = getUpperBoundName(releaseVersion);
+        Version stackVersion = Version.fromString(getStackVersion().get());
+        String baseUpperBoundName = getUpperBoundName(stackVersion);
         TransportVersionResourcesService resources = getResourceService().get();
         TransportVersionUpperBound baseUpperBound = resources.getUpperBoundFromGitBase(baseUpperBoundName);
-        String initialDefinitionName = "initial_" + nextVersion;
+        String initialDefinitionName = "initial_" + stackVersion;
         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 " + baseUpperBoundName + " for release version " + releaseVersion);
+                throw new RuntimeException("Missing upper bound " + baseUpperBoundName + " for release version " + stackVersion);
             }
 
-            // 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 = nextVersion.getRevision() == 0 ? 1000 : 1;
+            int increment = stackVersion.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);
+            String upperBoundName = getUpperBoundName(stackVersion);
             var newUpperBound = new TransportVersionUpperBound(upperBoundName, initialDefinitionName, id);
             resources.writeUpperBound(newUpperBound);
 
-            if (nextVersion.getRevision() == 0) {
+            if (stackVersion.getRevision() == 0) {
                 Version currentVersion = getCurrentVersion().get();
                 String currentUpperBoundName = getUpperBoundName(currentVersion);
                 var currentUpperBound = new TransportVersionUpperBound(currentUpperBoundName, initialDefinitionName, id);
@@ -82,11 +68,6 @@ 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/TransportVersionResourcesPlugin.java

@@ -122,10 +122,17 @@ public void apply(Project project) {
                 t.setGroup(taskGroup);
                 t.setDescription("Generates an initial transport version for an Elasticsearch release version");
                 t.getCurrentVersion().set(currentVersion);
+            });
+        validateTask.configure(t -> t.mustRunAfter(generateInitialTask));
+
+        var updateTransportVersionsTask = project.getTasks()
+            .register("updateTransportVersions", UpdateTransportVersionsTask.class, t -> {
+                t.setGroup(taskGroup);
+                t.setDescription("Updates TransportVersions.csv with a new stack version entry");
                 t.getTransportVersionsFile()
                     .set(project.getLayout().getProjectDirectory().file("src/main/resources/org/elasticsearch/TransportVersions.csv"));
             });
-        validateTask.configure(t -> t.mustRunAfter(generateInitialTask));
+        validateTask.configure(t -> t.mustRunAfter(updateTransportVersionsTask));
     }
 
     private static String getResourceRoot(Project project) {