Skip to content

Commit

Permalink
🐛 Populate errors for containerless validation flags (#396) (#397)
Browse files Browse the repository at this point in the history
Populate errors for containerless validation flags

Few missing requirements like Python was producing not helpful messages
(like `Failed to validate flags error 90009`). Added relevant error
messages based on debugging containerless kantra on Windows with Igor.

Signed-off-by: Marek Aufart <[email protected]>
Signed-off-by: Cherry Picker <[email protected]>
Co-authored-by: Marek Aufart <[email protected]>
  • Loading branch information
konveyor-ci-bot[bot] and aufi authored Dec 3, 2024
1 parent dd8958a commit 3383931
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cmd/analyze-bin.go
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

0 comments on commit 3383931

Please sign in to comment.