Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

generator-go-sdk: omitempty option for discriminator value too #4626

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

generator-go-sdk: omitempty option for discriminator value too #4626

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
074774c
omitempty tag logic split from field type
wuxu92 Jan 14, 2025
009ec45
field type for discriminator
wuxu92 Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions tools/generator-go-sdk/internal/generator/templater_models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,16 +354,25 @@ func (c modelsTemplater) structLinesForModel(data GeneratorData, fieldNames []st

func (c modelsTemplater) structLineForField(fieldName, fieldType string, fieldDetails models.SDKField, data GeneratorData, excludeComments bool) (*string, error) {
jsonDetails := fieldDetails.JsonName
isDiscriminator := false
objectDefinition := helpers.InnerMostSDKObjectDefinition(fieldDetails.ObjectDefinition)
if refName := objectDefinition.ReferenceName; refName != nil {
if refModel, ok := data.models[*refName]; ok && refModel.IsDiscriminatedParentType() {
isDiscriminator = true
}
}

if strings.HasPrefix(fieldType, "nullable.") {
// nullable types should have the omitempty tag option and not be pointers
jsonDetails += ",omitempty"
} else {
if c.fieldIsOptional(data, fieldDetails) || fieldDetails.ReadOnly {
if !isDiscriminator && (fieldDetails.Optional || fieldDetails.ReadOnly || fieldDetails.ObjectDefinition.Nullable) {
fieldType = fmt.Sprintf("*%s", fieldType)
}

// all optional/read-only fields should have the omitempty tag option, including discriminator types
if !fieldDetails.ObjectDefinition.Nullable && fieldDetails.Optional || fieldDetails.ReadOnly {
jsonDetails += ",omitempty"
} else if fieldDetails.ObjectDefinition.Nullable {
fieldType = fmt.Sprintf("*%s", fieldType)
}
}

Expand Down
Loading