Make k6 get it version entirely from the build info (#5079)

Try to more accurately asses the version of k6 also in cases where it is build with xk6.

This should remove the need to bump the constant with the version.

Author: mstoykov

internal/cmd/version.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
+
 	"go.k6.io/k6/cmd/state"
 	"go.k6.io/k6/ext"
 	"go.k6.io/k6/internal/build"
@@ -16,6 +17,7 @@ import (
 const (
 	commitKey      = "commit"
 	commitDirtyKey = "commit_dirty"
+	mainK6Path     = "go.k6.io/k6"
 )
 
 // fullVersion returns the maximally full version and build information for
@@ -44,13 +46,13 @@ func fullVersion() string {
 }
 
 // versionDetails returns the structured details about version
-func versionDetails() map[string]interface{} {
+func versionDetails() map[string]any {
 	v := build.Version
 	if !strings.HasPrefix(v, "v") {
 		v = "v" + v
 	}
 
-	details := map[string]interface{}{
+	details := map[string]any{
 		"version":    v,
 		"go_version": runtime.Version(),
 		"go_os":      runtime.GOOS,
@@ -62,35 +64,33 @@ func versionDetails() map[string]interface{} {
 		return details
 	}
 
-	var (
-		commit string
-		dirty  bool
-	)
-	for _, s := range buildInfo.Settings {
-		switch s.Key {
-		case "vcs.revision":
-			commitLen := 10
-			if len(s.Value) < commitLen {
-				commitLen = len(s.Value)
+	if buildInfo.Main.Path == mainK6Path {
+		details["version"] = buildInfo.Main.Version
+		if buildInfo.Main.Version == "(devel)" {
+			details["version"] = v
+			details[commitKey] = "devel"
+		}
+		for _, s := range buildInfo.Settings {
+			switch s.Key {
+			case "vcs.revision":
+				commitLen := min(len(s.Value), 10)
+				details[commitKey] = s.Value[:commitLen]
+			case "vcs.modified":
+				if s.Value == "true" {
+					details[commitDirtyKey] = true
+				}
+			default:
 			}
-			commit = s.Value[:commitLen]
-		case "vcs.modified":
-			if s.Value == "true" {
-				dirty = true
+		}
+	} else {
+		for _, dep := range buildInfo.Deps {
+			if dep.Path == mainK6Path {
+				details["version"] = dep.Version
+				break
 			}
-		default:
 		}
 	}
 
-	if commit == "" {
-		return details
-	}
-
-	details[commitKey] = commit
-	if dirty {
-		details[commitDirtyKey] = true
-	}
-
 	return details
 }
 

internal/cmd/version_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"go.k6.io/k6/internal/build"
 	"go.k6.io/k6/internal/cmd/tests"
 )
@@ -79,4 +80,5 @@ func TestVersionJSONSubCommand(t *testing.T) {
 	assert.Equal(t, runtime.Version(), details["go_version"])
 	assert.Equal(t, runtime.GOOS, details["go_os"])
 	assert.Equal(t, runtime.GOARCH, details["go_arch"])
+	assert.Equal(t, "devel", details[commitKey])
 }