From b73a945c9f94caf1fcd1ee1a7e050cb57e6a302f Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 9 Sep 2025 20:34:52 -0700 Subject: [PATCH 1/2] Rename the transport version generate task to be shorter Most developers won't need to know what "definitions" are, they only care about generating a transport version. This commit renames the gradle task for generate to omit "definition" and simply be "generateTransportVersion". --- .../transport/AbstractTransportVersionFuncTest.groovy | 2 +- .../transport/TransportVersionGenerationFuncTest.groovy | 8 ++++---- .../transport/TransportVersionResourcesPlugin.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/AbstractTransportVersionFuncTest.groovy b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/AbstractTransportVersionFuncTest.groovy index f672d3fdf060e..0cba54ae713b5 100644 --- a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/AbstractTransportVersionFuncTest.groovy +++ b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/AbstractTransportVersionFuncTest.groovy @@ -122,7 +122,7 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest { apply plugin: 'elasticsearch.transport-version-references' apply plugin: 'elasticsearch.transport-version-resources' - tasks.named('generateTransportVersionDefinition') { + tasks.named('generateTransportVersion') { currentUpperBoundName = '9.2' } """ diff --git a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy index 21a8b6a95e105..dfca09b973de0 100644 --- a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy +++ b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy @@ -18,14 +18,14 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes def runGenerateAndValidateTask(String... additionalArgs) { List args = new ArrayList<>() args.add(":myserver:validateTransportVersionResources") - args.add(":myserver:generateTransportVersionDefinition") + args.add(":myserver:generateTransportVersion") args.addAll(additionalArgs); return gradleRunner(args.toArray()) } def runGenerateTask(String... additionalArgs) { List args = new ArrayList<>() - args.add(":myserver:generateTransportVersionDefinition") + args.add(":myserver:generateTransportVersion") args.addAll(additionalArgs); return gradleRunner(args.toArray()) } @@ -35,11 +35,11 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes } void assertGenerateSuccess(BuildResult result) { - assert result.task(":myserver:generateTransportVersionDefinition").outcome == TaskOutcome.SUCCESS + assert result.task(":myserver:generateTransportVersion").outcome == TaskOutcome.SUCCESS } void assertGenerateFailure(BuildResult result, String expectedOutput) { - assert result.task(":myserver:generateTransportVersionDefinition").outcome == TaskOutcome.FAILED + assert result.task(":myserver:generateTransportVersion").outcome == TaskOutcome.FAILED assertOutputContains(result.output, expectedOutput) } diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java index bca2dbaca2f66..4e20aaabbad90 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java @@ -80,7 +80,7 @@ public void apply(Project project) { }); var generateDefinitionsTask = project.getTasks() - .register("generateTransportVersionDefinition", GenerateTransportVersionDefinitionTask.class, t -> { + .register("generateTransportVersion", GenerateTransportVersionDefinitionTask.class, t -> { t.setGroup(taskGroup); t.setDescription("(Re)generates a transport version definition file"); t.getReferencesFiles().setFrom(tvReferencesConfig); From a19dc01a9f4d842d83f5452f745bb31584d81417 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 11 Sep 2025 13:00:30 -0700 Subject: [PATCH 2/2] fix test --- .../transport/TransportVersionGenerationFuncTest.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy index 53ac1e07f877b..a6a421e545557 100644 --- a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy +++ b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy @@ -449,7 +449,7 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes referencedTransportVersion("new_tv") file("myserver/alt_upper_bound.csv").text = "some_tv,8126000" file("myserver/build.gradle") << """ - tasks.named('generateTransportVersionDefinition') { + tasks.named('generateTransportVersion') { alternateUpperBoundFile = project.file("alt_upper_bound.csv") } tasks.named('validateTransportVersionResources') { @@ -470,7 +470,7 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes referencedTransportVersion("new_tv") file("myserver/alt_upper_bound.csv").text = "some_tv,8122100" file("myserver/build.gradle") << """ - tasks.named('generateTransportVersionDefinition') { + tasks.named('generateTransportVersion') { alternateUpperBoundFile = project.file("alt_upper_bound.csv") } tasks.named('validateTransportVersionResources') {