steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Circular types

This commit is contained in:
Ilya Kuznetsov 2025-01-13 15:55:49 +01:00
parent 3e0d2324b5
commit 2591172370
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bundle/internal/docs/nodes.go
View File

@ -29,6 +29,7 @@ type rootProp struct {
k string k string
v *jsonschema.Schema v *jsonschema.Schema
topLevel bool topLevel bool
circular bool
} }
const MapType = "Map" const MapType = "Map"
@ -36,7 +37,7 @@ const MapType = "Map"
func getNodes(s jsonschema.Schema, refs map[string]jsonschema.Schema, customFields map[string]bool) []rootNode { func getNodes(s jsonschema.Schema, refs map[string]jsonschema.Schema, customFields map[string]bool) []rootNode {
rootProps := []rootProp{} rootProps := []rootProp{}
for k, v := range s.Properties { for k, v := range s.Properties {
rootProps = append(rootProps, rootProp{k, v, true}) rootProps = append(rootProps, rootProp{k, v, true, false})
} }
nodes := make([]rootNode, 0, len(rootProps)) nodes := make([]rootNode, 0, len(rootProps))
visited := make(map[string]bool) visited := make(map[string]bool)
@ -59,8 +60,10 @@ func getNodes(s jsonschema.Schema, refs map[string]jsonschema.Schema, customFiel
Type: getHumanReadableType(v.Type), Type: getHumanReadableType(v.Type),
} }
node.Attributes = getAttributes(v.Properties, refs, customFields, k) node.Attributes = getAttributes(v.Properties, refs, customFields, k, item.circular)
rootProps = append(rootProps, extractNodes(k, v.Properties, refs, customFields)...) if !item.circular {
rootProps = append(rootProps, extractNodes(k, v.Properties, refs, customFields)...)
}
additionalProps, ok := v.AdditionalProperties.(*jsonschema.Schema) additionalProps, ok := v.AdditionalProperties.(*jsonschema.Schema)
if ok { if ok {
@ -73,13 +76,18 @@ func getNodes(s jsonschema.Schema, refs map[string]jsonschema.Schema, customFiel
node.Example = getExample(objectKeyType) node.Example = getExample(objectKeyType)
} }
prefix := k + ".<name>" prefix := k + ".<name>"
node.ObjectKeyAttributes = getAttributes(objectKeyType.Properties, refs, customFields, prefix) node.ObjectKeyAttributes = getAttributes(objectKeyType.Properties, refs, customFields, prefix, item.circular)
rootProps = append(rootProps, extractNodes(prefix, objectKeyType.Properties, refs, customFields)...) if !item.circular {
rootProps = append(rootProps, extractNodes(prefix, objectKeyType.Properties, refs, customFields)...)
}
} }
if v.Items != nil { if v.Items != nil {
arrayItemType := resolveRefs(v.Items, refs) arrayItemType := resolveRefs(v.Items, refs)
node.ArrayItemAttributes = getAttributes(arrayItemType.Properties, refs, customFields, k) node.ArrayItemAttributes = getAttributes(arrayItemType.Properties, refs, customFields, k, item.circular)
if !item.circular {
rootProps = append(rootProps, extractNodes(k, arrayItemType.Properties, refs, customFields)...)
}
} }
nodes = append(nodes, node) nodes = append(nodes, node)
@ -109,7 +117,7 @@ func getHumanReadableType(t jsonschema.Type) string {
return typesMapping[string(t)] return typesMapping[string(t)]
} }
func getAttributes(props map[string]*jsonschema.Schema, refs map[string]jsonschema.Schema, customFields map[string]bool, prefix string) []attributeNode { func getAttributes(props map[string]*jsonschema.Schema, refs map[string]jsonschema.Schema, customFields map[string]bool, prefix string, circular bool) []attributeNode {
attributes := []attributeNode{} attributes := []attributeNode{}
for k, v := range props { for k, v := range props {
v = resolveRefs(v, refs) v = resolveRefs(v, refs)
@ -118,7 +126,7 @@ func getAttributes(props map[string]*jsonschema.Schema, refs map[string]jsonsche
typeString = "Any" typeString = "Any"
} }
var reference string var reference string
if isReferenceType(v, refs, customFields) { if isReferenceType(v, refs, customFields) && !circular {
reference = prefix + "." + k reference = prefix + "." + k
} }
attributes = append(attributes, attributeNode{ attributes = append(attributes, attributeNode{
@ -157,12 +165,16 @@ func extractNodes(prefix string, props map[string]*jsonschema.Schema, refs map[s
} }
v = resolveRefs(v, refs) v = resolveRefs(v, refs)
if v.Type == "object" || v.Type == "array" { if v.Type == "object" || v.Type == "array" {
nodes = append(nodes, rootProp{prefix + "." + k, v, false}) nodes = append(nodes, rootProp{prefix + "." + k, v, false, isCycleField(k)})
} }
} }
return nodes return nodes
} }
func isCycleField(field string) bool {
return field == "for_each_task"
}
func getExample(v *jsonschema.Schema) string { func getExample(v *jsonschema.Schema) string {
examples := v.Examples examples := v.Examples
if len(examples) == 0 { if len(examples) == 0 {