Skip to content

Avoid running resolve logic with no transport version name #135379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 25, 2025
Merged

Avoid running resolve logic with no transport version name #135379

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4018ae
Avoid running resolve logic with no transport version name
rjernst Sep 24, 2025
47cba50
remove dead branch
rjernst Sep 24, 2025
b4f6645
fix test
rjernst Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...rg/elasticsearch/gradle/internal/transport/ResolveTransportVersionConflictFuncTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,13 @@ class ResolveTransportVersionConflictFuncTest extends AbstractTransportVersionFu
assertUpperBound("9.1", "new_tv,8012002")
assertUpperBound("8.19", "new_tv,7123002")
}

def "no new transport version is idempotent"() {
when:
def result = runResolveAndValidateTask().build()

then:
assertResolveAndValidateSuccess(result)
assertUpperBound("9.2", "existing_92,8123000")
}
}
10 changes: 7 additions & 3 deletions ...a/org/elasticsearch/gradle/internal/transport/GenerateTransportVersionDefinitionTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ public void run() throws IOException {
List<String> changedDefinitionNames = resources.getChangedReferableDefinitionNames();
String targetDefinitionName = getTargetDefinitionName(resources, referencedNames, changedDefinitionNames);

List<TransportVersionUpperBound> upstreamUpperBounds = resources.getUpperBoundsFromUpstream();
Set<String> targetUpperBoundNames = getTargetUpperBoundNames(resources, upstreamUpperBounds, targetDefinitionName);

getLogger().lifecycle("Generating transport version name: " + targetDefinitionName);
if (targetDefinitionName.isEmpty()) {
// TODO: resetting upper bounds needs to be done locally, otherwise it pulls in some (incomplete) changes from upstream main
// resetAllUpperBounds(resources);
} else {
List<TransportVersionUpperBound> upstreamUpperBounds = resources.getUpperBoundsFromUpstream();
Set<String> targetUpperBoundNames = getTargetUpperBoundNames(resources, upstreamUpperBounds, targetDefinitionName);

List<TransportVersionId> ids = updateUpperBounds(resources, upstreamUpperBounds, targetUpperBoundNames, targetDefinitionName);
// (Re)write the definition file.
resources.writeDefinition(new TransportVersionDefinition(targetDefinitionName, ids, true));
Expand Down Expand Up @@ -199,6 +199,10 @@ private Set<String> getTargetUpperBoundNames(
throw new IllegalArgumentException("Cannot use --resolve-conflict with --backport-branches");
}

if (targetDefinitionName.isEmpty()) {

Copy link
Contributor

@bcully bcully Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing a return?

Copy link
Member Author

@rjernst rjernst Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, this was leftover, I deleted it now

}

return getUpperBoundNamesFromDefinition(resources, upstreamUpperBounds, targetDefinitionName);
}

Expand Down