mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-06 04:46:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1836 from hashicorp/truncate-version-string

Browse Source 
Remove the string 'Vault' from version information
This commit is contained in:
Vishal Nayak 2016-09-01 20:23:26 -04:00 committed by GitHub
commit 30e199cccf
8 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/server.go
View File

@ -440,7 +440,7 @@ func (c *ServerCommand) Run(args []string) int {
}()
infoKeys = append(infoKeys, "version")
info["version"] = version.GetVersion().String()
info["version"] = version.GetVersion().FullVersionNumber()
// Server configuration output
padding := 24

2
command/server/listener_atlas.go
View File

@ -29,7 +29,7 @@ func (s *SCADAListener) Addr() net.Addr {
func atlasListenerFactory(config map[string]string, logger io.Writer) (net.Listener, map[string]string, ReloadFunc, error) {
scadaConfig := &scada.Config{
Service: "vault",
Version: version.GetVersion().Version,
Version: version.GetVersion().VersionNumber(),
ResourceType: "vault-cluster",
Meta: map[string]string{
"node_id": config["node_id"],

2
command/version.go
View File

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

2
http/sys_health.go
View File

@ -140,7 +140,7 @@ func getSysHealth(core *vault.Core, r *http.Request) (int, *HealthResponse, erro
Sealed: sealed,
Standby: standby,
ServerTimeUTC: time.Now().UTC().Unix(),
Version: version.GetVersion().String(),
Version: version.GetVersion().VersionNumber(),
ClusterName: clusterName,
ClusterID: clusterID,
}

2
http/sys_seal.go
View File

@ -186,7 +186,7 @@ func handleSysSealStatusRaw(core *vault.Core, w http.ResponseWriter, r *http.Req
T: sealConfig.SecretThreshold,
N: sealConfig.SecretShares,
Progress: core.SecretProgress(),
Version: version.GetVersion().String(),
Version: version.GetVersion().VersionNumber(),
ClusterName: clusterName,
ClusterID: clusterID,
})

19
version/version.go
View File

@ -38,12 +38,27 @@ func GetVersion() *VersionInfo {
}
}
func (c *VersionInfo) String() string {
func (c *VersionInfo) VersionNumber() string {
if Version == "unknown" && VersionPrerelease == "unknown" {
return "(version unknown)"
}
version := fmt.Sprintf("%s", c.Version)
if c.VersionPrerelease != "" {
version = fmt.Sprintf("%s-%s", version, c.VersionPrerelease)
}
return version
}
func (c *VersionInfo) FullVersionNumber() string {
var versionString bytes.Buffer
if Version == "unknown" && VersionPrerelease == "unknown" {
fmt.Fprintf(&versionString, "Vault (version unknown)")
return "Vault (version unknown)"
}
fmt.Fprintf(&versionString, "Vault v%s", c.Version)
if c.VersionPrerelease != "" {
fmt.Fprintf(&versionString, "-%s", c.VersionPrerelease)

2
website/source/docs/http/sys-health.html.md
View File

@ -63,7 +63,7 @@ description: |-
{
"cluster_id": "c9abceea-4f46-4dab-a688-5ce55f89e228",
"cluster_name": "vault-cluster-5515c810",
"version": "Vault v0.6.1-dev ('f76c926b0a36e55e71190eb3e2da312f29aca54e+CHANGES')",
"version": "0.6.1-dev"
"server_time_utc": 1469555798,
"standby": false,
"sealed": false,

6
website/source/docs/http/sys-seal-status.html.md
View File

@ -32,11 +32,11 @@ description: |-
"t": 3,
"n": 5,
"progress": 2,
"version": "Vault v0.6.1"
"version": "0.6.1-dev"
}
```
Sample response when the unseal finishes.
Sample response when Vault is unsealed.
```javascript
{
@ -44,7 +44,7 @@ description: |-
"t": 3,
"n": 5,
"progress": 0,
"version": "Vault v0.6.1",
"version": "0.6.1-dev",
"cluster_name": "vault-cluster-d6ec3c7f",
"cluster_id": "3e8b3fec-3749-e056-ba41-b62a63b997e8"
}