luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Adds version info back into the config. 

In #2191 I accedentally broke SCADA by not populating the agent's version
information into the config structure. This adds it back, and makes the
distinction between the raw parts we send to APIs and the human form of
the version that we display.
This commit is contained in:
James Phillips 2016-07-19 18:38:15 -07:00
parent 33e9f42329
commit 9816c995bd
4 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
command/agent/command.go
View File

@ -38,7 +38,10 @@ var validDatacenter = regexp.MustCompile("^[a-zA-Z0-9_-]+$")
// ShutdownCh. If two messages are sent on the ShutdownCh it will forcibly // ShutdownCh. If two messages are sent on the ShutdownCh it will forcibly
// exit. // exit.
type Command struct { type Command struct {
Revision string
Version string Version string
VersionPrerelease string
HumanVersion string
Ui cli.Ui Ui cli.Ui
ShutdownCh <-chan struct{} ShutdownCh <-chan struct{}
args []string args []string
@ -309,6 +312,11 @@ func (c *Command) readConfig() *Config {
c.Ui.Error("WARNING: Bootstrap mode enabled! Do not enable unless necessary") c.Ui.Error("WARNING: Bootstrap mode enabled! Do not enable unless necessary")
} }
// Set the version info
config.Revision = c.Revision
config.Version = c.Version
config.VersionPrerelease = c.VersionPrerelease
return config return config
} }

4
command/version.go
View File

@ -8,7 +8,7 @@ import (
// VersionCommand is a Command implementation prints the version. // VersionCommand is a Command implementation prints the version.
type VersionCommand struct { type VersionCommand struct {
Version string HumanVersion string
Ui cli.Ui Ui cli.Ui
} }
@ -17,7 +17,7 @@ func (c *VersionCommand) Help() string {
} }
func (c *VersionCommand) Run(_ []string) int { func (c *VersionCommand) Run(_ []string) int {
c.Ui.Output(fmt.Sprintf("Consul Version: %s", c.Version)) c.Ui.Output(fmt.Sprintf("Consul Version: %s", c.HumanVersion))
c.Ui.Output(fmt.Sprintf("Supported Protocol Version(s): %d to %d", c.Ui.Output(fmt.Sprintf("Supported Protocol Version(s): %d to %d",
consul.ProtocolVersionMin, consul.ProtocolVersionMax)) consul.ProtocolVersionMin, consul.ProtocolVersionMax))
return 0 return 0

7
commands.go
View File

@ -19,7 +19,10 @@ func init() {
Commands = map[string]cli.CommandFactory{ Commands = map[string]cli.CommandFactory{
"agent": func() (cli.Command, error) { "agent": func() (cli.Command, error) {
return &agent.Command{ return &agent.Command{
Version: GetVersion(), Revision: GitCommit,
Version: Version,
VersionPrerelease: VersionPrerelease,
HumanVersion: GetHumanVersion(),
Ui: ui, Ui: ui,
ShutdownCh: make(chan struct{}), ShutdownCh: make(chan struct{}),
}, nil }, nil
@ -120,7 +123,7 @@ func init() {
"version": func() (cli.Command, error) { "version": func() (cli.Command, error) {
return &command.VersionCommand{ return &command.VersionCommand{
Version: GetVersion(), HumanVersion: GetHumanVersion(),
Ui: ui, Ui: ui,
}, nil }, nil
}, },

5
version.go
View File

@ -19,8 +19,9 @@ const Version = "0.7.0"
// such as "dev" (in development), "beta", "rc1", etc. // such as "dev" (in development), "beta", "rc1", etc.
const VersionPrerelease = "dev" const VersionPrerelease = "dev"
// GetVersion returns the full version of Consul. // GetHumanVersion composes the parts of the version in a way that's suitable
func GetVersion() string { // for displaying to humans.
func GetHumanVersion() string {
version := Version version := Version
if GitDescribe != "" { if GitDescribe != "" {
version = GitDescribe version = GitDescribe