fix(core): addPropertyOverride doesn't work for all intrinsics#22294
Merged
mergify[bot] merged 2 commits intoaws:mainfrom Sep 30, 2022
corymhall:corymhall/fix-addpropertyoverride
Merged
fix(core): addPropertyOverride doesn't work for all intrinsics#22294mergify[bot] merged 2 commits intoaws:mainfrom corymhall:corymhall/fix-addpropertyoverride
mergify[bot] merged 2 commits intoaws:mainfrom
corymhall:corymhall/fix-addpropertyoverride
Conversation
There was a previous fix in #20608 that attempted to fix addPropertyOverride when intrinisics were involved. This PR fixes an edge case where overrides do not work correctly an object is being replaced with an intrinsic. For example, there might be the case where the override is an intrinsic and it is overriding an object, not a value. original: { Type: 'MyResourceType', Properties: { prop1: { subprop: { name: { 'Fn::GetAtt': 'abc' } } } } } override: { Properties: { prop1: { subprop: { 'Fn::If': ['SomeCondition', {...}, {...}] }} } } The previous fix only handled cases where the original had an intrinsic, but in the above example the override is the first to hit an intrinsic. This PR adds logic to handle cases where we hit an intrinsic in the original _or_ the override. fixes #19971
|
|
aws-cdk-automation
previously requested changes
Sep 29, 2022
Collaborator
aws-cdk-automation
left a comment
There was a problem hiding this comment.
The Pull Request Linter fails with the following errors:
❌ Fixes must contain a change to an integration test file and the resulting snapshot.
PRs must pass status checks before we can provide a meaningful review.
Pull Request updated. Dissmissing previous PRLinter Review.
aws-cdk-automation
previously requested changes
Sep 29, 2022
Collaborator
aws-cdk-automation
left a comment
There was a problem hiding this comment.
The Pull Request Linter fails with the following errors:
❌ Fixes must contain a change to an integration test file and the resulting snapshot.
PRs must pass status checks before we can provide a meaningful review.
Pull Request updated. Dissmissing previous PRLinter Review.
aws-cdk-automation
previously requested changes
Sep 29, 2022
Collaborator
aws-cdk-automation
left a comment
There was a problem hiding this comment.
The Pull Request Linter fails with the following errors:
❌ Fixes must contain a change to an integration test file and the resulting snapshot.
PRs must pass status checks before we can provide a meaningful review.
Pull Request updated. Dissmissing previous PRLinter Review.
TheRealAmazonKendra
approved these changes
Sep 30, 2022
Contributor
|
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). |
Collaborator
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
Contributor
|
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). |
arewa
pushed a commit
to arewa/aws-cdk
that referenced
this pull request
Oct 8, 2022
…2294) There was a previous fix in aws#20608 that attempted to fix addPropertyOverride when intrinisics were involved. This PR fixes an edge case where overrides do not work correctly an object is being replaced with an intrinsic. For example, there might be the case where the override is an intrinsic and it is overriding an object, not a value. ``` original: { Type: 'MyResourceType', Properties: { prop1: { subprop: { name: { 'Fn::GetAtt': 'abc' } } } } } override: { Properties: { prop1: { subprop: { 'Fn::If': ['SomeCondition', {...}, {...}] }} } } ``` The previous fix only handled cases where the original had an intrinsic, but in the above example the override is the first to hit an intrinsic. This PR adds logic to handle cases where we hit an intrinsic in the original _or_ the override. fixes aws#19971 ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
homakk
pushed a commit
to homakk/aws-cdk
that referenced
this pull request
Dec 1, 2022
…2294) There was a previous fix in aws#20608 that attempted to fix addPropertyOverride when intrinisics were involved. This PR fixes an edge case where overrides do not work correctly an object is being replaced with an intrinsic. For example, there might be the case where the override is an intrinsic and it is overriding an object, not a value. ``` original: { Type: 'MyResourceType', Properties: { prop1: { subprop: { name: { 'Fn::GetAtt': 'abc' } } } } } override: { Properties: { prop1: { subprop: { 'Fn::If': ['SomeCondition', {...}, {...}] }} } } ``` The previous fix only handled cases where the original had an intrinsic, but in the above example the override is the first to hit an intrinsic. This PR adds logic to handle cases where we hit an intrinsic in the original _or_ the override. fixes aws#19971 ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a previous fix in #20608 that attempted to fix addPropertyOverride when intrinisics were involved. This PR fixes an edge case where overrides do not work correctly an object is being replaced with an intrinsic.
For example, there might be the case where the override is an intrinsic and it is overriding an object, not a value.
The previous fix only handled cases where the original had an intrinsic, but in the above example the override is the first to hit an intrinsic. This PR adds logic to handle cases where we hit an intrinsic in the original or the override.
fixes #19971
All Submissions:
Adding new Unconventional Dependencies:
New Features
yarn integto deploy the infrastructure and generate the snapshot (i.e.yarn integwithout--dry-run)?By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license