add GOROOT/api eval fallback logic to goenv

Author: ardnew

builder/env.go

@@ -56,7 +56,7 @@ func getGorootVersion(goroot string) (int, int, error) {
 	}
 
 	if !strings.HasPrefix(s, "go") {
-		return 0, 0, fmt.Errorf("%s: version does not start with 'go' prefix", errPrefix)
+		return 0, 0, fmt.Errorf("%s: [%s] version does not start with 'go' prefix", s, errPrefix)
 	}
 
 	parts := strings.Split(s[2:], ".")

goenv/version.go

@@ -20,34 +20,88 @@ var (
 	GitSha1 string
 )
 
+// parseGorootVersion returns the major and minor version for a given Go version
+// string of the form `goX.Y.Z`.
+// Returns (0, 0) if the version cannot be determined.
+func parseGorootVersion(version string) (int, int, error) {
+	var (
+		maj, min int
+		pch      string
+	)
+	n, err := fmt.Sscanf(version, "go%d.%d%s", &maj, &min, &pch)
+	if n == 2 && io.EOF == err {
+		// Means there were no trailing characters (i.e., not an alpha/beta)
+		err = nil
+	}
+	if nil != err {
+		return 0, 0, fmt.Errorf("failed to parse version: %s", err)
+	}
+	return maj, min, nil
+}
+
 // GetGorootVersion returns the major and minor version for a given GOROOT path.
-// If the goroot cannot be determined, (0, 0) is returned.
-func GetGorootVersion(goroot string) (major, minor int, err error) {
+// If the version cannot be determined, (0, 0) is returned.
+func GetGorootVersion(goroot string) (int, int, error) {
+	const errPrefix = "could not parse Go version"
 	s, err := GorootVersionString(goroot)
 	if err != nil {
 		return 0, 0, err
 	}
 
-	if s == "" || s[:2] != "go" {
-		return 0, 0, errors.New("could not parse Go version: version does not start with 'go' prefix")
+	if "" == s {
+		return 0, 0, fmt.Errorf("%s: version string is empty", errPrefix)
+	}
+
+	if strings.HasPrefix(s, "devel") {
+		maj, min, err := getGorootApiVersion(goroot)
+		if nil != err {
+			return 0, 0, fmt.Errorf("%s: invalid GOROOT API version: %s", errPrefix, err)
+		}
+		return maj, min, nil
+	}
+
+	if !strings.HasPrefix(s, "go") {
+		return 0, 0, fmt.Errorf("%s: version does not start with 'go' prefix", errPrefix)
 	}
 
 	parts := strings.Split(s[2:], ".")
 	if len(parts) < 2 {
-		return 0, 0, errors.New("could not parse Go version: version has less than two parts")
+		return 0, 0, fmt.Errorf("%s: version has less than two parts", errPrefix)
 	}
 
-	// Ignore the errors, we don't really handle errors here anyway.
-	var trailing string
-	n, err := fmt.Sscanf(s, "go%d.%d%s", &major, &minor, &trailing)
-	if n == 2 && err == io.EOF {
-		// Means there were no trailing characters (i.e., not an alpha/beta)
-		err = nil
+	return parseGorootVersion(s)
+}
+
+// getGorootApiVersion returns the major and minor version of the Go API files
+// defined for a given GOROOT path.
+// If the version cannot be determined, (0, 0) is returned.
+func getGorootApiVersion(goroot string) (int, int, error) {
+	info, err := ioutil.ReadDir(filepath.Join(goroot, "api"))
+	if nil != err {
+		return 0, 0, fmt.Errorf("could not read API feature directory: %s", err)
 	}
-	if err != nil {
-		return 0, 0, fmt.Errorf("failed to parse version: %s", err)
+	maj, min := -1, -1
+	for _, f := range info {
+		if !strings.HasPrefix(f.Name(), "go") || f.IsDir() {
+			continue
+		}
+		vers := strings.TrimSuffix(f.Name(), filepath.Ext(f.Name()))
+		part := strings.Split(vers[2:], ".")
+		if len(part) < 2 {
+			continue
+		}
+		vmaj, vmin, err := parseGorootVersion(vers)
+		if nil != err {
+			continue
+		}
+		if vmaj >= maj && vmin > min {
+			maj, min = vmaj, vmin
+		}
+	}
+	if maj < 0 || min < 0 {
+		return 0, 0, errors.New("no valid API feature files")
 	}
-	return
+	return maj, min, nil
 }
 
 // GorootVersionString returns the version string as reported by the Go