Skip to content

Commit 2cff008

Browse files
committed
Use path separator for git path in transport resources (#133228)
When looking up files from main in transport resources, the system dependent path is used. However, the beginning slash also needs to be system dependent.
1 parent 9c791ac commit 2cff008

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,18 +204,18 @@ class TransportVersionValidationFuncTest extends AbstractTransportVersionFuncTes
204204
unreferencedTransportVersion("initial_10.0.0", "10000000")
205205
latestTransportVersion("10.0", "initial_10.0.0", "10000000")
206206
when:
207-
def result = gradleRunner(":myserver:validateTransportVersionDefinitions").build()
207+
def result = gradleRunner(":myserver:validateTransportVersionResources").build()
208208
then:
209-
result.task(":myserver:validateTransportVersionDefinitions").outcome == TaskOutcome.SUCCESS
209+
result.task(":myserver:validateTransportVersionResources").outcome == TaskOutcome.SUCCESS
210210
}
211211

212212
def "named and unreferenced definitions cannot have the same name"() {
213213
given:
214214
unreferencedTransportVersion("existing_92", "10000000")
215215
when:
216-
def result = validateDefinitionsFails()
216+
def result = validateResourcesFails()
217217
then:
218-
assertDefinitionsFailure(result, "Transport version definition file " +
218+
assertValidateResourcesFailure(result, "Transport version definition file " +
219219
"[myserver/src/main/resources/transport/definitions/named/existing_92.csv] " +
220220
"has same name as unreferenced definition " +
221221
"[myserver/src/main/resources/transport/definitions/unreferenced/existing_92.csv]")
@@ -225,8 +225,8 @@ class TransportVersionValidationFuncTest extends AbstractTransportVersionFuncTes
225225
given:
226226
unreferencedTransportVersion("initial_10.0.1", "10000001")
227227
when:
228-
def result = gradleRunner(":myserver:validateTransportVersionDefinitions").build()
228+
def result = gradleRunner(":myserver:validateTransportVersionResources").build()
229229
then:
230-
result.task(":myserver:validateTransportVersionDefinitions").outcome == TaskOutcome.SUCCESS
230+
result.task(":myserver:validateTransportVersionResources").outcome == TaskOutcome.SUCCESS
231231
}
232232
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.gradle.process.ExecResult;
1717

1818
import java.io.ByteArrayOutputStream;
19+
import java.io.File;
1920
import java.io.IOException;
2021
import java.nio.charset.StandardCharsets;
2122
import java.nio.file.Files;
@@ -199,7 +200,8 @@ private <T> T getMainFile(String resourcePath, BiFunction<String, String, T> par
199200
if (getMainResources().contains(resourcePath) == false) {
200201
return null;
201202
}
202-
String content = gitCommand("show", "main:./" + resourcePath).strip();
203+
204+
String content = gitCommand("show", "main:." + File.separator + resourcePath).strip();
203205
return parser.apply(resourcePath, content);
204206
}
205207

0 commit comments

Comments
 (0)