From 25162c18b4290f7763cd545f2d94d96650ebc9d9 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 12 Sep 2022 16:32:24 -0400 Subject: [PATCH] 19362: Fix version in status response. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/keep-web/handler.go | 3 ++- services/keep-web/main.go | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go index bc62a2a39a..0e964e4632 100644 --- a/services/keep-web/handler.go +++ b/services/keep-web/handler.go @@ -19,6 +19,7 @@ import ( "strings" "sync" + "git.arvados.org/arvados.git/lib/cmd" "git.arvados.org/arvados.git/sdk/go/arvados" "git.arvados.org/arvados.git/sdk/go/arvadosclient" "git.arvados.org/arvados.git/sdk/go/auth" @@ -63,7 +64,7 @@ func (h *handler) setup() { } func (h *handler) serveStatus(w http.ResponseWriter, r *http.Request) { - json.NewEncoder(w).Encode(struct{ Version string }{version}) + json.NewEncoder(w).Encode(struct{ Version string }{cmd.Version.String()}) } // updateOnSuccess wraps httpserver.ResponseWriter. If the handler diff --git a/services/keep-web/main.go b/services/keep-web/main.go index 7a23cd1fad..cd379dc6bd 100644 --- a/services/keep-web/main.go +++ b/services/keep-web/main.go @@ -16,10 +16,6 @@ import ( "github.com/prometheus/client_golang/prometheus" ) -var ( - version = "dev" -) - var Command = service.Command(arvados.ServiceNameKeepweb, newHandlerOrErrorHandler) func newHandlerOrErrorHandler(ctx context.Context, cluster *arvados.Cluster, token string, reg *prometheus.Registry) service.Handler { -- 2.30.2