Skip to content

Allow overriding upstream ref in transport version build logic #135113

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 1 commit into from
Sep 22, 2025
Merged

Allow overriding upstream ref in transport version build logic #135113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ...roovy/org/elasticsearch/gradle/internal/transport/AbstractTransportVersionFuncTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
include ':myserver'
include ':myplugin'
"""
propertiesFile << """
org.elasticsearch.transports.upstreamRef=main
"""
versionPropertiesFile.text = versionPropertiesFile.text.replace("9.1.0", "9.2.0")

file("myserver/build.gradle") << """
Expand Down
4 changes: 4 additions & 0 deletions ...ain/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ public void apply(Project project) {
Directory transportResources = project.getLayout().getProjectDirectory().dir("src/main/resources/" + resourceRoot);
spec.getParameters().getTransportResourcesDirectory().set(transportResources);
spec.getParameters().getRootDirectory().set(project.getLayout().getSettingsDirectory().getAsFile());
Object upstreamRef = project.findProperty("org.elasticsearch.transport.upstreamRef");
Copy link
Contributor

Choose a reason for hiding this comment

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

@breskeby is using project.getProviders().gradleProperty() preferable wrt to configuration caching or any of that?

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah I think we should use project.getProviders().gradleProperty() here indeed.

if (upstreamRef != null) {
spec.getParameters().getUpstreamRefOverride().set(upstreamRef.toString());
}
});

var depsHandler = project.getDependencies();
Expand Down
8 changes: 8 additions & 0 deletions ...in/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
import org.gradle.api.file.DirectoryProperty;
import org.gradle.api.logging.Logger;
import org.gradle.api.logging.Logging;
import org.gradle.api.provider.Property;
import org.gradle.api.services.BuildService;
import org.gradle.api.services.BuildServiceParameters;
import org.gradle.api.tasks.Optional;
import org.gradle.process.ExecOperations;
import org.gradle.process.ExecResult;

Expand Down Expand Up @@ -59,6 +61,9 @@ public interface Parameters extends BuildServiceParameters {
DirectoryProperty getTransportResourcesDirectory();

DirectoryProperty getRootDirectory();

@Optional
Property<String> getUpstreamRefOverride();
}

@Inject
Expand All @@ -79,6 +84,9 @@ public interface Parameters extends BuildServiceParameters {
public TransportVersionResourcesService(Parameters params) {
this.transportResourcesDir = params.getTransportResourcesDirectory().get().getAsFile().toPath();
this.rootDir = params.getRootDirectory().get().getAsFile().toPath();
if (params.getUpstreamRefOverride().isPresent()) {
upstreamRefName.set(params.getUpstreamRefOverride().get());
}
}

/**
Expand Down