Skip to content

fix959 #992

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

Merged
deepmap-marcinr merged 4 commits into from
Mar 14, 2023
Merged

fix959 #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46549a9
issue958
amammay Feb 10, 2023
ed085ae
String manipulation
Rmarken5 Mar 7, 2023
1c50add
Adjust logic to provide external refs
Rmarken5 Mar 7, 2023
294249f
Merge branch 'master' into fix959
deepmap-marcinr Mar 14, 2023
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
4 changes: 3 additions & 1 deletion internal/test/issues/issue-958/issue.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 12 additions & 9 deletions pkg/codegen/operations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,15 +278,25 @@ func (o *OperationDefinition) GetResponseTypeDefinitions() ([]ResponseTypeDefini
sortedResponsesKeys := SortedResponsesKeys(responses)
for _, responseName := range sortedResponsesKeys {
responseRef := responses[responseName]

refParts := strings.Split(responseRef.Ref, "#")
// Checking to see if reference belongs to external doc so child content can be adjusted.
_, isExternalImport := importMapping[refParts[0]]
// We can only generate a type if we have a value:
if responseRef.Value != nil {
sortedContentKeys := SortedContentKeys(responseRef.Value.Content)
for _, contentTypeName := range sortedContentKeys {
contentType := responseRef.Value.Content[contentTypeName]
// We can only generate a type if we have a schema:
if contentType.Schema != nil {
responseSchema, err := GenerateGoSchema(contentType.Schema, []string{responseName})
// Create a copy as to not disturb original.
schemaCopy := *contentType.Schema
// When an external reference is provided, adjust the ref to contain full path so imports can be attached.
if isExternalImport && IsGoTypeReference(schemaCopy.Ref) {
schemaParts := strings.Split(schemaCopy.Ref, "#")
refDef := schemaParts[len(schemaParts)-1]
schemaCopy.Ref = fmt.Sprintf("%s#%s", refParts[0], refDef)
}
responseSchema, err := GenerateGoSchema(&schemaCopy, []string{responseName})
if err != nil {
return nil, fmt.Errorf("Unable to determine Go type for %s.%s: %w", o.OperationId, contentTypeName, err)
}
Expand All @@ -313,13 +323,6 @@ func (o *OperationDefinition) GetResponseTypeDefinitions() ([]ResponseTypeDefini
ResponseName: responseName,
ContentTypeName: contentTypeName,
}
if IsGoTypeReference(contentType.Schema.Ref) {
refType, err := RefPathToGoType(contentType.Schema.Ref)
if err != nil {
return nil, fmt.Errorf("error dereferencing response Ref: %w", err)
}
td.Schema.RefType = refType
}
tds = append(tds, td)
}
}
Expand Down