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.

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

Updates to handle recursive structures in swagger - depends on kin-openapi change #337

Merged
merged 2 commits into from
Dec 2, 2021

Conversation

peterbroadhurst
Copy link
Contributor

kin-openapi change

Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
@awrichar
Copy link
Contributor

awrichar commented Dec 2, 2021

Looks like upstream PR has been merged 🥳

Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
@@ -31,7 +31,7 @@ import (
)

func newSubscriptionSchemaGenerator(ctx context.Context) string {
baseSchema, _, _ := openapi3gen.NewSchemaRefForValue(&fftypes.Subscription{})
baseSchema, _ := openapi3gen.NewSchemaRefForValue(&fftypes.Subscription{}, nil)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any issue with passing nil here? @peterbroadhurst

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think that's fine - would only be a problem if we ever introduce a recursive schema into one of the subscription types 👍

@awrichar awrichar marked this pull request as ready for review December 2, 2021 17:26
@awrichar awrichar merged commit cc0b2a2 into hyperledger:main Dec 2, 2021
@awrichar awrichar deleted the cyclic-swagger branch December 2, 2021 18:14
awrichar added a commit to kaleido-io/firefly that referenced this pull request Dec 2, 2021
Coverage for JSONInputMask was inadvertently lost.

Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
awrichar added a commit that referenced this pull request Dec 2, 2021
Coverage for JSONInputMask was inadvertently lost.

Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
awrichar added a commit to kaleido-io/firefly that referenced this pull request Dec 10, 2021
Coverage for JSONInputMask was inadvertently lost.

Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
awrichar added a commit to kaleido-io/firefly that referenced this pull request Dec 13, 2021
Coverage for JSONInputMask was inadvertently lost.

Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants