scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2026-01-08 16:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: OpenAPI-gen was not generating extensions correctly

Browse Source
This commit is contained in:
mbohlool
2017-03-16 14:31:20 -07:00
parent 67a6c68d77
commit 6dd38a4350
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/libs/go2idl/openapi-gen/generators/openapi.go
View File

@@ -336,7 +336,11 @@ func (g openAPITypeWriter) generate(t *types.Type) error {
if len(required) > 0 {
g.Do("Required: []string{\"$.$\"},\n", strings.Join(required, "\",\""))
}
g.Do("},\n},\n", nil)
g.Do("},\n", nil)
if err := g.generateExtensions(t.CommentLines); err != nil {
return err
}
g.Do("},\n", nil)
g.Do("Dependencies: []string{\n", args)
// Map order is undefined, sort them or we may get a different file generated each time.
keys := []string{}
@@ -353,11 +357,7 @@ func (g openAPITypeWriter) generate(t *types.Type) error {
}
g.Do("\"$.$\",", k)
}
g.Do("},\n", nil)
if err := g.generateExtensions(t.CommentLines); err != nil {
return err
}
g.Do("},\n", nil)
g.Do("},\n},\n", nil)
}
return nil
}
@@ -368,7 +368,7 @@ func (g openAPITypeWriter) generateExtensions(CommentLines []string) error {
for _, val := range tagValues {
if strings.HasPrefix(val, tagExtensionPrefix) {
if !anyExtension {
g.Do("spec.VendorExtensible: {\nExtensions: spec.Extensions{\n", nil)
g.Do("VendorExtensible: spec.VendorExtensible{\nExtensions: spec.Extensions{\n", nil)
anyExtension = true
}
parts := strings.SplitN(val, ":", 2)