rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-17 07:40:10 +00:00
Code Issues Releases Wiki Activity

Allow circular types to be imported

Browse Source
This commit is contained in:
Darren Shepherd
2018-12-17 15:40:55 -07:00
parent a20e5736da
commit 77a8edaa99
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
types/reflection.go
View File

@@ -83,6 +83,9 @@ func (s *Schemas) newSchemaFromType(version *APIVersion, t reflect.Type, typeNam
CollectionActions: map[string]Action{},
}
s.processingTypes[t] = schema
defer delete(s.processingTypes, t)
if err := s.readFields(schema, t); err != nil {
return nil, err
}
@@ -148,6 +151,11 @@ func (s *Schemas) importType(version *APIVersion, t reflect.Type, overrides ...r
return existing, nil
}
if s, ok := s.processingTypes[t]; ok {
logrus.Debugf("Returning half built schema %s for %v", typeName, t)
return s, nil
}
logrus.Debugf("Inspecting schema %s for %v", typeName, t)
schema, err := s.newSchemaFromType(version, t, typeName)