Customize OpenAPI definition types

customize intstr, unversioned.time, and quantity OpenAPI definitions.
This commit is contained in:
mbohlool 2016-09-01 15:21:30 -07:00
parent 54fee8c253
commit 6ba271b9ae
3 changed files with 43 additions and 0 deletions

View File

@ -27,7 +27,9 @@ import (
flag "github.com/spf13/pflag"
"github.com/go-openapi/spec"
inf "gopkg.in/inf.v0"
"k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators/common"
)
// Quantity is a fixed-point representation of a number.
@ -395,6 +397,18 @@ func (q Quantity) DeepCopy() Quantity {
return q
}
// OpenAPIDefinition returns openAPI definition for this type.
func (_ Quantity) OpenAPIDefinition() common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Type: []string{"string"},
Format: "",
},
},
}
}
// CanonicalizeBytes returns the canonical form of q and its suffix (see comment on Quantity).
//
// Note about BinarySI:

View File

@ -20,6 +20,9 @@ import (
"encoding/json"
"time"
"k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators/common"
"github.com/go-openapi/spec"
"github.com/google/gofuzz"
)
@ -142,6 +145,17 @@ func (t Time) MarshalJSON() ([]byte, error) {
return json.Marshal(t.UTC().Format(time.RFC3339))
}
func (_ Time) OpenAPIDefinition() common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Type: []string{"string"},
Format: "date-time",
},
},
}
}
// MarshalQueryParameter converts to a URL query parameter value
func (t Time) MarshalQueryParameter() (string, error) {
if t.IsZero() {

View File

@ -23,6 +23,9 @@ import (
"strconv"
"strings"
"k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators/common"
"github.com/go-openapi/spec"
"github.com/google/gofuzz"
)
@ -34,6 +37,7 @@ import (
//
// +protobuf=true
// +protobuf.options.(gogoproto.goproto_stringer)=false
// +k8s:openapi-gen=true
type IntOrString struct {
Type Type `protobuf:"varint,1,opt,name=type,casttype=Type"`
IntVal int32 `protobuf:"varint,2,opt,name=intVal"`
@ -101,6 +105,17 @@ func (intstr IntOrString) MarshalJSON() ([]byte, error) {
}
}
func (_ IntOrString) OpenAPIDefinition() common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Type: []string{"string"},
Format: "int-or-string",
},
},
}
}
func (intstr *IntOrString) Fuzz(c fuzz.Continue) {
if intstr == nil {
return