From 4b0fbfe1ee23e5498ecc4786d3eeec222710473b Mon Sep 17 00:00:00 2001 From: mbohlool Date: Mon, 15 May 2017 15:30:26 -0700 Subject: [PATCH] bugfix: form parameters should have type in OpenAPI spec --- staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go | 2 +- .../src/k8s.io/apiserver/pkg/server/openapi/openapi_test.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go b/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go index 8d41568369b..5c59f29ee36 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go +++ b/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go @@ -495,7 +495,7 @@ func (o *openAPI) buildParameter(restParam restful.ParameterData, bodySample int case restful.HeaderParameterKind: ret.In = "header" case restful.FormParameterKind: - ret.In = "form" + ret.In = "formData" default: return ret, fmt.Errorf("unknown restful operation kind : %v", restParam.Kind) } diff --git a/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi_test.go b/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi_test.go index 725a2f9ec73..3d4538dc6cf 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi_test.go @@ -187,6 +187,7 @@ func getConfig(fullMethods bool) (*openapi.Config, *restful.Container) { InfoProps: spec.InfoProps{ Title: "TestAPI", Description: "Test API", + Version: "unversioned", }, }, GetDefinitions: func(_ openapi.ReferenceCallback) map[string]openapi.OpenAPIDefinition { @@ -330,7 +331,7 @@ func getAdditionalTestParameters() []spec.Parameter { ParamProps: spec.ParamProps{ Name: "fparam", Description: "a test form parameter", - In: "form", + In: "formData", }, SimpleSchema: spec.SimpleSchema{ Type: "number", @@ -432,6 +433,7 @@ func TestBuildSwaggerSpec(t *testing.T) { InfoProps: spec.InfoProps{ Title: "TestAPI", Description: "Test API", + Version: "unversioned", }, }, Swagger: "2.0",