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

fix(sample-gen): allOf, oneOf lifting should consider properties and items #7041

Merged

Conversation

mathis-m
Copy link
Contributor

@mathis-m mathis-m commented Mar 6, 2021

Description

relevant schema lifting util needs to consider properties and items.
the properties logic was already in place but was not used for array items. Have moved it to the lifting util so it gets used in any case.

Motivation and Context

Fixes #7040
Fixes #7042

This was introduced with v3.39.0 by my commit 0f541a1.
There anyOf and oneOf was first introduced to the sample generator for schemas other then array.items.anyOf | array.items.oneOf, unfortunately I did not handled the case were items or (properties in array.item schemas) are defined via anyOf or oneOf.

How Has This Been Tested?

Screenshots (if appropriate):

Checklist

My PR contains...

  • No code changes (src/ is unmodified: changes to documentation, CI, metadata, etc.)
  • Dependency changes (any modification to dependencies in package.json)
  • Bug fixes (non-breaking change which fixes an issue)
  • Improvements (misc. changes to existing features)
  • Features (non-breaking change which adds functionality)

My changes...

  • are breaking changes to a public API (config options, System API, major UI change, etc).
  • are breaking changes to a private API (Redux, component props, utility functions, etc.).
  • are breaking changes to a developer API (npm script behavior changes, new dev system dependencies, etc).
  • are not breaking changes.

Documentation

  • My changes do not require a change to the project documentation.
  • My changes require a change to the project documentation.
  • If yes to above: I have updated the documentation accordingly.

Automated tests

  • My changes can not or do not need to be tested.
  • My changes can and should be tested by unit and/or integration tests.
  • If yes to above: I have added tests to cover my changes.
  • If yes to above: I have taken care to cover edge cases in my tests.
  • All new and existing tests passed.

relevant schema lifting util needs to consider properties

Signed-off-by: mathis-m <mathis.michel@outlook.de>
Signed-off-by: mathis-m <mathis.michel@outlook.de>
Signed-off-by: mathis-m <mathis.michel@outlook.de>
Signed-off-by: mathis-m <mathis.michel@outlook.de>
@mathis-m mathis-m force-pushed the bug/props_not_passed_to_anyOf_oneOf branch from b3f81ad to db05b6d Compare March 6, 2021 16:51
@mathis-m mathis-m changed the title fix(sample-gen): allOf, oneOf lifting should consider properties fix(sample-gen): allOf, oneOf lifting should consider properties and items Mar 6, 2021
@tim-lai tim-lai merged commit f9e54a2 into swagger-api:master Mar 10, 2021
@tim-lai
Copy link
Contributor

tim-lai commented Mar 10, 2021

@mathis-m PR merged! Thanks for the fix!

This was referenced Mar 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants