Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5652 from gyuho/version

Browse Source 
etcdctl/*: print API version
This commit is contained in:
Gyu-Ho Lee 2016-06-14 16:04:24 -07:00 committed by GitHub
commit a6fec46c0e
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etcdctl/ctlv2/ctl.go
View File

@ -16,6 +16,7 @@
package ctlv2 package ctlv2
import ( import (
"fmt"
"os" "os"
"time" "time"
@ -28,6 +29,10 @@ func Start() {
app := cli.NewApp() app := cli.NewApp()
app.Name = "etcdctl" app.Name = "etcdctl"
app.Version = version.Version app.Version = version.Version
cli.VersionPrinter = func(c *cli.Context) {
fmt.Fprintf(c.App.Writer, "etcdctl version: %v\n", c.App.Version)
fmt.Fprintln(c.App.Writer, "API version: 2")
}
app.Usage = "A simple command line client for etcd." app.Usage = "A simple command line client for etcd."
app.Flags = []cli.Flag{ app.Flags = []cli.Flag{
cli.BoolFlag{Name: "debug", Usage: "output cURL commands which can be used to reproduce the request"}, cli.BoolFlag{Name: "debug", Usage: "output cURL commands which can be used to reproduce the request"},

11
etcdctl/ctlv3/command/version_command.go
View File

@ -18,6 +18,7 @@ import (
"fmt" "fmt"
"github.com/coreos/etcd/version" "github.com/coreos/etcd/version"
"github.com/coreos/go-semver/semver"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -31,5 +32,13 @@ func NewVersionCommand() *cobra.Command {
} }
func versionCommandFunc(cmd *cobra.Command, args []string) { func versionCommandFunc(cmd *cobra.Command, args []string) {
fmt.Println(version.Version) fmt.Println("etcdctl version:", version.Version)
ver, err := semver.NewVersion(version.Version)
var vs string
if err == nil {
vs = fmt.Sprintf("%d.%d", ver.Major, ver.Minor)
} else {
vs = "unknown"
}
fmt.Println("API version:", vs)
} }