Skip to content

Commit 1d2d52e

Browse files
authored
Allow ignoring go list errors (#577)
1 parent fdf5320 commit 1d2d52e

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

build-info-extractor-go/src/main/java/org/jfrog/build/extractor/go/GoDriver.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,11 @@ public void modTidy(boolean prompt) throws IOException {
8383
runCmd(GO_MOD_TIDY_CMD, prompt);
8484
}
8585

86-
public CommandResults getUsedModules(boolean prompt) throws IOException {
86+
public CommandResults getUsedModules(boolean prompt, boolean ignoreErrors) throws IOException {
8787
List<String> argsList = new ArrayList<>(GO_LIST_USED_MODULES_CMD);
88+
if (ignoreErrors) {
89+
argsList.add(1, "-e");
90+
}
8891
return runCmd(argsList, prompt);
8992
}
9093

build-info-extractor-go/src/test/java/org/jfrog/build/extractor/go/GoDriverTest.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,20 @@ public void testListUsedModules() throws IOException {
3535
FileUtils.copyDirectory(PROJECT_ORIGIN.toFile(), projectDir);
3636
GoDriver driver = new GoDriver(null, System.getenv(), projectDir, new NullLog());
3737
driver.modTidy(false);
38-
CommandResults results = driver.getUsedModules(false);
38+
39+
// Run "go list -f {{with .Module}}{{.Path}} {{.Version}}{{end}} all"
40+
CommandResults results = driver.getUsedModules(false, false);
3941
Set<String> actualUsedModules = Arrays.stream(results.getRes().split("\\r?\\n"))
4042
.map(String::trim)
4143
.collect(Collectors.toSet());
4244
assertEquals(actualUsedModules, EXPECTED_USED_MODULES);
45+
46+
// Run "go list -e -f {{with .Module}}{{.Path}} {{.Version}}{{end}} all"
47+
results = driver.getUsedModules(false, true);
48+
actualUsedModules = Arrays.stream(results.getRes().split("\\r?\\n"))
49+
.map(String::trim)
50+
.collect(Collectors.toSet());
51+
assertEquals(actualUsedModules, EXPECTED_USED_MODULES);
4352
} finally {
4453
FileUtils.deleteDirectory(projectDir);
4554
}

0 commit comments

Comments
 (0)