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

Jump to bottom

fix(core): can't have multiple CfnRules in a Stack #9500

Merged
merged 2 commits into from Aug 7, 2020
Merged

fix(core): can't have multiple CfnRules in a Stack #9500

merged 2 commits into from Aug 7, 2020

Conversation

skinny85
Copy link
Contributor

@skinny85 skinny85 commented Aug 6, 2020

When we changed the merging behavior in #8251,
we forgot to account for the 'Rules' section.
To prevent that error from happening again,
let's default to merging objects without duplicates.

Fixes #9485

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

@skinny85
fix(core): don't fail for multiple CfnRules in your Stack
3552458 
When we changed the merging behavior in aws#8251,
we forgot to account for the 'Rules' section.
To prevent that error from happening again,
let's default to merging objects without duplicates.

Fixes aws#9485
@skinny85 skinny85 requested a review from rix0rrr August 6, 2020 23:32
@skinny85 skinny85 self-assigned this Aug 6, 2020
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Aug 6, 2020
@skinny85
Copy link
Contributor Author

skinny85 commented Aug 6, 2020

@rix0rrr I know in #8251, we said we wanted to validate the names of the sections. But I think this story (#9485 ) shows that that was a mistake. For example, there's a new CFN template section, 'Hooks', used for ECS blue/green deployments. I don't think we should require a CDK update for the new section to be usable.

Your thoughts?

@rix0rrr
Copy link
Contributor

rix0rrr commented Aug 7, 2020

I don't think we should require a CDK update for the new section to be usable.

Mmyeah. It's a little scary to me, but I see your point. Let's try it this way.

@rix0rrr rix0rrr changed the title fix(core): don't fail for multiple CfnRules in your Stack fix(core): can't have multiple CfnRules in a Stack Aug 7, 2020
@mergify
Copy link
Contributor

mergify bot commented Aug 7, 2020

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).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: 2e937a2
  • 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 Aug 7, 2020

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 76a7bfd into aws:master Aug 7, 2020
@skinny85 skinny85 deleted the fix/rules-template-section branch August 7, 2020 21:41
eladb pushed a commit that referenced this pull request Aug 10, 2020
@skinny85
fix(core): can't have multiple CfnRules in a Stack (#9500)
b7858de 
When we changed the merging behavior in #8251,
we forgot to account for the 'Rules' section.
To prevent that error from happening again,
let's default to merging objects without duplicates.

Fixes #9485

----

*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
Reviewers

@rix0rrr rix0rrr rix0rrr approved these changes

Assignees

@skinny85 skinny85

Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Milestone
No milestone
3 participants
@skinny85 @rix0rrr @aws-cdk-automation