Skip to content

fix: follow-ups to #1957 #1971

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

Draft
jamietanna wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: follow-ups to #1957 #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
140 changes: 140 additions & 0 deletions internal/test/issues/issue1957/issue1957.gen.go
View file
Open in desktop

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

14 changes: 14 additions & 0 deletions internal/test/issues/issue1957/issue1957_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,18 @@ func TestGeneratedCode(t *testing.T) {
require.NotZero(t, theType.Id)
})
})

t.Run("For a field with optional required fields (via AnyOf) and those fields having an AllOf", func(t *testing.T) {
t.Run("An optional field with x-go-type-skip-optional-pointer should be a non-pointer", func(t *testing.T) {
anID := ID(uuid.New())

theType := TypeWithComplexAllOf{
EitherId: anID,
}

require.IsType(t, ID{}, theType.EitherId)

require.NotZero(t, theType.Id)
})
})
}
18 changes: 18 additions & 0 deletions internal/test/issues/issue1957/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,21 @@ components:
allOf:
- $ref: '#/components/schemas/ID'
- x-go-type-skip-optional-pointer: true
TypeWithComplexAllOf:
type: object
required:
- id
oneOf:
- required: [ either_id ]
- required: [ or_id ]
properties:
id:
$ref: '#/components/schemas/ID'
either_id:
allOf:
- $ref: '#/components/schemas/ID'
- x-go-type-skip-optional-pointer: true
or_id:
allOf:
- $ref: '#/components/schemas/ID'
- x-go-type-skip-optional-pointer: true
Loading