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(cfn2ts): correctly choose between string and object without required properties in a union #12954

Merged
merged 1 commit into from
Feb 12, 2021

Conversation

skinny85
Copy link
Contributor

@skinny85 skinny85 commented Feb 9, 2021

In our code generation, in the validation functions for CFN complex types,
we never checked whether the argument we received is an object.
Because of that, passing a string was actually a correct candidate for a union with a complex type that had no required properties.
Fix that by checking for that error explicitly,
which removes the complex type without required properties from the candidates for the union type when a string is passed.

Fixes #12854


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@skinny85 skinny85 requested a review from rix0rrr February 9, 2021 23:47
@skinny85 skinny85 self-assigned this Feb 9, 2021
@gitpod-io
Copy link

gitpod-io bot commented Feb 9, 2021

@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Feb 9, 2021
tools/cfn2ts/lib/codegen.ts Outdated Show resolved Hide resolved
@rix0rrr rix0rrr added the pr/do-not-merge This PR should not be merged at this time. label Feb 11, 2021
…red properties in a union

In our code generation, in the validation functions for CFN complex types,
we never checked whether the argument we received is an object.
Because of that, passing a string was actually a correct candidate for a union with a complex type that had no required properties.
Fix that by checking for that error explicitly,
which removes the complex type without required properties from the candidates when a string is passed.

Fixes aws#12854
@skinny85 skinny85 removed the pr/do-not-merge This PR should not be merged at this time. label Feb 11, 2021
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: 81d9f97
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify
Copy link
Contributor

mergify bot commented Feb 12, 2021

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit b7137c5 into aws:master Feb 12, 2021
@skinny85 skinny85 deleted the fix/codegen-l1-unions branch February 15, 2021 22:05
NovakGu pushed a commit to NovakGu/aws-cdk that referenced this pull request Feb 18, 2021
…red properties in a union (aws#12954)

In our code generation, in the validation functions for CFN complex types,
we never checked whether the argument we received is an object.
Because of that, passing a string was actually a correct candidate for a union with a complex type that had no required properties.
Fix that by checking for that error explicitly,
which removes the complex type without required properties from the candidates for the union type when a string is passed.

Fixes aws#12854

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(aws-sam): cannot generate string policies for CfnFunction
3 participants