Merge pull request #73148 from liggitt/remove-deprecated-swagger-paths

remove deprecated openapi paths in favor of /openapi/v2
This commit is contained in:
Kubernetes Prow Robot
2019-01-23 22:06:21 -08:00
committed by GitHub
8 changed files with 10 additions and 42 deletions

View File

@@ -61,7 +61,7 @@ func TestValidOpenAPISpec(t *testing.T) {
// make sure swagger.json is not registered before calling PrepareRun.
server := httptest.NewServer(master.GenericAPIServer.Handler.Director)
defer server.Close()
resp, err := http.Get(server.URL + "/swagger.json")
resp, err := http.Get(server.URL + "/openapi/v2")
if !assert.NoError(err) {
t.Errorf("unexpected error: %v", err)
}
@@ -69,7 +69,7 @@ func TestValidOpenAPISpec(t *testing.T) {
master.GenericAPIServer.PrepareRun()
resp, err = http.Get(server.URL + "/swagger.json")
resp, err = http.Get(server.URL + "/openapi/v2")
if !assert.NoError(err) {
t.Errorf("unexpected error: %v", err)
}
@@ -84,7 +84,7 @@ func TestValidOpenAPISpec(t *testing.T) {
}
// Validate OpenApi spec
doc, err := loads.Spec(server.URL + "/swagger.json")
doc, err := loads.Spec(server.URL + "/openapi/v2")
if assert.NoError(err) {
validator := validate.NewSpecValidator(doc.Schema(), strfmt.Default)
res, warns := validator.Validate(doc)