Merge pull request #17 from influxdata/wirey-version

Wirey version

Makefile

@@ -1,9 +1,12 @@
 SHELL := /bin/bash
+COMMIT_NO := $(shell git rev-parse --short=7 HEAD 2> /dev/null || true)
+GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")
+LDFLAGS=-ldflags "-s -X main.Version=${GIT_COMMIT}"
 
 all: build
 
 .PHONY: build
 build:
 	mkdir -p bin
-	go build -o bin/wirey ./cmd/wirey
+	go build ${LDFLAGS} -o bin/wirey ./cmd/wirey
 

backend/http.go

@@ -10,17 +10,21 @@ import (
 	"time"
 )
 
+const httpUserAgent = "wirey"
+
 type BasicAuth struct {
 	Username string
 	Password string
 }
+
 type HTTPBackend struct {
-	client    *http.Client
-	baseurl   string
-	BasicAuth *BasicAuth
+	client       *http.Client
+	baseurl      string
+	BasicAuth    *BasicAuth
+	wireyVersion string
 }
 
-func NewHTTPBackend(baseurl string) (*HTTPBackend, error) {
+func NewHTTPBackend(baseurl, wireyVersion string) (*HTTPBackend, error) {
 	var transportWithTimeout = &http.Transport{
 		Dial: (&net.Dialer{
 			Timeout: 5 * time.Second,
@@ -32,7 +36,8 @@ func NewHTTPBackend(baseurl string) (*HTTPBackend, error) {
 			Timeout:   time.Second * 10,
 			Transport: transportWithTimeout,
 		},
-		baseurl: baseurl,
+		baseurl:      baseurl,
+		wireyVersion: wireyVersion,
 	}, nil
 }
 
@@ -49,16 +54,15 @@ func (b *HTTPBackend) Join(ifname string, p Peer) error {
 	if err != nil {
 		return err
 	}
+
 	buf := bytes.NewBuffer(jsonPeer)
 	req, err := http.NewRequest("POST", joinURL, buf)
 	if err != nil {
 		return err
 	}
 	req.Header.Add("Content-Type", "application/json")
 
-	if b.BasicAuth != nil {
-		req.SetBasicAuth(b.BasicAuth.Username, b.BasicAuth.Password)
-	}
+	injectCommonHeaders(req, b.wireyVersion, b.BasicAuth)
 
 	res, err := b.client.Do(req)
 	if err != nil {
@@ -79,9 +83,7 @@ func (b *HTTPBackend) GetPeers(ifname string) ([]Peer, error) {
 		return nil, err
 	}
 
-	if b.BasicAuth != nil {
-		req.SetBasicAuth(b.BasicAuth.Username, b.BasicAuth.Password)
-	}
+	injectCommonHeaders(req, b.wireyVersion, b.BasicAuth)
 
 	res, err := b.client.Do(req)
 	if err != nil {
@@ -101,3 +103,11 @@ func (b *HTTPBackend) GetPeers(ifname string) ([]Peer, error) {
 
 	return peers, nil
 }
+
+func injectCommonHeaders(req *http.Request, wireyVersion string, basicAuth *BasicAuth) {
+	req.Header.Add("User-Agent", fmt.Sprintf("%s/%s", httpUserAgent, wireyVersion))
+
+	if basicAuth != nil {
+		req.SetBasicAuth(basicAuth.Username, basicAuth.Password)
+	}
+}

cmd/wirey/root.go

@@ -13,6 +13,8 @@ import (
 	"github.com/spf13/viper"
 )
 
+var Version string
+
 var rootCmd = &cobra.Command{
 	Use:   "wirey",
 	Short: "manage local wireguard interfaces in a distributed system",
@@ -69,7 +71,7 @@ func backendFactory() (backend.Backend, error) {
 
 	httpBackend := viper.GetString("http")
 	if len(httpBackend) != 0 {
-		b, err := backend.NewHTTPBackend(httpBackend)
+		b, err := backend.NewHTTPBackend(httpBackend, Version)
 		if err != nil {
 			return nil, err
 		}
@@ -110,7 +112,7 @@ func init() {
 	pflags.String("httpbasicauth", "", "basic auth for the http backend, in form username:password")
 	pflags.String("ifname", "wg0", "the name to use for the interface (must be the same in all the peers)")
 	pflags.String("ipaddr", "", "the ip for this node inside the tunnel, e.g: 10.0.0.3")
-	pflags.String("peerdiscoveryttl", "5s", "the time to wait to discover new peers using the configured backend")
+	pflags.String("peerdiscoveryttl", "30s", "the time to wait to discover new peers using the configured backend")
 	pflags.String("privatekeypath", "/etc/wirey/privkey", "the local path where to load the private key from, if empty, a private key will be generated.")
 
 	rootCmd.MarkFlagRequired("endpoint")

cmd/wirey/version.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "print the current wirey version",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Printf("%s\n", Version)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(versionCmd)
+}