advertise worker version in /info and /workers

/info endpoint will show required worker version, /workers now show
current worker versions

concourse/concourse#1048

Author: mariash

api/api_suite_test.go

@@ -204,6 +204,7 @@ var _ = BeforeEach(func() {
 
 		cliDownloadsDir,
 		"1.2.3",
+		"4.5.6",
 	)
 	Expect(err).NotTo(HaveOccurred())
 

api/handler.go

@@ -74,6 +74,7 @@ func NewHandler(
 
 	cliDownloadsDir string,
 	version string,
+	workerVersion string,
 ) (http.Handler, error) {
 	absCLIDownloadsDir, err := filepath.Abs(cliDownloadsDir)
 	if err != nil {
@@ -128,7 +129,7 @@ func NewHandler(
 
 	teamServer := teamserver.NewServer(logger, dbTeamFactory)
 
-	infoServer := infoserver.NewServer(logger, version)
+	infoServer := infoserver.NewServer(logger, version, workerVersion)
 
 	handlers := map[string]http.Handler{
 		atc.ListAuthMethods: http.HandlerFunc(authServer.ListAuthMethods),

api/info_test.go

@@ -24,7 +24,8 @@ var _ = Describe("Pipelines API", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			Expect(body).To(MatchJSON(`{
-				"version": "1.2.3"
+				"version": "1.2.3",
+				"worker_version": "4.5.6"
 			}`))
 		})
 	})

api/infoserver/info.go

@@ -8,5 +8,5 @@ import (
 )
 
 func (s *Server) Info(w http.ResponseWriter, r *http.Request) {
-	json.NewEncoder(w).Encode(atc.Info{Version: s.version})
+	json.NewEncoder(w).Encode(atc.Info{Version: s.version, WorkerVersion: s.workerVersion})
 }

api/infoserver/server.go

@@ -3,16 +3,19 @@ package infoserver
 import "code.cloudfoundry.org/lager"
 
 type Server struct {
-	logger  lager.Logger
-	version string
+	logger        lager.Logger
+	version       string
+	workerVersion string
 }
 
 func NewServer(
 	logger lager.Logger,
 	version string,
+	workerVersion string,
 ) *Server {
 	return &Server{
-		logger:  logger,
-		version: version,
+		logger:        logger,
+		version:       version,
+		workerVersion: workerVersion,
 	}
 }

api/present/worker.go

@@ -14,6 +14,10 @@ func Worker(workerInfo dbng.Worker) atc.Worker {
 	if workerInfo.BaggageclaimURL() != nil {
 		baggageclaimURL = *workerInfo.BaggageclaimURL()
 	}
+	version := ""
+	if workerInfo.Version() != nil {
+		version = *workerInfo.Version()
+	}
 
 	return atc.Worker{
 		GardenAddr:       gardenAddr,
@@ -28,5 +32,6 @@ func Worker(workerInfo dbng.Worker) atc.Worker {
 		Name:             workerInfo.Name(),
 		Team:             workerInfo.TeamName(),
 		State:            string(workerInfo.State()),
+		Version:          version,
 	}
 }

atccmd/command.go

@@ -940,6 +940,7 @@ func (cmd *ATCCommand) constructAPIHandler(
 
 		cmd.CLIArtifactsDir.Path(),
 		Version,
+		WorkerVersion,
 	)
 }
 

info.go

@@ -1,5 +1,6 @@
 package atc
 
 type Info struct {
-	Version string `json:"version"`
+	Version       string `json:"version"`
+	WorkerVersion string `json:"worker_version"`
 }