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

return typPath from walk

This commit is contained in:
Shreyas Goenka 2024-09-04 11:28:53 +02:00
parent 6bd7ad0fb2
commit 66cbb548ef
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/jsonschema/from_type.go
View File

@ -93,7 +93,7 @@ func FromType(typ reflect.Type, fns []func(typ reflect.Type, s Schema) Schema) (
root: typ, root: typ,
} }
err := c.walk(typ) _, err := c.walk(typ)
if err != nil { if err != nil {
return Schema{}, err return Schema{}, err
} }
@ -149,7 +149,7 @@ func typePath(typ reflect.Type) string {
// Walk the Go type, generating $defs for every type encountered, and populating // Walk the Go type, generating $defs for every type encountered, and populating
// the corresponding $ref in the JSON schema. // the corresponding $ref in the JSON schema.
func (c *constructor) walk(typ reflect.Type) error { func (c *constructor) walk(typ reflect.Type) (string, error) {
// Dereference pointers if necessary. // Dereference pointers if necessary.
for typ.Kind() == reflect.Ptr { for typ.Kind() == reflect.Ptr {
typ = typ.Elem() typ = typ.Elem()
@ -159,7 +159,7 @@ func (c *constructor) walk(typ reflect.Type) error {
// Return early if the type has already been seen, to avoid infinite recursion. // Return early if the type has already been seen, to avoid infinite recursion.
if _, ok := c.seen[typPath]; ok { if _, ok := c.seen[typPath]; ok {
return nil return typPath, nil
} }
c.seen[typPath] = typ c.seen[typPath] = typ
@ -187,15 +187,15 @@ func (c *constructor) walk(typ reflect.Type) error {
// arbitrary values. // arbitrary values.
s = Schema{} s = Schema{}
default: default:
return fmt.Errorf("unsupported type: %s", typ.Kind()) return "", fmt.Errorf("unsupported type: %s", typ.Kind())
} }
if err != nil { if err != nil {
return err return "", err
} }
// Store the computed JSON schema for the type. // Store the computed JSON schema for the type.
c.definitions[typPath] = s c.definitions[typPath] = s
return nil return typPath, nil
} }
// This function returns all member fields of the provided type. // This function returns all member fields of the provided type.
@ -273,8 +273,7 @@ func (c *constructor) fromTypeStruct(typ reflect.Type) (Schema, error) {
} }
// Walk the fields of the struct. // Walk the fields of the struct.
typPath := typePath(structField.Type) typPath, err := c.walk(structField.Type)
err := c.walk(structField.Type)
if err != nil { if err != nil {
return Schema{}, err return Schema{}, err
} }
@ -299,10 +298,8 @@ func (c *constructor) fromTypeSlice(typ reflect.Type) (Schema, error) {
Type: ArrayType, Type: ArrayType,
} }
typPath := typePath(typ.Elem())
// Walk the slice element type. // Walk the slice element type.
err := c.walk(typ.Elem()) typPath, err := c.walk(typ.Elem())
if err != nil { if err != nil {
return Schema{}, err return Schema{}, err
} }
@ -325,10 +322,8 @@ func (c *constructor) fromTypeMap(typ reflect.Type) (Schema, error) {
Type: ObjectType, Type: ObjectType,
} }
typPath := typePath(typ.Elem())
// Walk the map value type. // Walk the map value type.
err := c.walk(typ.Elem()) typPath, err := c.walk(typ.Elem())
if err != nil { if err != nil {
return Schema{}, err return Schema{}, err
} }