scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-03 03:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Print the revision, if known, separately from the version.

Browse Source 
Also, indicate whether the build is dynamic or not.
This commit is contained in:
Jeff Mitchell
2016-11-27 19:28:35 -05:00
parent 2b5fb353f3
commit c91a7c51a2
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
command/server.go
View File

@@ -466,10 +466,15 @@ func (c *ServerCommand) Run(args []string) int {
infoKeys = append(infoKeys, "version") infoKeys = append(infoKeys, "version")
verInfo := version.GetVersion() verInfo := version.GetVersion()
info["version"] = verInfo.FullVersionNumber() info["version"] = verInfo.FullVersionNumber(false)
if verInfo.Revision != "" { if verInfo.Revision != "" {
info["version_sha"] = strings.Trim(verInfo.Revision, "'") info["version sha"] = strings.Trim(verInfo.Revision, "'")
infoKeys = append(infoKeys, "version_sha") infoKeys = append(infoKeys, "version sha")
}
infoKeys = append(infoKeys, "cgo")
info["cgo"] = "disabled"
if version.CgoEnabled {
info["cgo"] = "enabled"
} }
// Server configuration output // Server configuration output

2
command/version.go
View File

@@ -16,7 +16,7 @@ func (c *VersionCommand) Help() string {
} }
func (c *VersionCommand) Run(_ []string) int { func (c *VersionCommand) Run(_ []string) int {
c.Ui.Output(c.VersionInfo.FullVersionNumber()) c.Ui.Output(c.VersionInfo.FullVersionNumber(true))
return 0 return 0
} }

7
version/cgo.go Normal file
View File

@@ -0,0 +1,7 @@
// +build cgo
package version
func init() {
CgoEnabled = true
}

10
version/version.go
View File

@@ -10,6 +10,9 @@ var (
GitCommit string GitCommit string
GitDescribe string GitDescribe string
// Whether cgo is enabled or not; set at build time
CgoEnabled bool
Version = "unknown" Version = "unknown"
VersionPrerelease = "unknown" VersionPrerelease = "unknown"
) )
@@ -52,7 +55,7 @@ func (c *VersionInfo) VersionNumber() string {
return version return version
} }
func (c *VersionInfo) FullVersionNumber() string { func (c *VersionInfo) FullVersionNumber(rev bool) string {
var versionString bytes.Buffer var versionString bytes.Buffer
if Version == "unknown" && VersionPrerelease == "unknown" { if Version == "unknown" && VersionPrerelease == "unknown" {
@@ -62,10 +65,9 @@ func (c *VersionInfo) FullVersionNumber() string {
fmt.Fprintf(&versionString, "Vault v%s", c.Version) fmt.Fprintf(&versionString, "Vault v%s", c.Version)
if c.VersionPrerelease != "" { if c.VersionPrerelease != "" {
fmt.Fprintf(&versionString, "-%s", c.VersionPrerelease) fmt.Fprintf(&versionString, "-%s", c.VersionPrerelease)
if c.Revision != "" {
fmt.Fprintf(&versionString, " (%s)", c.Revision)
} }
if rev && c.Revision != "" {
fmt.Fprintf(&versionString, " (%s)", c.Revision)
} }
return versionString.String() return versionString.String()