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

defined result schema return type right after rootjavascripttype

This commit is contained in:
Shreyas Goenka 2023-01-19 18:31:55 +01:00
parent 333b9f7acc
commit 0a91a10ef6
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bundle/schema/schema.go
View File

@ -172,7 +172,6 @@ func toSchema(golangType reflect.Type, docs *Docs, tracker *tracker) (*Schema, e
if golangType.Kind() == reflect.Pointer { if golangType.Kind() == reflect.Pointer {
return safeToSchema(golangType.Elem(), docs, "", tracker) return safeToSchema(golangType.Elem(), docs, "", tracker)
} }
if golangType.Kind() == reflect.Interface { if golangType.Kind() == reflect.Interface {
return &Schema{}, nil return &Schema{}, nil
} }
@ -181,14 +180,13 @@ func toSchema(golangType reflect.Type, docs *Docs, tracker *tracker) (*Schema, e
if err != nil { if err != nil {
return nil, err return nil, err
} }
schema := &Schema{Type: rootJavascriptType}
var description string
if docs != nil { if docs != nil {
description = docs.Documentation schema.Description = docs.Documentation
} }
// case array/slice // case array/slice
var items *Schema
if golangType.Kind() == reflect.Array || golangType.Kind() == reflect.Slice { if golangType.Kind() == reflect.Array || golangType.Kind() == reflect.Slice {
elemGolangType := golangType.Elem() elemGolangType := golangType.Elem()
elemJavascriptType, err := javascriptType(elemGolangType) elemJavascriptType, err := javascriptType(elemGolangType)
@ -199,7 +197,7 @@ func toSchema(golangType reflect.Type, docs *Docs, tracker *tracker) (*Schema, e
if err != nil { if err != nil {
return nil, err return nil, err
} }
items = &Schema{ schema.Items = &Schema{
Type: elemJavascriptType, Type: elemJavascriptType,
Properties: elemProps.Properties, Properties: elemProps.Properties,
AdditionalProperties: elemProps.AdditionalProperties, AdditionalProperties: elemProps.AdditionalProperties,
@ -209,22 +207,21 @@ func toSchema(golangType reflect.Type, docs *Docs, tracker *tracker) (*Schema, e
} }
// case map // case map
var additionalProperties interface{}
if golangType.Kind() == reflect.Map { if golangType.Kind() == reflect.Map {
if golangType.Key().Kind() != reflect.String { if golangType.Key().Kind() != reflect.String {
return nil, fmt.Errorf("only string keyed maps allowed") return nil, fmt.Errorf("only string keyed maps allowed")
} }
additionalProperties, err = safeToSchema(golangType.Elem(), docs, "", tracker) schema.AdditionalProperties, err = safeToSchema(golangType.Elem(), docs, "", tracker)
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }
// case struct // case struct
properties := map[string]*Schema{}
required := []string{}
if golangType.Kind() == reflect.Struct { if golangType.Kind() == reflect.Struct {
children := getStructFields(golangType) children := getStructFields(golangType)
properties := map[string]*Schema{}
required := []string{}
for _, child := range children { for _, child := range children {
// get child json tags // get child json tags
childJsonTag := strings.Split(child.Tag.Get("json"), ",") childJsonTag := strings.Split(child.Tag.Get("json"), ",")
@ -264,16 +261,10 @@ func toSchema(golangType reflect.Type, docs *Docs, tracker *tracker) (*Schema, e
properties[childName] = fieldProps properties[childName] = fieldProps
} }
// set Schema.AdditionalProperties to false schema.AdditionalProperties = false
additionalProperties = false schema.Properties = properties
schema.Required = required
} }
return &Schema{ return schema, nil
Type: rootJavascriptType,
Description: description,
Items: items,
Properties: properties,
AdditionalProperties: additionalProperties,
Required: required,
}, nil
} }