cli: Add go version to version string

wader · Aug 20, 2024 · 550bcc2 · 550bcc2
1 parent 5766566
commit 550bcc2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/internal/script/script.go b/internal/script/script.go
@@ -118,8 +118,9 @@ func (cr *CaseRun) getEnvInt(name string) int {
 
 func (cr *CaseRun) Platform() interp.Platform {
 	return interp.Platform{
-		OS:   "testos",
-		Arch: "testarch",
+		OS:        "testos",
+		Arch:      "testarch",
+		GoVersion: "testgo_version",
 	}
 }
 

diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go
@@ -81,8 +81,9 @@ func newStandardOS() *stdOS {
 
 func (stdOS) Platform() interp.Platform {
 	return interp.Platform{
-		OS:   runtime.GOOS,
-		Arch: runtime.GOARCH,
+		OS:        runtime.GOOS,
+		Arch:      runtime.GOARCH,
+		GoVersion: runtime.Version(),
 	}
 }
 

diff --git a/pkg/interp/init.jq b/pkg/interp/init.jq
@@ -168,7 +168,7 @@ def _main:
           )
       )
     );
-  ( . as {$version, $os, $arch, $args, args: [$arg0]}
+  ( . as {$version, $os, $arch, $go_version, $args, args: [$arg0]}
   # make sure we don't unintentionally use . to make things clearer
   | null
   | ( try _args_parse($args[1:]; _opt_cli_opts)
@@ -203,7 +203,7 @@ def _main:
       | println
       )
     elif $opts.show_version then
-      "\($version) (\($os) \($arch))" | println
+      "\($version) (\($os) \($arch) \($go_version))" | println
     elif
       ( $opts.filenames == [null] and
         $opts.null_input == false and

diff --git a/pkg/interp/interp.go b/pkg/interp/interp.go
@@ -131,8 +131,9 @@ type Output interface {
 }
 
 type Platform struct {
-	OS   string
-	Arch string
+	OS        string
+	Arch      string
+	GoVersion string
 }
 
 type CompleteFn func(line string, pos int) (newLine []string, shared int)
@@ -380,10 +381,11 @@ func (i *Interp) Main(ctx context.Context, output Output, versionStr string) err
 
 	platform := i.OS.Platform()
 	input := map[string]any{
-		"args":    args,
-		"version": versionStr,
-		"os":      platform.OS,
-		"arch":    platform.Arch,
+		"args":       args,
+		"version":    versionStr,
+		"os":         platform.OS,
+		"arch":       platform.Arch,
+		"go_version": platform.GoVersion,
 	}
 
 	iter, err := i.EvalFunc(ctx, input, "_main", nil, EvalOpts{output: output})

diff --git a/pkg/interp/testdata/version.fqtest b/pkg/interp/testdata/version.fqtest
@@ -1,2 +1,2 @@
 $ fq -v
-testversion (testos testarch)
+testversion (testos testarch testgo_version)