Skip to content

Improve macOS executable fallback for Homebrew paths #49721

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

Open
froggy-hyun wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Improve macOS executable fallback for Homebrew paths #49721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5f5d60
Improve macOS executable fallback for Homebrew paths
froggy-hyun Mar 24, 2026
749ed4b
Revert command/executable name extraction from macOS fallback changes
froggy-hyun Mar 25, 2026
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
28 changes: 19 additions & 9 deletions ...va/org/springframework/boot/buildpack/platform/docker/configuration/CredentialHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ class CredentialHelper {

private static final String USR_LOCAL_BIN = "/usr/local/bin/";

private static final String OPT_HOMEBREW_BIN = "/opt/homebrew/bin/";

private static final String[] MAC_OS_BIN_DIRECTORIES = { OPT_HOMEBREW_BIN, USR_LOCAL_BIN };

private static final Set<String> CREDENTIAL_NOT_FOUND_MESSAGES = Set.of("credentials not found in native keychain",
"no credentials server URL", "no credentials username");

Expand Down Expand Up @@ -92,16 +96,22 @@ private Process start(ProcessBuilder processBuilder) throws IOException {
if (!Platform.isMac()) {
throw ex;
}
try {
List<String> command = new ArrayList<>(processBuilder.command());
command.set(0, USR_LOCAL_BIN + command.get(0));
return processBuilder.command(command).start();
}
catch (Exception suppressed) {
// Suppresses the exception and rethrows the original exception
ex.addSuppressed(suppressed);
throw ex;
String executable = processBuilder.command().get(0);
for (String binDirectory : MAC_OS_BIN_DIRECTORIES) {
try {
List<String> command = new ArrayList<>(processBuilder.command());
if (executable.startsWith(binDirectory)) {
continue;
}
command.set(0, binDirectory + executable);
return processBuilder.command(command).start();
}
catch (Exception suppressed) {
// Suppresses the exception and rethrows the original exception
ex.addSuppressed(suppressed);
}
}
throw ex;
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...g/springframework/boot/buildpack/platform/docker/configuration/CredentialHelperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ void getWhenExecutableDoesNotExistErrorThrowsException() {
.satisfies((ex) -> {
if (Platform.isMac()) {
assertThat(ex.getMessage()).doesNotContain("/usr/local/bin/");
assertThat(ex.getSuppressed()).allSatisfy((suppressed) -> assertThat(suppressed)
assertThat(ex.getSuppressed()).anySatisfy((suppressed) -> assertThat(suppressed)
.hasMessageContaining("/opt/homebrew/bin/" + executable));
assertThat(ex.getSuppressed()).anySatisfy((suppressed) -> assertThat(suppressed)
.hasMessageContaining("/usr/local/bin/" + executable));
}
});
Expand Down
25 changes: 20 additions & 5 deletions ...ker-compose/src/main/java/org/springframework/boot/docker/compose/core/ProcessRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ class ProcessRunner {

private static final String USR_LOCAL_BIN = "/usr/local/bin";

private static final String OPT_HOMEBREW_BIN = "/opt/homebrew/bin";

private static final String[] MAC_OS_BIN_DIRECTORIES = { OPT_HOMEBREW_BIN, USR_LOCAL_BIN };

private static final boolean MAC_OS = System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("mac");

private static final Log logger = LogFactory.getLog(ProcessRunner.class);
Expand Down Expand Up @@ -108,11 +112,22 @@ private Process startProcess(String[] command) {
}
catch (IOException ex) {
String path = processBuilder.environment().get("PATH");
if (MAC_OS && path != null && !path.contains(USR_LOCAL_BIN)
&& !command[0].startsWith(USR_LOCAL_BIN + "/")) {
String[] localCommand = command.clone();
localCommand[0] = USR_LOCAL_BIN + "/" + localCommand[0];
return startProcess(localCommand);
if (MAC_OS && path != null) {
for (String binDirectory : MAC_OS_BIN_DIRECTORIES) {
if (path.contains(binDirectory) || command[0].startsWith(binDirectory + "/")) {
continue;
}
String[] localCommand = command.clone();
localCommand[0] = binDirectory + "/" + command[0];
ProcessBuilder localProcessBuilder = new ProcessBuilder(localCommand);
localProcessBuilder.directory(this.workingDirectory);
try {
return localProcessBuilder.start();
}
catch (IOException suppressed) {
ex.addSuppressed(suppressed);
}
}
}
throw new ProcessStartException(command, ex);
}
Expand Down
36 changes: 26 additions & 10 deletions ...a/org/springframework/boot/testsupport/process/DisabledIfProcessUnavailableCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ class DisabledIfProcessUnavailableCondition implements ExecutionCondition {

private static final String USR_LOCAL_BIN = "/usr/local/bin";

private static final String OPT_HOMEBREW_BIN = "/opt/homebrew/bin";

private static final String[] MAC_OS_BIN_DIRECTORIES = { OPT_HOMEBREW_BIN, USR_LOCAL_BIN };

private static final boolean MAC_OS = System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("mac");

@Override
Expand All @@ -68,23 +72,35 @@ private Stream<String[]> getAnnotationValue(AnnotatedElement testElement) {
private void check(String[] command) {
ProcessBuilder processBuilder = new ProcessBuilder(command);
try {
Process process = processBuilder.start();
Assert.state(process.waitFor(30, TimeUnit.SECONDS), "Process did not exit within 30 seconds");
Assert.state(process.exitValue() == 0, () -> "Process exited with %d".formatted(process.exitValue()));
process.destroy();
check(processBuilder);
}
catch (Exception ex) {
String path = processBuilder.environment().get("PATH");
if (MAC_OS && path != null && !path.contains(USR_LOCAL_BIN)
&& !command[0].startsWith(USR_LOCAL_BIN + "/")) {
String[] localCommand = command.clone();
localCommand[0] = USR_LOCAL_BIN + "/" + localCommand[0];
check(localCommand);
return;
if (MAC_OS && path != null) {
for (String binDirectory : MAC_OS_BIN_DIRECTORIES) {
if (path.contains(binDirectory) || command[0].startsWith(binDirectory + "/")) {
continue;
}
String[] localCommand = command.clone();
localCommand[0] = binDirectory + "/" + command[0];
try {
check(new ProcessBuilder(localCommand));
return;
}
catch (Exception ignored) {
}
}
}
throw new RuntimeException(
"Unable to start process '%s'".formatted(StringUtils.arrayToDelimitedString(command, " ")));
}
}

private void check(ProcessBuilder processBuilder) throws Exception {
Process process = processBuilder.start();
Assert.state(process.waitFor(30, TimeUnit.SECONDS), "Process did not exit within 30 seconds");
Assert.state(process.exitValue() == 0, () -> "Process exited with %d".formatted(process.exitValue()));
process.destroy();
}

}
Loading