kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #21456 from calavera/remove_unecessary_hardcoded_version

Browse source 
Remove unnecessary hardcoded version.
This commit is contained in:
Alexander Morozov 2016-03-24 14:31:59 -07:00
commit 6748ecb005
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api/server/middleware.go
View file

@ -5,7 +5,6 @@ import (
"github.com/docker/docker/api" "github.com/docker/docker/api"
"github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/httputils"
"github.com/docker/docker/api/server/middleware" "github.com/docker/docker/api/server/middleware"
"github.com/docker/docker/dockerversion"
"github.com/docker/docker/pkg/authorization" "github.com/docker/docker/pkg/authorization"
) )
@ -15,7 +14,7 @@ import (
func (s *Server) handleWithGlobalMiddlewares(handler httputils.APIFunc) httputils.APIFunc { func (s *Server) handleWithGlobalMiddlewares(handler httputils.APIFunc) httputils.APIFunc {
next := handler next := handler
handleVersion := middleware.NewVersionMiddleware(dockerversion.Version, api.DefaultVersion, api.MinVersion) handleVersion := middleware.NewVersionMiddleware(s.cfg.Version, api.DefaultVersion, api.MinVersion)
next = handleVersion(next) next = handleVersion(next)
if s.cfg.EnableCors { if s.cfg.EnableCors {

10
api/server/server_test.go
View file

@ -3,6 +3,7 @@ package server
import ( import (
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"strings"
"testing" "testing"
"github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/httputils"
@ -11,7 +12,9 @@ import (
) )
func TestMiddlewares(t *testing.T) { func TestMiddlewares(t *testing.T) {
cfg := &Config{} cfg := &Config{
Version: "0.1omega2",
}
srv := &Server{ srv := &Server{
cfg: cfg, cfg: cfg,
} }
@ -24,6 +27,11 @@ func TestMiddlewares(t *testing.T) {
if httputils.VersionFromContext(ctx) == "" { if httputils.VersionFromContext(ctx) == "" {
t.Fatalf("Expected version, got empty string") 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 return nil
} }