github/steve
1
0
Fork 0
mirror of https://github.com/niusmallnan/steve.git synced 2025-09-02 21:55:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix openapi schema to steve schema generation

Browse Source
This commit is contained in:
Darren Shepherd
2021-04-27 17:08:38 -07:00
parent 10cf4e69c2
commit 9ddd83c343
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/schema/converter/openapi.go
View File

@@ -97,8 +97,7 @@ func toField(schema proto.Schema) schemas.Field {
case *proto.Map: case *proto.Map:
f.Type = "map[" + toField(v.SubType).Type + "]" f.Type = "map[" + toField(v.SubType).Type + "]"
case *proto.Kind: case *proto.Kind:
parts := v.Path.Get() f.Type = v.Path.String()
f.Type = parts[len(parts)-1]
case proto.Reference: case proto.Reference:
sub := v.SubSchema() sub := v.SubSchema()
if p, ok := sub.(*proto.Primitive); ok { if p, ok := sub.(*proto.Primitive); ok {

7
pkg/schema/converter/openapiv3.go
View File

@@ -3,7 +3,7 @@ package converter
import ( import (
"github.com/rancher/apiserver/pkg/types" "github.com/rancher/apiserver/pkg/types"
"github.com/rancher/wrangler/pkg/schemas" "github.com/rancher/wrangler/pkg/schemas"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
) )
func modelV3ToSchema(name string, k *v1.JSONSchemaProps, schemasMap map[string]*types.APISchema) *types.APISchema { func modelV3ToSchema(name string, k *v1.JSONSchemaProps, schemasMap map[string]*types.APISchema) *types.APISchema {
@@ -27,9 +27,10 @@ func modelV3ToSchema(name string, k *v1.JSONSchemaProps, schemasMap map[string]*
} }
} }
if _, ok := schemasMap[s.ID]; !ok { if existing, ok := schemasMap[s.ID]; ok && len(existing.Attributes) > 0 {
schemasMap[s.ID] = &s s.Attributes = existing.Attributes
} }
schemasMap[s.ID] = &s
for k, v := range s.ResourceFields { for k, v := range s.ResourceFields {
if types.ReservedFields[k] { if types.ReservedFields[k] {