From 789963447a5f057b6e11f40bca027dd06b91df6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Du=C5=A1an=20Borov=C4=8Danin?= <borovcanindusan1@gmail.com>
Date: Tue, 24 Apr 2018 13:39:15 +0200
Subject: [PATCH] Add service name to version response (#241)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Dušan Borovčanin <borovcanindusan1@gmail.com>
---
 http/api/transport.go    | 2 +-
 manager/api/transport.go | 2 +-
 normalizer/api.go        | 2 +-
 version.go               | 5 +++--
 ws/api/transport.go      | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/http/api/transport.go b/http/api/transport.go
index 16c62ed4..97bb3ac8 100644
--- a/http/api/transport.go
+++ b/http/api/transport.go
@@ -41,7 +41,7 @@ func MakeHandler(svc mainflux.MessagePublisher, mc manager.ManagerClient) http.H
 		opts...,
 	))
 
-	r.GetFunc("/version", mainflux.Version())
+	r.GetFunc("/version", mainflux.Version("http"))
 	r.Handle("/metrics", promhttp.Handler())
 
 	return r
diff --git a/manager/api/transport.go b/manager/api/transport.go
index 9d6eccb7..2151c3df 100644
--- a/manager/api/transport.go
+++ b/manager/api/transport.go
@@ -143,7 +143,7 @@ func MakeHandler(svc manager.Service) http.Handler {
 		opts...,
 	))
 
-	r.GetFunc("/version", mainflux.Version())
+	r.GetFunc("/version", mainflux.Version("manager"))
 	r.Handle("/metrics", promhttp.Handler())
 
 	return r
diff --git a/normalizer/api.go b/normalizer/api.go
index f36c20f2..d98d219b 100644
--- a/normalizer/api.go
+++ b/normalizer/api.go
@@ -11,7 +11,7 @@ import (
 // MakeHandler returns a HTTP handler for API endpoints.
 func MakeHandler() http.Handler {
 	r := bone.New()
-	r.GetFunc("/version", mainflux.Version())
+	r.GetFunc("/version", mainflux.Version("normalizer"))
 	r.Handle("/metrics", promhttp.Handler())
 
 	return r
diff --git a/version.go b/version.go
index 2b899a10..a8ef484e 100644
--- a/version.go
+++ b/version.go
@@ -9,12 +9,13 @@ const version string = "0.2.2"
 
 type response struct {
 	Version string
+	Service string
 }
 
 // Version exposes an HTTP handler for retrieving service version.
-func Version() http.HandlerFunc {
+func Version(service string) http.HandlerFunc {
 	return http.HandlerFunc(func(rw http.ResponseWriter, _ *http.Request) {
-		res := response{Version: version}
+		res := response{Version: version, Service: service}
 
 		data, _ := json.Marshal(res)
 
diff --git a/ws/api/transport.go b/ws/api/transport.go
index a7c21da7..ecf2056e 100644
--- a/ws/api/transport.go
+++ b/ws/api/transport.go
@@ -38,7 +38,7 @@ func MakeHandler(svc ws.Service, mc manager.ManagerClient, l log.Logger) http.Ha
 
 	mux := bone.New()
 	mux.GetFunc("/channels/:id/messages", handshake(svc))
-	mux.GetFunc("/version", mainflux.Version())
+	mux.GetFunc("/version", mainflux.Version("websocket"))
 	mux.Handle("/metrics", promhttp.Handler())
 
 	return mux