LukeParke/libopenapi
1
0
Fork 0
mirror of https://github.com/LukeHagar/libopenapi.git synced 2025-12-09 12:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Check for direct reference in IsPropertyNodeRequired

Browse Source
This commit is contained in:
Benjamin Nolan (TwoWholeWorms)
2023-01-07 08:53:53 +01:00
committed by Dave Shanley
parent d526584d4f
commit cd63f66efe
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
index/spec_index.go
View File

@@ -1721,7 +1721,7 @@ func (index *SpecIndex) extractDefinitionRequiredRefProperties(schemaNode *yaml.
return reqRefProps return reqRefProps
} }
// If the path we're looking at is a direct ref to another model without any properties, mark it as required, but still continue to look for required properties // If the node we're looking at is a direct ref to another model without any properties, mark it as required, but still continue to look for required properties
isRef, _, defPath := utils.IsNodeRefValue(schemaNode) isRef, _, defPath := utils.IsNodeRefValue(schemaNode)
if isRef { if isRef {
if _, ok := reqRefProps[defPath]; !ok { if _, ok := reqRefProps[defPath]; !ok {

6
utils/utils.go
View File

@@ -405,6 +405,12 @@ func IsNodeRefValue(node *yaml.Node) (bool, *yaml.Node, string) {
// IsPropertyNodeRequired will check if a node is required within circular references // IsPropertyNodeRequired will check if a node is required within circular references
func IsPropertyNodeRequired(node *yaml.Node, propertyName string) bool { func IsPropertyNodeRequired(node *yaml.Node, propertyName string) bool {
// If the node we're looking at is a direct ref to another model without any properties, mark it as required
isRef, _, _ := IsNodeRefValue(node)
if isRef {
return true
}
_, requiredSeqNode := FindKeyNodeTop("required", node.Content) _, requiredSeqNode := FindKeyNodeTop("required", node.Content)
if requiredSeqNode == nil { if requiredSeqNode == nil {
return false return false