Skip to content

Add goversion, goos, and goarch to version command #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 5, 2021
+23 −5
Merged

Add goversion, goos, and goarch to version command #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b81b78
add goversion, goos and goarch for build
Feb 16, 2021
c09af64
support for json flag
Feb 16, 2021
27d868b
fix based on https://github.com/hashicorp/terraform-ls/pull/407#pullr…
Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
-
name: Run tests
run: make test
-
-
name: Upload code coverage report
uses: codecov/codecov-action@v1
with:
Expand Down
26 changes: 22 additions & 4 deletions internal/cmd/version_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@ import (
"encoding/json"
"flag"
"fmt"
"runtime"
"strings"

"github.com/mitchellh/cli"
)

type VersionOutput struct {
Version string `json:"version"`

*BuildInfo
}

type VersionCommand struct {
Expand All @@ -20,6 +23,13 @@ type VersionCommand struct {
jsonOutput bool
}

type BuildInfo struct {
GoVersion string `json:"go,omitempty"`
GoOS string `json:"os,omitempty"`
GoArch string `json:"arch,omitempty"`
Compiler string `json:"compiler,omitempty"`
}

func (c *VersionCommand) flags() *flag.FlagSet {
fs := defaultFlagSet("version")

Expand All @@ -37,10 +47,17 @@ func (c *VersionCommand) Run(args []string) int {
return 1
}

output := VersionOutput{
Version: c.Version,
BuildInfo: &BuildInfo{
GoVersion: runtime.Version(),
GoOS: runtime.GOOS,
GoArch: runtime.GOARCH,
Compiler: runtime.Compiler,
},
}

if c.jsonOutput {
output := VersionOutput{
Version: c.Version,
}
jsonOutput, err := json.MarshalIndent(output, "", " ")
if err != nil {
c.Ui.Error(fmt.Sprintf("\nError marshalling JSON: %s", err))
Expand All @@ -50,7 +67,8 @@ func (c *VersionCommand) Run(args []string) int {
return 0
}

c.Ui.Output(string(c.Version))
ver := fmt.Sprintf("%s\nplatform: %s/%s\ngo: %s\ncompiler: %s", c.Version, output.GoOS, output.GoArch, output.GoVersion, output.Compiler)
c.Ui.Output(ver)
return 0
}

Expand Down