fix tests

Author: rjernst

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

@@ -62,13 +62,13 @@ class GenerateInitialTransportVersionFuncTest extends AbstractTransportVersionFu
         versionPropertiesFile.text = versionPropertiesFile.text.replace("9.2.0", "9.3.0")
 
         when:
-        def result = runGenerateAndValidateTask("--stack-version", "9.3.0").build()
+        def result = runGenerateAndValidateTask("--stack-version", "9.2.0").build()
 
         then:
         assertGenerateAndValidateSuccess(result)
-        assertUnreferableDefinition("initial_9.3.0", "8124000")
-        assertUpperBound("9.2", "existing_92,8123000")
-        assertUpperBound("9.3", "initial_9.3.0,8124000")
+        assertUnreferableDefinition("initial_9.2.0", "8124000")
+        assertUpperBound("9.2", "initial_9.2.0,8124000")
+        assertUpperBound("9.3", "initial_9.2.0,8124000")
     }
 
     def "patch updates existing upper bound"() {
@@ -86,6 +86,6 @@ class GenerateInitialTransportVersionFuncTest extends AbstractTransportVersionFu
         def result = runGenerateTask("--stack-version", "9.3.7").buildAndFail()
 
         then:
-        assertGenerateFailure(result, "Missing upper bound 9.3 for release version 9.3.6")
+        assertGenerateFailure(result, "Missing upper bound 9.3 for release version 9.3.7")
     }
 }

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

@@ -35,27 +35,24 @@ public abstract class GenerateInitialTransportVersionTask extends DefaultTask {
     @TaskAction
     public void run() throws IOException {
         Version stackVersion = Version.fromString(getStackVersion().get());
-        String baseUpperBoundName = getUpperBoundName(stackVersion);
+        String upperBoundName = getUpperBoundName(stackVersion);
         TransportVersionResourcesService resources = getResourceService().get();
-        TransportVersionUpperBound baseUpperBound = resources.getUpperBoundFromGitBase(baseUpperBoundName);
+        TransportVersionUpperBound baseUpperBound = resources.getUpperBoundFromGitBase(upperBoundName);
         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 " + stackVersion);
+                throw new RuntimeException("Missing upper bound " + upperBoundName + " for release version " + stackVersion);
             }
 
-            int currentTransportVersionId = baseUpperBound.definitionId().complete();
-
             // minors increment by 1000 to create a unique base, patches increment by 1 as other patches do
             int increment = stackVersion.getRevision() == 0 ? 1000 : 1;
-            var id = TransportVersionId.fromInt(currentTransportVersionId + increment);
+            var id = TransportVersionId.fromInt(baseUpperBound.definitionId().complete() + increment);
             var definition = new TransportVersionDefinition(initialDefinitionName, List.of(id), false);
             resources.writeDefinition(definition);
-            String upperBoundName = getUpperBoundName(stackVersion);
             var newUpperBound = new TransportVersionUpperBound(upperBoundName, initialDefinitionName, id);
             resources.writeUpperBound(newUpperBound);