aec9120994
Restore 0.8.x behavior where java driver is marked as detected when `java -version` exits with 0 but returns unexpected output. Furthermore, we restore behavior when `java -version` where we parse the first three lines of `java -version` but ignore rest. If `java -version` returns less than 3 lines, Nomad 0.8.7 would panic. In this implementation, we'd still mark java as detected but returns empty version. The 0.8.7 logic for detecting java version is found in https://github.com/hashicorp/nomad/blob/v0.8.7/client/driver/java.go#L132-L172 . I punt on revamping how we can be more resilient to java -version syntax, and aimed for preserving existing behavior instead.
51 lines
1.1 KiB
Go
51 lines
1.1 KiB
Go
package java
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"os/exec"
|
|
"regexp"
|
|
"strings"
|
|
)
|
|
|
|
var javaVersionCommand = []string{"java", "-version"}
|
|
|
|
func javaVersionInfo() (version, runtime, vm string, err error) {
|
|
var out bytes.Buffer
|
|
|
|
cmd := exec.Command(javaVersionCommand[0], javaVersionCommand[1:]...)
|
|
cmd.Stdout = &out
|
|
cmd.Stderr = &out
|
|
err = cmd.Run()
|
|
if err != nil {
|
|
err = fmt.Errorf("failed to check java version: %v", err)
|
|
return
|
|
}
|
|
|
|
version, runtime, vm = parseJavaVersionOutput(out.String())
|
|
return
|
|
}
|
|
|
|
func parseJavaVersionOutput(infoString string) (version, runtime, vm string) {
|
|
infoString = strings.TrimSpace(infoString)
|
|
|
|
lines := strings.Split(infoString, "\n")
|
|
if strings.Contains(lines[0], "Picked up _JAVA_OPTIONS") {
|
|
lines = lines[1:]
|
|
}
|
|
|
|
if len(lines) < 3 {
|
|
// unexpected output format, don't attempt to parse output for version
|
|
return "", "", ""
|
|
}
|
|
|
|
versionString := strings.TrimSpace(lines[0])
|
|
|
|
re := regexp.MustCompile(`version "([^"]*)"`)
|
|
if match := re.FindStringSubmatch(lines[0]); len(match) == 2 {
|
|
versionString = match[1]
|
|
}
|
|
|
|
return versionString, strings.TrimSpace(lines[1]), strings.TrimSpace(lines[2])
|
|
}
|