From 652359207f71a66eff6c7791d8855f147a1a525e Mon Sep 17 00:00:00 2001
From: Zunayed Ali <zunayed@gmail.com>
Date: Wed, 9 Jan 2019 20:36:11 -0500
Subject: [PATCH] Adding version flag to both sso-auth and sso-proxy

---
 Makefile              | 6 ++++--
 cmd/sso-auth/main.go  | 8 ++++++++
 cmd/sso-proxy/main.go | 8 ++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d5f6418c..a1da3ac1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,20 @@
 version := "v1.1.0"
 
 commit := $(shell git rev-parse --short HEAD)
+version := $(shell go version)
+ldflags := '-X "main.goVersion=$(version)"'
 
 build: dist/sso-auth dist/sso-proxy
 
 dist/sso-auth:
 	mkdir -p dist
 	go generate ./...
-	go build -o dist/sso-auth ./cmd/sso-auth
+	go build -ldflags $(ldflags) -o dist/sso-auth ./cmd/sso-auth
 
 dist/sso-proxy:
 	mkdir -p dist
 	go generate ./...
-	go build -o dist/sso-proxy ./cmd/sso-proxy
+	go build -ldflags $(ldflags) -o dist/sso-proxy ./cmd/sso-proxy
 
 test:
 	./scripts/test
diff --git a/cmd/sso-auth/main.go b/cmd/sso-auth/main.go
index 776980cd..832cb6e0 100644
--- a/cmd/sso-auth/main.go
+++ b/cmd/sso-auth/main.go
@@ -11,11 +11,19 @@ import (
 	"github.com/kelseyhightower/envconfig"
 )
 
+var goVersion string
+
 func init() {
 	log.SetServiceName("sso-authenticator")
 }
 
 func main() {
+	if len(os.Args) > 1 && os.Args[1] == "version" {
+		fmt.Println(auth.VERSION)
+		fmt.Println(goVersion)
+		os.Exit(1)
+	}
+
 	logger := log.NewLogEntry()
 
 	opts := auth.NewOptions()
diff --git a/cmd/sso-proxy/main.go b/cmd/sso-proxy/main.go
index 11692803..c667e11c 100755
--- a/cmd/sso-proxy/main.go
+++ b/cmd/sso-proxy/main.go
@@ -11,11 +11,19 @@ import (
 	"github.com/kelseyhightower/envconfig"
 )
 
+var goVersion string
+
 func init() {
 	log.SetServiceName("sso-proxy")
 }
 
 func main() {
+	if len(os.Args) > 1 && os.Args[1] == "version" {
+		fmt.Println(proxy.VERSION)
+		fmt.Println(goVersion)
+		os.Exit(1)
+	}
+
 	logger := log.NewLogEntry()
 
 	opts := proxy.NewOptions()