Skip to content

[GR-63098] Warn when image name starts with dash. #11001

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
Apr 9, 2025
Merged

[GR-63098] Warn when image name starts with dash. #11001

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
12 changes: 11 additions & 1 deletion substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,9 @@ private int completeImageBuild() {
}

Optional<ArgumentEntry> lastImageName = getHostedOptionArgument(imageBuilderArgs, oHName);
if (!lastImageName.isEmpty()) {
validateImageName(lastImageName.get().value());
}

if (!jarOptionMode) {
mainClassModule = getHostedOptionArgumentValue(imageBuilderArgs, oHModule);
Expand Down Expand Up @@ -1333,7 +1336,7 @@ private int completeImageBuild() {
boolean extraNameIsLast = lastImageName.isEmpty() || lastImageName.get().index < extraImageName.index;
if (extraNameIsLast) {
/* extraImageArg that comes after lastImageName wins */
imageBuilderArgs.add(oH(SubstrateOptions.Name, "explicit image name") + extraImageName.value);
imageBuilderArgs.add(oH(SubstrateOptions.Name, "explicit image name") + validateImageName(extraImageName.value));
}
}
} else { /* jarOptionMode */
Expand Down Expand Up @@ -1455,6 +1458,13 @@ private int completeImageBuild() {
}
}

private static String validateImageName(String imageName) {
if (imageName.startsWith("-")) {
LogUtils.warning("Image name ('" + imageName + "') start with a dash. Is another option wrongly interpreted as image name? (see --help)");
}
return imageName;
}

private static void updateArgumentEntryValue(List<String> argList, ArgumentEntry listEntry, String newValue) {
APIOptionHandler.BuilderArgumentParts argParts = APIOptionHandler.BuilderArgumentParts.from(argList.get(listEntry.index));
argParts.optionValue = newValue;
Expand Down
Loading