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

jsonTags[0] -> fieldName

This commit is contained in:
Shreyas Goenka 2024-09-04 10:40:04 +02:00
parent 176ced190e
commit 3d5c076a4d
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/jsonschema/from_type.go
View File

@ -255,9 +255,10 @@ func (c *constructor) fromTypeStruct(typ reflect.Type) (Schema, error) {
} }
jsonTags := strings.Split(structField.Tag.Get("json"), ",") jsonTags := strings.Split(structField.Tag.Get("json"), ",")
fieldName := jsonTags[0]
// Do not include fields in the schema that will not be serialized during // Do not include fields in the schema that will not be serialized during
// JSON marshalling. // JSON marshalling.
if jsonTags[0] == "" || jsonTags[0] == "-" || !structField.IsExported() { if fieldName == "" || fieldName == "-" || !structField.IsExported() {
continue continue
} }
@ -265,7 +266,7 @@ func (c *constructor) fromTypeStruct(typ reflect.Type) (Schema, error) {
// required to be present in the API payload. Thus its absence in the // required to be present in the API payload. Thus its absence in the
// tags list indicates that the field is required. // tags list indicates that the field is required.
if !slices.Contains(jsonTags, "omitempty") { if !slices.Contains(jsonTags, "omitempty") {
res.Required = append(res.Required, jsonTags[0]) res.Required = append(res.Required, fieldName)
} }
// Walk the fields of the struct. // Walk the fields of the struct.
@ -278,7 +279,7 @@ func (c *constructor) fromTypeStruct(typ reflect.Type) (Schema, error) {
// For every property in the struct, add a $ref to the corresponding // For every property in the struct, add a $ref to the corresponding
// $defs block. // $defs block.
refPath := path.Join("#/$defs", typPath) refPath := path.Join("#/$defs", typPath)
res.Properties[jsonTags[0]] = &Schema{ res.Properties[fieldName] = &Schema{
Reference: &refPath, Reference: &refPath,
} }
} }