diff --git a/api/server/middleware/version_test.go b/api/server/middleware/version_test.go index a102f8e6c4daf..74c358b359935 100644 --- a/api/server/middleware/version_test.go +++ b/api/server/middleware/version_test.go @@ -2,27 +2,27 @@ package middleware // import "github.com/docker/docker/api/server/middleware" import ( "context" + "fmt" "net/http" "net/http/httptest" "runtime" "testing" + "github.com/docker/docker/api" "github.com/docker/docker/api/server/httputils" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) func TestVersionMiddlewareVersion(t *testing.T) { - defaultVersion := "1.10.0" - minVersion := "1.2.0" - expectedVersion := defaultVersion + expectedVersion := "" handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { v := httputils.VersionFromContext(ctx) assert.Check(t, is.Equal(expectedVersion, v)) return nil } - m := NewVersionMiddleware(defaultVersion, defaultVersion, minVersion) + m := NewVersionMiddleware("1.2.3", api.DefaultVersion, api.MinSupportedAPIVersion) h := m.WrapHandler(handler) req, _ := http.NewRequest(http.MethodGet, "/containers/json", nil) @@ -35,19 +35,19 @@ func TestVersionMiddlewareVersion(t *testing.T) { errString string }{ { - expectedVersion: "1.10.0", + expectedVersion: api.DefaultVersion, }, { - reqVersion: "1.9.0", - expectedVersion: "1.9.0", + reqVersion: api.MinSupportedAPIVersion, + expectedVersion: api.MinSupportedAPIVersion, }, { reqVersion: "0.1", - errString: "client version 0.1 is too old. Minimum supported API version is 1.2.0, please upgrade your client to a newer version", + errString: fmt.Sprintf("client version 0.1 is too old. Minimum supported API version is %s, please upgrade your client to a newer version", api.MinSupportedAPIVersion), }, { reqVersion: "9999.9999", - errString: "client version 9999.9999 is too new. Maximum supported API version is 1.10.0", + errString: fmt.Sprintf("client version 9999.9999 is too new. Maximum supported API version is %s", api.DefaultVersion), }, } @@ -71,9 +71,7 @@ func TestVersionMiddlewareWithErrorsReturnsHeaders(t *testing.T) { return nil } - defaultVersion := "1.10.0" - minVersion := "1.2.0" - m := NewVersionMiddleware(defaultVersion, defaultVersion, minVersion) + m := NewVersionMiddleware("1.2.3", api.DefaultVersion, api.MinSupportedAPIVersion) h := m.WrapHandler(handler) req, _ := http.NewRequest(http.MethodGet, "/containers/json", nil) @@ -85,8 +83,8 @@ func TestVersionMiddlewareWithErrorsReturnsHeaders(t *testing.T) { assert.Check(t, is.ErrorContains(err, "")) hdr := resp.Result().Header - assert.Check(t, is.Contains(hdr.Get("Server"), "Docker/"+defaultVersion)) + assert.Check(t, is.Contains(hdr.Get("Server"), "Docker/1.2.3")) assert.Check(t, is.Contains(hdr.Get("Server"), runtime.GOOS)) - assert.Check(t, is.Equal(hdr.Get("API-Version"), defaultVersion)) + assert.Check(t, is.Equal(hdr.Get("API-Version"), api.DefaultVersion)) assert.Check(t, is.Equal(hdr.Get("OSType"), runtime.GOOS)) }