Skip to content
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

🐛 Populate errors for containerless validation flags #396

Merged
merged 1 commit into from
Dec 2, 2024
Merged

🐛 Populate errors for containerless validation flags #396

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
8 changes: 4 additions & 4 deletions cmd/analyze-bin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,14 +232,14 @@ func (a *analyzeCommand) ValidateContainerless(ctx context.Context) error {
cmd := exec.Command("python", "--version")
output, err := cmd.Output()
if err != nil {
return err
return fmt.Errorf("%w cannot execute required command python; ensure python is installed", err)
}
version := strings.TrimSpace(string(output))
pythonVersionStr := strings.Split(version, " ")
versionStr := strings.Split(pythonVersionStr[1], ".")
versionInt, err := strconv.Atoi(versionStr[0])
if err != nil {
return err
return fmt.Errorf("%w cannot parse python version", err)
}
if versionInt < 3 {
return fmt.Errorf("%w cannot find requirement python3; ensure python3 is installed", err)
Expand All @@ -259,15 +259,15 @@ func (a *analyzeCommand) ValidateContainerless(ctx context.Context) error {
cmd := exec.Command("java", "-version")
output, err := cmd.CombinedOutput()
if err != nil {
return err
return fmt.Errorf("%w cannot execute required command java; ensure java is installed", err)
}
if strings.Contains(string(output), "openjdk") {
re := regexp.MustCompile(`openjdk version "(.*?)"`)
match := re.FindStringSubmatch(string(output))
jdkVersionStr := strings.Split(match[1], ".")
jdkVersionInt, err := strconv.Atoi(jdkVersionStr[0])
if err != nil {
return err
return fmt.Errorf("%w cannot parse java version", err)
}
if jdkVersionInt < 17 {
return fmt.Errorf("cannot find requirement openjdk17+; ensure openjdk17+ is installed")
Expand Down