From accf28a7dbdd46203c661d30b80326df4d447cea Mon Sep 17 00:00:00 2001 From: David Calavera Date: Wed, 23 Mar 2016 18:30:06 -0400 Subject: [PATCH] Remove unnecessary hardcoded version. The server configuration already keeps the current version if the daemon. This patch changes the middleware logic to use it rather than using the global value. This removes the dockerversion package dependency from the api. Signed-off-by: David Calavera --- api/server/middleware.go | 3 +-- api/server/server_test.go | 10 +++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/api/server/middleware.go b/api/server/middleware.go index 2622bf1bbe..31d18ab42c 100644 --- a/api/server/middleware.go +++ b/api/server/middleware.go @@ -5,7 +5,6 @@ import ( "github.com/docker/docker/api" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/middleware" - "github.com/docker/docker/dockerversion" "github.com/docker/docker/pkg/authorization" ) @@ -15,7 +14,7 @@ import ( func (s *Server) handleWithGlobalMiddlewares(handler httputils.APIFunc) httputils.APIFunc { next := handler - handleVersion := middleware.NewVersionMiddleware(dockerversion.Version, api.DefaultVersion, api.MinVersion) + handleVersion := middleware.NewVersionMiddleware(s.cfg.Version, api.DefaultVersion, api.MinVersion) next = handleVersion(next) if s.cfg.EnableCors { diff --git a/api/server/server_test.go b/api/server/server_test.go index f3256c3160..9216804152 100644 --- a/api/server/server_test.go +++ b/api/server/server_test.go @@ -3,6 +3,7 @@ package server import ( "net/http" "net/http/httptest" + "strings" "testing" "github.com/docker/docker/api/server/httputils" @@ -11,7 +12,9 @@ import ( ) func TestMiddlewares(t *testing.T) { - cfg := &Config{} + cfg := &Config{ + Version: "0.1omega2", + } srv := &Server{ cfg: cfg, } @@ -24,6 +27,11 @@ func TestMiddlewares(t *testing.T) { if httputils.VersionFromContext(ctx) == "" { t.Fatalf("Expected version, got empty string") } + + if sv := w.Header().Get("Server"); !strings.Contains(sv, "Docker/0.1omega2") { + t.Fatalf("Expected server version in the header `Docker/0.1omega2`, got %s", sv) + } + return nil }