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(sam): CfnFunction events are not rendered #26679

Merged
merged 3 commits into from
Aug 10, 2023
Merged

Conversation

rix0rrr
Copy link
Contributor

@rix0rrr rix0rrr commented Aug 9, 2023

Because of a mistake introduced into the SAM schema, the AlexaSkill event type doesn't have any required properties anymore.

When the CfnFunction is trying all the different event types in the type union that it supports, it will go through every type in alphabetical order and pick the first type that doesn't fail its validation.

After the schema change, the first type (Alexa which starts with an A) would therefore accept all types: no required fields, and for JavaScript compatibility purposes we allow superfluous fields, and so we pick a type that doesn't render anything.

This change reorders the alternatives in the union such that stronger types are tried first.

HttpApiEvent and AlexaSkillEvent both have no required properties, and this now reverses the problem: AlexaSkillEvent can no longer be specified because HttpApiEvent will match first.

But that's the more common use case, so better for now, while we wait for the spec fix to come in, to prefer the HTTP API.

Relates to #26637.


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

Because of a mistake introduced into the SAM schema, the `AlexaSkill`
event type doesn't have any required properties anymore.

When the `CfnFunction` is trying all the different event types in the
type union that it supports, it will go through every type in
alphabetical order and pick the first type that doesn't fail its
validation.

After the schema change, the first type (`Alexa` which starts with an
`A`) would therefore accept all types: no required fields, and for
JavaScript compatibility purposes we allow superfluous fields, and so
we pick a type that doesn't render anything.

This change reorders the alternatives in the union such that stronger
types are tried first.

`HttpApiEvent` and `AlexaSkillEvent` both have no required
properties, and this now reverses the problem: `AlexaSkillEvent` can
no longer be specified because `HttpApiEvent` will match first.

But that's the more common use case, so better for now, while we wait
for the spec fix to come in, to prefer the HTTP API.

Relates to #26637.
@rix0rrr rix0rrr requested a review from a team August 9, 2023 10:07
@github-actions github-actions bot added the p2 label Aug 9, 2023
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Aug 9, 2023
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

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

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

@kaizencc kaizencc added the pr-linter/exempt-integ-test The PR linter will not require integ test changes label Aug 9, 2023
@aws-cdk-automation aws-cdk-automation dismissed their stale review August 9, 2023 18:13

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

@mergify
Copy link
Contributor

mergify bot commented Aug 10, 2023

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

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 13ecaf2
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify mergify bot merged commit 305a9cc into main Aug 10, 2023
8 checks passed
@mergify mergify bot deleted the huijbers/union-ordering branch August 10, 2023 15:32
@mergify
Copy link
Contributor

mergify bot commented Aug 10, 2023

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

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. p2 pr-linter/exempt-integ-test The PR linter will not require integ test changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants